1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
|
From: Loic Minier <lool@dooz.org>
Date: Wed, 17 Aug 2011 21:30:26 +0200
Subject: Allow overriding OCAMLC in examples
This is done by using separate _INVOKE vars to run misc commands.
---
examples/Makefile | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/examples/Makefile b/examples/Makefile
index e3a2194..82029f1 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -7,32 +7,34 @@
FACILEDIR= +facile
INCLUDES= -I $(FACILEDIR)
-OCAMLC= ocamlc -g $(INCLUDES)
-OCAMLMLI= ocamlc $(INCLUDES)
-OCAMLOPT= ocamlopt $(INCLUDES)
-OCAMLDEP= ocamldep $(INCLUDES)
+OCAMLC= ocamlc -g
+OCAMLMLI= ocamlc
+OCAMLOPT= ocamlopt
+OCAMLDEP= ocamldep
+OCAMLC_INVOKE = $(OCAMLC) $(INCLUDES)
+OCAMLOPT_INVOKE = $(OCAMLOPT) $(INCLUDES)
.SUFFIXES:
.SUFFIXES: .ml .mli .mly .mll .cmi .cmo .cmx .out .opt .p.cmx .popt
.ml.cmo :
- $(OCAMLC) -c $<
+ $(OCAMLC_INVOKE) -c $<
.mli.cmi :
- $(OCAMLMLI) -c $<
+ $(OCAMLMLI) $(INCLUDES) -c $<
.ml.cmx :
- $(OCAMLOPT) -c $<
+ $(OCAMLOPT_INVOKE) -c $<
# To produce profiled objects
.ml.p.cmx :
- $(OCAMLOPT) -p -c $<
+ $(OCAMLOPT_INVOKE) -p -c $<
mv $*.cmx $@
mv $*.o $*.p.o
.cmo.out :
- $(OCAMLC) -o $@ facile.cma $<
+ $(OCAMLC_INVOKE) -o $@ facile.cma $<
# To produce profiled binaries
.p.cmx.popt :
- $(OCAMLOPT) -p -o $@ facile.p.cmxa $<
+ $(OCAMLOPT_INVOKE) -p -o $@ facile.p.cmxa $<
.cmx.opt :
- $(OCAMLOPT) -o $@ facile.cmxa $<
+ $(OCAMLOPT_INVOKE) -o $@ facile.cmxa $<
.mly.ml :
ocamlyacc $<
.mll.ml :
@@ -42,6 +44,6 @@ clean:
\rm -f *.cmo *.cmi *.cmx *.o *~ *.opt *.out .depend *.popt
.depend:
- $(OCAMLDEP) *.mli *.ml > $@
+ $(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@
include .depend
--
|