X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=f6531f5410c858bb352bd7d882a8dee3fe2a97c0;hb=bcb60e33691b4dab252597ef98f05461c3350213;hp=6d30f56a0b8f23f984514e7a33a931ebc26d2cba;hpb=96ff72437cc1cbea49fe9599048ab61a4d11fde8;p=ocaml-csv.git

diff --git a/Makefile b/Makefile
index 6d30f56..f6531f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,20 @@
-# $Id: Makefile,v 1.7 2005-11-25 14:08:46 rich Exp $
+# $Id: Makefile,v 1.10 2006-11-24 09:43:15 rich Exp $
 
-PACKAGE		:= ocaml-csv
-VERSION		:= 1.1.0
+include Makefile.config
+
+# To enable support for Extlib, also uncomment 'open ExtList' at the top
+# of file csv.ml.
 
-OCAMLC		:= ocamlc
 OCAMLCINCS	:=
-OCAMLCFLAGS	:= -w s -g
+#OCAMLCINCS	:= -package extlib
+OCAMLCFLAGS	:= -g
 OCAMLCLIBS	:=
+#OCAMLCLIBS	:= -linkpkg
 
-OCAMLOPT	:= ocamlopt
 OCAMLOPTINCS	:= $(OCAMLCINCS)
-OCAMLOPTFLAGS	:= -w s
+OCAMLOPTFLAGS	:=
 OCAMLOPTLIBS	:=
+#OCAMLOPTLIBS	:= -linkpkg
 
 OBJS		:= csv.cmo
 XOBJS		:= $(OBJS:.cmo=.cmx)
@@ -21,29 +24,29 @@ OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
 all: csv.cma csv.cmxa example csvtool
 
 csv.cma: $(OBJS)
-	$(OCAMLC) $(OCAMLCFLAGS) -a -o $@ $^
+	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) -a -o $@ $^
 
 csv.cmxa: $(XOBJS)
-	$(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $@ $^
+	ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) -a -o $@ $^
 
 example: csv.cma example.ml
-	$(OCAMLC) $^ -o $@
+	ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) $^ -o $@
 
 test:	csv.cma test.ml
-	$(OCAMLC) $^ -o $@
+	ocamlfind ocamlc $^ -o $@
 	./test
 
 csvtool: csv.cmxa csvtool.ml
-	$(OCAMLOPT) $^ -o $@
+	ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) $^ -o $@
 
 # Common rules for building OCaml objects.
 
 .mli.cmi:
-	$(OCAMLC) $(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
+	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
 .ml.cmo:
-	$(OCAMLC) $(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
+	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
 .ml.cmx:
-	$(OCAMLOPT) $(OCAMLOPTFLAGS) $(OCAMLOPTINCS) -c $<
+	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTINCS) -c $<
 
 .SUFFIXES:	.cmo .cmi .cmx .ml .mli