Refactoring the Makefile for binary compilation.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13322 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 80 insertions, 28 deletions

diff --git a/otherlibs/labltk/examples_camltk/Makefile b/otherlibs/labltk/examples_camltk/Makefile
index 6eb0d4305..937026880 100644
--- a/otherlibs/labltk/examples_camltk/Makefile
+++ b/otherlibs/labltk/examples_camltk/Makefile
@@ -17,52 +17,102 @@
 include ../support/Makefile.common
 
 # We are using the non-installed library !
-COMPFLAGS=-I ../lib -I ../camltk -I ../support -I $(OTHERS)/unix -w s -dllpath ../support
+BYT_COMPFLAGS=-I ../lib -I ../camltk -I ../support -I $(OTHERS)/unix -w s -dllpath ../support
+BIN_COMPFLAGS=-I ../lib -I ../camltk -I ../support -I $(OTHERS)/unix -w s
 
+WITH_BYT_CAMLTK=labltk.cma camltk.cmo
+WITH_BIN_CAMLTK=labltk.cmxa camltk.cmx
 
-all: addition$(EXE) helloworld$(EXE) winskel$(EXE) fileinput$(EXE) \
-	eyes$(EXE) tetris$(EXE) mytext$(EXE) fileopen$(EXE)
+BYT_EXECS =\
+  addition.byt helloworld.byt winskel.byt fileinput.byt\
+  eyes.byt tetris.byt mytext.byt fileopen.byt\
 
-addition$(EXE): addition.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ $(LIBNAME).cma addition.cmo
+BIN_EXECS=$(BYT_EXECS:.byt=.bin)
 
-helloworld$(EXE): helloworld.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ $(LIBNAME).cma helloworld.cmo
+EXECS=$(BYT_EXECS:.byt=$(EXE))
 
-winskel$(EXE): winskel.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ $(LIBNAME).cma winskel.cmo
+all: byt bin
 
-fileinput$(EXE): fileinput.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma fileinput.cmo
+byt: $(BYT_EXECS)
 
-socketinput$(EXE): socketinput.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma socketinput.cmo
+#opt: hello.opt demo.opt eyes.opt calc.opt clock.opt tetris.opt
 
-eyes$(EXE): eyes.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma eyes.cmo
+bin: opt
 
-tetris$(EXE): tetris.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma tetris.cmo
+opt: $(BIN_EXECS)
 
-mytext$(EXE): mytext.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma mytext.cmo
+addition.bin: addition.cmx
+	echo $(BIN_EXECS);
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ $(WITH_BIN_CAMLTK) addition.cmx
 
-# graph$(EXE): graphics.cmo graphics_test.cmo
+helloworld.bin: helloworld.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ $(WITH_BIN_CAMLTK) helloworld.cmx
+
+winskel.bin: winskel.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ $(WITH_BIN_CAMLTK) winskel.cmx
+
+fileinput.bin: fileinput.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ $(WITH_BIN_CAMLTK) unix.cmxa fileinput.cmx
+
+socketinput.bin: socketinput.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ unix.cmxa $(WITH_BIN_CAMLTK) socketinput.cmx
+
+eyes.bin: eyes.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ unix.cmxa $(WITH_BIN_CAMLTK) eyes.cmx
+
+tetris.bin: tetris.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ unix.cmxa $(WITH_BIN_CAMLTK) tetris.cmx
+
+mytext.bin: mytext.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ unix.cmxa $(WITH_BIN_CAMLTK) mytext.cmx
+
+fileopen.bin: fileopen.cmx
+	$(CAMLOPT) $(BIN_COMPFLAGS) -o $@ unix.cmxa $(WITH_BIN_CAMLTK) fileopen.cmx
+
+
+addition.byt: addition.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ $(LIBNAME).cma addition.cmo
+
+helloworld.byt: helloworld.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ $(LIBNAME).cma helloworld.cmo
+
+winskel.byt: winskel.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ $(LIBNAME).cma winskel.cmo
+
+fileinput.byt: fileinput.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma fileinput.cmo
+
+socketinput.byt: socketinput.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma socketinput.cmo
+
+eyes.byt: eyes.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma eyes.cmo
+
+tetris.byt: tetris.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma tetris.cmo
+
+mytext.byt: mytext.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ unix.cma $(LIBNAME).cma mytext.cmo
+
+# graph.byt: graphics.cmo graphics_test.cmo
 # 	  $(CAMLC) -o $@ graphics.cmo graphics_test.cmo
 #
 # graphics_test.cmo: graphics.cmo
 
-fileopen$(EXE): fileopen.cmo
-	$(CAMLC) $(COMPFLAGS) -o $@ $(LIBNAME).cma fileopen.cmo
+fileopen.byt: fileopen.cmo
+	$(CAMLC) $(BYT_COMPFLAGS) -o $@ $(LIBNAME).cma fileopen.cmo
 
 clean :
-	rm -f *.cm? $(EXECS) addition eyes fileinput fileopen helloworld jptest mytext tetris winskel
+	rm -f *.cm? *.o a.out $(EXECS) $(BYT_EXECS) $(BIN_EXECS)
 
 .SUFFIXES :
-.SUFFIXES : .mli .ml .cmi .cmo
+.SUFFIXES : .mli .ml .cmi .cmo .cmx .cma .cmxa
 
 .mli.cmi:
-	$(CAMLCOMP) $(COMPFLAGS) $<
+	$(CAMLCOMP) $(BYT_COMPFLAGS) -c $<
 
 .ml.cmo:
-	$(CAMLCOMP) $(COMPFLAGS) $<
+	$(CAMLCOMP) $(BYT_COMPFLAGS) -c $<
+
+.ml.cmx:
+	$(CAMLOPT) $(BIN_COMPFLAGS) -c $<
diff --git a/otherlibs/labltk/examples_camltk/addition.ml b/otherlibs/labltk/examples_camltk/addition.ml
index 44988370c..6bebe0213 100644
--- a/otherlibs/labltk/examples_camltk/addition.ml
+++ b/otherlibs/labltk/examples_camltk/addition.ml
@@ -13,7 +13,8 @@
 (*  described in file LICENSE found in the OCaml source tree.          *)
 (*                                                                     *)
 (***********************************************************************)
-open Camltk
+
+open Camltk;;
 
 let main () =
   let top = opentk ()  in
@@ -50,4 +51,5 @@ let main () =
   mainLoop ()
 ;;
 
-let _ = Printexc.catch main () ;;
+Printexc.catch main ()
+;;