|
Lines 1-39
Link Here
|
| 1 |
--- Makefile.orig 2007-12-17 17:56:16.458954606 -0500 |
1 |
--- Makefile.orig 2009-02-24 15:03:43.000000000 +0100 |
| 2 |
+++ Makefile 2007-12-17 17:54:34.177261751 -0500 |
2 |
+++ Makefile 2009-02-24 15:04:05.000000000 +0100 |
| 3 |
@@ -5,11 +5,11 @@ |
3 |
@@ -70,7 +70,7 @@ |
| 4 |
# To enable support for Extlib, also uncomment 'open ExtList' at the top |
4 |
# Build a distribution. |
| 5 |
# of file csv.ml. |
|
|
| 6 |
|
5 |
|
| 7 |
-OCAMLCINCS := |
6 |
install: |
| 8 |
-#OCAMLCINCS := -package extlib |
7 |
- ocamlfind install csv csv.{cmi,a,cmxa,cma,cmx} META |
| 9 |
+#OCAMLCINCS := |
8 |
+ ocamlfind install csv csv.cmi csv.a csv.cmxa csv.cma csv.cmx META |
| 10 |
+OCAMLCINCS := -package extlib |
|
|
| 11 |
OCAMLCFLAGS := -g |
| 12 |
-OCAMLCLIBS := |
| 13 |
-#OCAMLCLIBS := -linkpkg |
| 14 |
+#OCAMLCLIBS := |
| 15 |
+OCAMLCLIBS := -linkpkg |
| 16 |
|
| 17 |
OCAMLOPTINCS := $(OCAMLCINCS) |
| 18 |
OCAMLOPTFLAGS := |
| 19 |
@@ -23,6 +23,20 @@ |
| 20 |
|
| 21 |
all: csv.cma csv.cmxa example csvtool |
| 22 |
|
| 23 |
+## The install and META targets were borrowed from Richard W.M. Jones' RPM patch |
| 24 |
+install: all META |
| 25 |
+ ocamlfind install csv META *.mli $(wildcard *.a) csv.cmi $(wildcard csv.cmx) *.cma $(wildcard *.cmxa) |
| 26 |
+# install csvtool ${DESTDIR}${BINDIR} |
| 27 |
+ |
| 28 |
+META: |
| 29 |
+ rm -f $@ |
| 30 |
+ echo 'version="${VERSION}"' >> $@ |
| 31 |
+ echo 'description="CSV library"' >> $@ |
| 32 |
+ echo 'archive(byte)="csv.cma"' >> $@ |
| 33 |
+ echo 'archive(native)="csv.cmxa"' >> $@ |
| 34 |
+ echo 'requires="extlib"' >> $@ |
| 35 |
+ |
| 36 |
+ |
| 37 |
csv.cma: $(OBJS) |
| 38 |
ocamlfind ocamlc $(OCAMLCINCS) $(OCAMLCFLAGS) -a -o $@ $^ |
| 39 |
|
9 |
|
|
|
10 |
dist: |
| 11 |
$(MAKE) check-manifest |