X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=a697d394dc473567fceacfe82ec1f7bc88a8f909;hb=c77f727a7043742154cc624dc34770a74f3d266e;hp=a36a4d623af5f4d68e8fa62ab3b26d977b50f5e6;hpb=8c1c96619509cfcc33fdcd37c9b372991d1f2615;p=ocaml-bitstring.git

diff --git a/Makefile.in b/Makefile.in
index a36a4d6..a697d39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #
-# $Id: Makefile.in,v 1.5 2008-05-07 14:41:03 rjones Exp $
+# $Id$
 
 PACKAGE		= @PACKAGE_NAME@
 VERSION		= @PACKAGE_VERSION@
@@ -25,6 +25,9 @@ OCAMLMKLIB	= @OCAMLMKLIB@
 OCAMLDOC	= @OCAMLDOC@
 INSTALL		= @INSTALL@
 
+pkg_cil		= @pkg_cil@
+pkg_extlib	= @pkg_extlib@
+
 OCAMLCFLAGS	= -g
 OCAMLCPACKAGES	=
 OCAMLOPTFLAGS	=
@@ -32,46 +35,109 @@ OCAMLOPTPACKAGES =
 
 OCAMLDOCFLAGS	= -html -sort
 
-EXAMPLES	= $(wildcard examples/*.ml)
+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:	pa_bitmatch.cmo bitmatch.cma bitmatch.cmxa
+all:	bitmatch.cma bitmatch_persistent.cma \
+	bitmatch.cmxa bitmatch_persistent.cmxa \
+	pa_bitmatch.cmo \
+	bitmatch-objinfo
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-pa_bitmatch.cmo: pa_bitmatch.ml
-	$(OCAMLFIND) ocamlc -I +camlp4 camlp4lib.cma \
-	  -pp camlp4of.opt -c $< -o $@
+bitmatch.cma: bitmatch_types.cmo bitmatch_config.cmo bitmatch.cmo
+	$(OCAMLFIND) ocamlc -a -o $@ $^
 
-bitmatch.cma: bitmatch.cmo
+bitmatch_persistent.cma: bitmatch_persistent.cmo
 	$(OCAMLFIND) ocamlc -a -o $@ $^
 
-bitmatch.cmxa: bitmatch.cmx
+bitmatch_persistent.cmo: bitmatch_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 $@ $^
 
+bitmatch_persistent.cmxa: bitmatch_persistent.cmx
+	$(OCAMLFIND) ocamlopt -a -o $@ $^
+
+bitmatch_persistent.cmx: bitmatch_persistent.ml
+	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) \
+	  -I +camlp4 -pp camlp4of -c $<
+
+bitmatch_persistent.cmi: bitmatch_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 \
+	  -pp camlp4of -c $< -o $@
+
+bitmatch-objinfo: bitmatch_objinfo.cmo bitmatch.cma bitmatch_persistent.cma
+	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
+	  bitmatch.cma bitmatch_persistent.cma \
+	  $< -o $@
+
 # Tests and examples.
 
-test: pa_bitmatch.cmo bitmatch.cma
+PP	= -pp "camlp4o bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo"
+
+test: pa_bitmatch.cmo bitmatch.cma bitmatch_persistent.cma tests/test.bmpp
 	@for f in $(TESTS); do \
-	  echo Test: $$f; \
-	  $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp "camlp4o pa_bitmatch.cmo" \
+	  echo Building $$f; \
+	  $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
 	    -package unix -linkpkg -I . bitmatch.cma $$f.ml -o $$f; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	  echo Running $$f; \
 	  $$f; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
+
+tests/test.bmpp: create_test_pattern
+	./$< $@.new
+	mv $@.new $@
 
-print-tests: pa_bitmatch.cmo
+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 $@
+
+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
+	@for f in $(EXAMPLES); do \
+	  echo Building $$f; \
+	  $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
+	    -package unix -linkpkg -I . bitmatch.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
 	@for f in $(TESTS); do \
 	  echo Test: $$f.ml; \
-	  cmd="camlp4o pa_bitmatch.cmo -printer pr_o.cmo $$f.ml"; \
+	  cmd="camlp4o bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo \
+	    -printer pr_o.cmo $$f.ml"; \
 	  echo $$cmd; \
 	  $$cmd; \
 	done
 
 print-examples: pa_bitmatch.cmo
 	@for f in $(EXAMPLES); do \
-	  echo Example: $$f; \
-	  camlp4o pa_bitmatch.cmo -printer pr_o.cmo $$f; \
+	  echo Example: $$f.ml; \
+	  camlp4o bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo \
+	    -printer pr_o.cmo $$f.ml; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
@@ -80,7 +146,14 @@ print-examples: pa_bitmatch.cmo
 clean:
 	rm -f core *~ *.cmi *.cmo *.cmx *.cma *.cmxa *.a *.o
 	rm -f tests/*~ tests/*.cmi tests/*.cmo $(TESTS)
-	rm -f examples/*~
+	rm -f examples/*~ examples/*.cmi examples/*.cmo $(EXAMPLES)
+	@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
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
 # Documentation.
 
@@ -88,7 +161,8 @@ ifneq ($(OCAMLDOC),)
 doc:
 	rm -rf html
 	mkdir html
-	$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html bitmatch.mli bitmatch.ml
+	$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html -I +camlp4 \
+	  bitmatch.mli bitmatch_persistent.mli
 endif
 
 # Install.
@@ -96,7 +170,9 @@ endif
 install:
 	ocamlfind install bitmatch META *.mli *.cmx *.cma *.cmxa *.a \
 		bitmatch.cmi \
+		bitmatch_persistent.cmi \
 		pa_bitmatch.cmo
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
 # Standard rules.
 
@@ -108,10 +184,19 @@ install:
 	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -c $<
 
 depend: .depend
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-.depend: bitmatch.ml bitmatch.mli
+.depend: bitmatch.ml bitmatch.mli \
+	  bitmatch_persistent.ml bitmatch_persistent.mli \
+	  bitmatch_objinfo.ml \
+	  create_test_pattern.ml
 	rm -f .depend
-	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) $^ > $@
+	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) \
+	  bitmatch.ml bitmatch.mli \
+	  bitmatch_objinfo.ml >> $@
+	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) -pp camlp4of \
+	  bitmatch_persistent.ml bitmatch_persistent.mli \
+	  create_test_pattern.ml >> $@
 
 ifeq ($(wildcard .depend),.depend)
 include .depend
@@ -126,21 +211,19 @@ dist:
 	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
 	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
 	$(INSTALL) -m 0644 config.h.in $(PACKAGE)-$(VERSION)/
+	svn log -v > $(PACKAGE)-$(VERSION)/CHANGES
 	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
 	rm -rf $(PACKAGE)-$(VERSION)
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-	@for d in `find -type d -name CVS`; do \
-	b=`dirname $$d`/; \
-	awk -F/ '$$1 != "D" {print $$2}' $$d/Entries | \
-	sed -e "s|^|$$b|" -e "s|^\./||"; \
-	done | sort > .check-manifest; \
+	svn -R list | grep -v '/$$' | sort > .check-manifest
 	sort MANIFEST > .orig-manifest; \
 	diff -u .orig-manifest .check-manifest; rv=$$?; \
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
-.PHONY: depend dist check-manifest dpkg doc print-examples print-tests test
+.PHONY: depend dist check-manifest dpkg doc \
+	print-examples print-tests examples test
 
 .SUFFIXES:      .cmo .cmi .cmx .ml .mli .mll