mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 14:41:17 +00:00
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
diff --git a/Makefile.in b/Makefile.in
|
|
index d040f4c..cc1a8f5 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -40,7 +40,7 @@ pkg_extlib = @OCAML_PKG_extlib@
|
|
enable_coverage = @enable_coverage@
|
|
|
|
OCAMLCFLAGS = -g
|
|
-OCAMLCPACKAGES =
|
|
+OCAMLCPACKAGES = -package camlp4
|
|
OCAMLCLIBS = -linkpkg
|
|
OCAMLOPTFLAGS = $(OCAMLCFLAGS)
|
|
OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
|
|
@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_persistent.mli
|
|
-I +camlp4 -pp camlp4of -c $<
|
|
|
|
pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
|
|
- $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
|
|
+ $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
|
|
+ bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
|
|
-pp camlp4of -c $< -o $@
|
|
|
|
bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
|
|
$(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
|
|
- $(OCAMLCFLAGS) $(OCAMLCLIBS) \
|
|
+ $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OCAMLCPACKAGES) \
|
|
bitstring.cma bitstring_persistent.cma \
|
|
$< -o $@
|
|
|
|
@@ -158,12 +159,13 @@ tests/test.bmpp: create_test_pattern
|
|
|
|
create_test_pattern: create_test_pattern.cmo
|
|
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
|
|
- unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
|
|
+ unix.cma -I `ocamlfind query camlp4` dynlink.cma camlp4lib.cma \
|
|
$(OCAMLCLIBS) \
|
|
-I . bitstring.cma bitstring_persistent.cma $< -o $@
|
|
|
|
create_test_pattern.cmo: create_test_pattern.ml
|
|
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
|
|
+ $(OCAMLCPACKAGES) \
|
|
unix.cma -I +camlp4 \
|
|
-I . -c $< -o $@
|
|
|