Fix handling of OCAML_PKG_* macros for new OCaml autoconf.

[ocaml-bitstring.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a9e0495..3f626ba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,8 +33,8 @@ BYTESWAP_H    = @BYTESWAP_H@
 OCAMLLIB       = @OCAMLLIB@
 top_srcdir     = @top_srcdir@
 
-pkg_cil                = @pkg_cil@
-pkg_extlib     = @pkg_extlib@
+pkg_cil                = @OCAML_PKG_cil@
+pkg_extlib     = @OCAML_PKG_extlib@
 
 enable_coverage = @enable_coverage@
 
@@ -109,11 +109,11 @@ 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 camlp4lib.cma \
+       $(OCAMLFIND) ocamlc 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 camlp4lib.cma \
+       $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
          $(OCAMLCLIBS) \
          bitstring.cma bitstring_persistent.cma \
          $< -o $@
@@ -135,7 +135,10 @@ else
 PP     = -pp 'camlp4o $(OCAMLLIB)/bisect/bisect.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo'
 endif
 
-test: pa_bitstring.cmo bitstring.cma bitstring_persistent.cma tests/test.bmpp
+test: pa_bitstring.cmo \
+       bitstring.cma bitstring_persistent.cma \
+       bitstring.cmxa bitstring_persistent.cmxa \
+       tests/test.bmpp
        @for f in $(TESTS); do \
          echo Building $$f; \
          $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(PP) -package unix $(OCAMLOPTLIBS) -I . bitstring.cmxa $$f.ml -o $$f.opt; \
@@ -152,7 +155,7 @@ tests/test.bmpp: create_test_pattern
 
 create_test_pattern: create_test_pattern.cmo
        $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
-         unix.cma -I +camlp4 camlp4lib.cma \
+         unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
          $(OCAMLCLIBS) \
          -I . bitstring.cma bitstring_persistent.cma $< -o $@
 
@@ -234,11 +237,15 @@ endif
 # Clean.
 
 clean:
-       rm -f core *~ *.cmi *.cmo *.cmx *.cma *.cmxa *.a *.o
-       rm -f tests/*~ tests/*.cmi tests/*.cmo tests/*.opt
-       rm -f examples/*~ examples/*.cmi examples/*.cmo $(EXAMPLES)
+       rm -f core *~ *.cmi *.cmo *.cmx *.cma *.cmxa *.cmp *.a *.o *.so
+       rm -f tests/*~ tests/*.cmi tests/*.cmo tests/*.cmx tests/*.opt
+       rm -f tests/*.o
+       rm -f examples/*~ examples/*.cmi examples/*.cmo examples/*.cmx
+       rm -f examples/*.o $(EXAMPLES)
        rm -f benchmarks/*~ benchmarks/*.cmi benchmarks/*.cmo
+       rm -f benchmarks/*.cmx benchmarks/*.o
        rm -f benchmarks/*.opt benchmarks/*.opt.p benchmarks/*.profile
+       rm -f create_test_pattern bitstring-objinfo
        @for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
 distclean: clean
@@ -267,6 +274,9 @@ install:
                pa_bitstring.cmo
        @for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
+uninstall: 
+       ocamlfind remove bitstring
+
 # Standard rules.
 
 .mli.cmi: