git.annexia.org / ocaml-bitstring.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix handling of OCAML_PKG_* macros for new OCaml autoconf.
[ocaml-bitstring.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 808146d..3f626ba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,17 +26,42 @@ OCAMLDOC    = @OCAMLDOC@
 INSTALL                = @INSTALL@
 TIME           = @TIME@
 GPROF          = @GPROF@
+BISECT_REPORT  = @BISECT_REPORT@
 
-pkg_cil                = @pkg_cil@
-pkg_extlib     = @pkg_extlib@
+BYTESWAP_H     = @BYTESWAP_H@
+
+OCAMLLIB       = @OCAMLLIB@
+top_srcdir     = @top_srcdir@
+
+pkg_cil                = @OCAML_PKG_cil@
+pkg_extlib     = @OCAML_PKG_extlib@
+
+enable_coverage = @enable_coverage@
 
 OCAMLCFLAGS    = -g
 OCAMLCPACKAGES =
+OCAMLCLIBS     = -linkpkg
 OCAMLOPTFLAGS  =
 OCAMLOPTPACKAGES =
+OCAMLOPTLIBS   = -linkpkg
+
+ifneq ($(enable_coverage),no)
+OCAMLCFLAGS     += -I +bisect -pp 'camlp4o $(OCAMLLIB)/bisect/instrument.cma'
+OCAMLCLIBS     += -I +bisect bisect.cma
+OCAMLOPTFLAGS   += -I +bisect -pp 'camlp4o $(OCAMLLIB)/bisect/instrument.cma'
+OCAMLOPTLIBS   += -I +bisect bisect.cmxa
+endif
 
 OCAMLDOCFLAGS  = -html -sort
 
+CC             = @CC@
+CFLAGS         = @CFLAGS@ -Wall -Werror -fPIC -I$(top_srcdir) -I$(OCAMLLIB)
+
+LIBRARY_PATH   = @abs_top_builddir@
+LD_LIBRARY_PATH        = @abs_top_builddir@
+export LIBRARY_PATH
+export LD_LIBRARY_PATH
+
 SUBDIRS                =
 ifneq ($(pkg_cil),no)
 ifneq ($(pkg_extlib),no)
@@ -50,15 +75,16 @@ TESTS               = $(patsubst %.ml,%,$(wildcard tests/*.ml))
 
 BENCHMARKS     = $(patsubst %.ml,%,$(wildcard benchmarks/*.ml))
 
-all:   bitstring.cma bitstring_persistent.cma \
+all:   $(BYTESWAP_H) \
+       bitstring.cma bitstring_persistent.cma \
        bitstring.cmxa bitstring_persistent.cmxa \
        pa_bitstring.cmo \
        bitstring-objinfo
        @for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-bitstring.cma: bitstring_types.cmo bitstring_config.cmo bitstring.cmo \
-         bitmatch.cmo
-       $(OCAMLFIND) ocamlc -a -o $@ $^
+bitstring.cma: bitstring_types.cmo bitstring_config.cmo \
+         bitstring_c.o bitstring.cmo bitmatch.cmo
+       $(OCAMLMKLIB) -o bitstring $^
 
 bitstring_persistent.cma: bitstring_persistent.cmo
        $(OCAMLFIND) ocamlc -a -o $@ $^
@@ -67,9 +93,9 @@ bitstring_persistent.cmo: bitstring_persistent.ml
        $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
          -I +camlp4 -pp camlp4of -c $<
 
-bitstring.cmxa: bitstring_types.cmx bitstring_config.cmx bitstring.cmx \
-         bitmatch.cmx
-       $(OCAMLFIND) ocamlopt -a -o $@ $^
+bitstring.cmxa: bitstring_types.cmx bitstring_config.cmx \
+         bitstring_c.o bitstring.cmx bitmatch.cmx
+       $(OCAMLMKLIB) -o bitstring $^
 
 bitstring_persistent.cmxa: bitstring_persistent.cmx
        $(OCAMLFIND) ocamlopt -a -o $@ $^
@@ -83,26 +109,42 @@ 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 $@
 
-# Tests and examples.
+# Create byteswap.h if the system doesn't have this file.
+# From gnulib, license is LGPLv2+.
+
+byteswap.h: byteswap.in.h
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         cat $(srcdir)/byteswap.in.h; \
+       } > $@-t
+       mv -f $@-t $@
 
-PP     = -pp "camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
+# Tests.
 
-test: pa_bitstring.cmo bitstring.cma bitstring_persistent.cma tests/test.bmpp
+ifeq ($(enable_coverage),no)
+PP     = -pp 'camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo'
+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 \
+       bitstring.cmxa bitstring_persistent.cmxa \
+       tests/test.bmpp
        @for f in $(TESTS); do \
          echo Building $$f; \
-         $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
-           -package unix -linkpkg -I . bitstring.cma $$f.ml -o $$f; \
+         $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(PP) -package unix $(OCAMLOPTLIBS) -I . bitstring.cmxa $$f.ml -o $$f.opt; \
          if [ $$? -ne 0 ]; then exit 1; fi; \
          echo Running $$f; \
-         $$f; \
+         $$f.opt; \
          if [ $$? -ne 0 ]; then exit 1; fi; \
        done
        @for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
@@ -113,7 +155,8 @@ 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 $@
 
 create_test_pattern.cmo: create_test_pattern.ml
@@ -121,6 +164,20 @@ create_test_pattern.cmo: create_test_pattern.ml
          unix.cma -I +camlp4 \
          -I . -c $< -o $@
 
+# Coverage of tests.
+
+ifneq ($(BISECT_REPORT),no)
+coverage:
+       rm -f coverage-report/*
+       rm -f bisect*.out
+       $(MAKE) test
+       $(BISECT_REPORT) -html coverage-report bisect*.out
+       rm -f bisect*.out
+       @echo Coverage report is in `pwd`/coverage-report/index.html
+endif
+
+# Examples.
+
 examples: pa_bitstring.cmo bitstring.cma bitstring_persistent.cma
        @for f in $(EXAMPLES); do \
          echo Building $$f; \
@@ -180,11 +237,15 @@ endif
 # Clean.
 
 clean:
-       rm -f core *~ *.cmi *.cmo *.cmx *.cma *.cmxa *.a *.o
-       rm -f tests/*~ tests/*.cmi tests/*.cmo $(TESTS)
-       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
@@ -207,12 +268,15 @@ endif
 # Install.
 
 install:
-       ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a \
+       ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a *.so \
                bitstring.cmi \
                bitstring_persistent.cmi \
                pa_bitstring.cmo
        @for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
+uninstall: 
+       ocamlfind remove bitstring
+
 # Standard rules.
 
 .mli.cmi:
bitstrings for OCaml