X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=6086f248df1982d631b978612d085a4f59c7023e;hb=80fd187cbf946133e98ca32d351c33132ce3ea47;hp=c695a5ea65a303f4a7588985883501e929463351;hpb=a02d4dc211b61d5dd8827ce5727adf07ca4ccffb;p=ocaml-bitstring.git

diff --git a/Makefile.in b/Makefile.in
index c695a5e..6086f24 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Bitmatch syntax extension.
+# Bitstring syntax extension.
 # Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones
 #
 # This library is free software; you can redistribute it and/or
@@ -24,74 +24,127 @@ OCAMLFIND	= @OCAMLFIND@
 OCAMLMKLIB	= @OCAMLMKLIB@
 OCAMLDOC	= @OCAMLDOC@
 INSTALL		= @INSTALL@
+TIME		= @TIME@
+GPROF		= @GPROF@
+BISECT_REPORT	= @BISECT_REPORT@
+
+BYTESWAP_H	= @BYTESWAP_H@
+
+OCAMLLIB	= @OCAMLLIB@
+top_srcdir	= @top_srcdir@
+
+pkg_cil		= @pkg_cil@
+pkg_extlib	= @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)
 SUBDIRS		+= cil-tools
 endif
+endif
 
 EXAMPLES	= $(patsubst %.ml,%,$(wildcard examples/*.ml))
 
 TESTS		= $(patsubst %.ml,%,$(wildcard tests/*.ml))
 
-all:	bitmatch.cma bitmatch_persistent.cma \
-	bitmatch.cmxa bitmatch_persistent.cmxa \
-	pa_bitmatch.cmo \
-	bitmatch-objinfo
+BENCHMARKS	= $(patsubst %.ml,%,$(wildcard benchmarks/*.ml))
+
+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
 
-bitmatch.cma: bitmatch_types.cmo bitmatch_config.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 $^
 
-bitmatch_persistent.cma: bitmatch_persistent.cmo
+bitstring_persistent.cma: bitstring_persistent.cmo
 	$(OCAMLFIND) ocamlc -a -o $@ $^
 
-bitmatch_persistent.cmo: bitmatch_persistent.ml
+bitstring_persistent.cmo: bitstring_persistent.ml
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
 	  -I +camlp4 -pp camlp4of -c $<
 
-bitmatch.cmxa: bitmatch_types.cmx bitmatch_config.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 $^
 
-bitmatch_persistent.cmxa: bitmatch_persistent.cmx
+bitstring_persistent.cmxa: bitstring_persistent.cmx
 	$(OCAMLFIND) ocamlopt -a -o $@ $^
 
-bitmatch_persistent.cmx: bitmatch_persistent.ml
+bitstring_persistent.cmx: bitstring_persistent.ml
 	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) \
 	  -I +camlp4 -pp camlp4of -c $<
 
-bitmatch_persistent.cmi: bitmatch_persistent.mli
+bitstring_persistent.cmi: bitstring_persistent.mli
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
 	  -I +camlp4 -pp camlp4of -c $<
 
-pa_bitmatch.cmo: pa_bitmatch.ml bitmatch.cma bitmatch_persistent.cma
-	$(OCAMLFIND) ocamlc bitmatch.cma -I +camlp4 camlp4lib.cma \
+pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
+	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 camlp4lib.cma \
 	  -pp camlp4of -c $< -o $@
 
-bitmatch-objinfo: bitmatch_objinfo.cmo bitmatch.cma bitmatch_persistent.cma
+bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
 	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
-	  bitmatch.cma bitmatch_persistent.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 bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo"
+# Tests.
 
-test: pa_bitmatch.cmo bitmatch.cma bitmatch_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 . bitmatch.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
@@ -103,51 +156,103 @@ tests/test.bmpp: create_test_pattern
 create_test_pattern: create_test_pattern.cmo
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
 	  unix.cma -I +camlp4 camlp4lib.cma \
-	  -I . bitmatch.cma bitmatch_persistent.cma $< -o $@
+	  $(OCAMLCLIBS) \
+	  -I . bitstring.cma bitstring_persistent.cma $< -o $@
 
 create_test_pattern.cmo: create_test_pattern.ml
 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
 	  unix.cma -I +camlp4 \
 	  -I . -c $< -o $@
 
-examples: pa_bitmatch.cmo bitmatch.cma bitmatch_persistent.cma
+# 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; \
 	  $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
-	    -package unix -linkpkg -I . bitmatch.cma $$f.ml -o $$f; \
+	    -package unix -linkpkg -I . bitstring.cma $$f.ml -o $$f; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-print-tests: pa_bitmatch.cmo bitmatch_persistent.cma
+print-tests: pa_bitstring.cmo bitstring_persistent.cma
 	@for f in $(TESTS); do \
 	  echo Test: $$f.ml; \
-	  cmd="camlp4o bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo \
+	  cmd="camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo \
 	    -printer pr_o.cmo $$f.ml"; \
 	  echo $$cmd; \
 	  $$cmd; \
 	done
 
-print-examples: pa_bitmatch.cmo
+print-examples: pa_bitstring.cmo
 	@for f in $(EXAMPLES); do \
 	  echo Example: $$f.ml; \
-	  camlp4o bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo \
+	  camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo \
 	    -printer pr_o.cmo $$f.ml; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
+# Benchmarks.
+
+ifneq ($(TIME),no)
+
+benchmarks: pa_bitstring.cmo bitstring.cma bitstring_persistent.cma
+	@for f in $(BENCHMARKS); do \
+	  $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(PP) \
+	    -package unix -linkpkg -I . bitstring.cmxa $$f.ml -o $$f.opt; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	  $(TIME) -f "$$f: %e seconds" $$f.opt; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	done
+ifneq ($(GPROF),no)
+	@for f in $(BENCHMARKS); do \
+	  $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(PP) -p \
+	    -package unix -linkpkg -I . bitstring.cmxa $$f.ml -o $$f.opt.p; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	  rm -f gmon.out; \
+	  $$f.opt.p; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	  gprof $$f.opt.p > $$f.profile; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	  echo "Wrote profile of $$f"; \
+	  echo "    to $$f.profile"; \
+	  rm -f gmon.out; \
+	done
+endif
+
+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
 	rm -rf autom4te.cache
 	rm -f config.log config.status
-	rm -f config.h Makefile META bitmatch_config.ml
+	rm -f config.h Makefile META bitstring_config.ml
+	rm -f bitstring-objinfo
 	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
 # Documentation.
@@ -157,16 +262,16 @@ doc:
 	rm -rf html
 	mkdir html
 	$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html -I +camlp4 \
-	  bitmatch.mli bitmatch_persistent.mli
+	  bitstring.mli bitstring_persistent.mli bitmatch.ml
 endif
 
 # Install.
 
 install:
-	ocamlfind install bitmatch META *.mli *.cmx *.cma *.cmxa *.a \
-		bitmatch.cmi \
-		bitmatch_persistent.cmi \
-		pa_bitmatch.cmo
+	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
 
 # Standard rules.
@@ -181,11 +286,17 @@ install:
 depend: .depend
 	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-.depend: bitmatch.ml bitmatch.mli bitmatch_persistent.ml bitmatch_persistent.mli
+.depend: bitstring.ml bitstring.mli \
+	  bitstring_persistent.ml bitstring_persistent.mli \
+	  bitstring_objinfo.ml \
+	  create_test_pattern.ml
 	rm -f .depend
-	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) bitmatch.ml bitmatch.mli >> $@
+	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) \
+	  bitstring.ml bitstring.mli \
+	  bitstring_objinfo.ml >> $@
 	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) -pp camlp4of \
-	  bitmatch_persistent.ml bitmatch_persistent.mli >> $@
+	  bitstring_persistent.ml bitstring_persistent.mli \
+	  create_test_pattern.ml >> $@
 
 ifeq ($(wildcard .depend),.depend)
 include .depend
@@ -213,6 +324,6 @@ check-manifest:
 	exit $$rv
 
 .PHONY: depend dist check-manifest dpkg doc \
-	print-examples print-tests examples test
+	print-examples print-tests examples test benchmarks
 
 .SUFFIXES:      .cmo .cmi .cmx .ml .mli .mll