git.annexia.org
/
ocaml-csv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch from David Allsopp to make the library findlib-compatible.
[ocaml-csv.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0fa1d54
..
c40580d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,17
+1,20
@@
-# $Id: Makefile,v 1.
9 2006-10-01 13:06:04
rich Exp $
+# $Id: Makefile,v 1.
11 2007-05-14 16:20:10
rich Exp $
-PACKAGE := ocaml-csv
-VERSION := 1.1.2
+include Makefile.config
+
+# To enable support for Extlib, also uncomment 'open ExtList' at the top
+# of file csv.ml.
-OCAMLC := ocamlc
OCAMLCINCS :=
OCAMLCINCS :=
-OCAMLCFLAGS := -w s -g
+#OCAMLCINCS := -package extlib
+OCAMLCFLAGS := -g
OCAMLCLIBS :=
OCAMLCLIBS :=
+#OCAMLCLIBS := -linkpkg
-OCAMLOPT := ocamlopt
OCAMLOPTINCS := $(OCAMLCINCS)
OCAMLOPTINCS := $(OCAMLCINCS)
-OCAMLOPTFLAGS :=
-w s
+OCAMLOPTFLAGS :=
OCAMLOPTLIBS :=
OCAMLOPTLIBS :=
+#OCAMLOPTLIBS := -linkpkg
OBJS := csv.cmo
XOBJS := $(OBJS:.cmo=.cmx)
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)
all: csv.cma csv.cmxa example csvtool
csv.cma: $(OBJS)
-
$(OCAMLC
) $(OCAMLCFLAGS) -a -o $@ $^
+
ocamlfind ocamlc $(OCAMLCINCS
) $(OCAMLCFLAGS) -a -o $@ $^
csv.cmxa: $(XOBJS)
csv.cmxa: $(XOBJS)
-
$(OCAMLOPT
) $(OCAMLOPTFLAGS) -a -o $@ $^
+
ocamlfind ocamlopt $(OCAMLOPTINCS
) $(OCAMLOPTFLAGS) -a -o $@ $^
example: csv.cma example.ml
example: csv.cma example.ml
-
$(OCAMLC
) $^ -o $@
+
ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS
) $^ -o $@
test: csv.cma test.ml
test: csv.cma test.ml
-
$(OCAMLC)
$^ -o $@
+
ocamlfind ocamlc
$^ -o $@
./test
csvtool: csv.cmxa csvtool.ml
./test
csvtool: csv.cmxa csvtool.ml
-
$(OCAMLOPT
) $^ -o $@
+
ocamlfind ocamlopt $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS
) $^ -o $@
# Common rules for building OCaml objects.
.mli.cmi:
# Common rules for building OCaml objects.
.mli.cmi:
-
$(OCAMLC)
$(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
+
ocamlfind ocamlc
$(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
.ml.cmo:
.ml.cmo:
-
$(OCAMLC)
$(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
+
ocamlfind ocamlc
$(OCAMLCFLAGS) $(OCAMLCINCS) -c $<
.ml.cmx:
.ml.cmx:
-
$(OCAMLOPT)
$(OCAMLOPTFLAGS) $(OCAMLOPTINCS) -c $<
+
ocamlfind ocamlopt
$(OCAMLOPTFLAGS) $(OCAMLOPTINCS) -c $<
.SUFFIXES: .cmo .cmi .cmx .ml .mli
.SUFFIXES: .cmo .cmi .cmx .ml .mli
@@
-66,6
+69,9
@@
endif
# Build a distribution.
# Build a distribution.
+install:
+ ocamlfind install csv csv.{cmi,a,cmxa,cma,cmx} META
+
dist:
$(MAKE) check-manifest
rm -rf $(PACKAGE)-$(VERSION)
dist:
$(MAKE) check-manifest
rm -rf $(PACKAGE)-$(VERSION)