X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=c60a315d19b3b0d1800bea2a0b0ae4cad0df9cb0;hb=0fb4b24ebe3b85c935786f8e3e472d0d2292744e;hp=b14909d3eebad5d9e4d7c8739e0def901faf54a1;hpb=99694ec805b9d98b5132f9db0d9b786b153a7742;p=ocaml-bitstring.git

diff --git a/Makefile.in b/Makefile.in
index b14909d..c60a315 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
@@ -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,57 +35,111 @@ OCAMLOPTPACKAGES =
 
 OCAMLDOCFLAGS	= -html -sort
 
+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.cmxa pa_bitmatch.cmo
+all:	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
+bitstring.cma: bitstring_types.cmo bitstring_config.cmo bitstring.cmo \
+	  bitmatch.cmo
 	$(OCAMLFIND) ocamlc -a -o $@ $^
 
-bitmatch.cmxa: bitmatch_types.cmx bitmatch_config.cmx bitmatch.cmx
+bitstring_persistent.cma: bitstring_persistent.cmo
+	$(OCAMLFIND) ocamlc -a -o $@ $^
+
+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_persistent.cmxa: bitstring_persistent.cmx
 	$(OCAMLFIND) ocamlopt -a -o $@ $^
 
-pa_bitmatch.cmo: pa_bitmatch.ml bitmatch.cma
-	$(OCAMLFIND) ocamlc bitmatch.cma -I +camlp4 camlp4lib.cma \
-	  -pp camlp4of.opt -c $< -o $@
+bitstring_persistent.cmx: bitstring_persistent.ml
+	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) \
+	  -I +camlp4 -pp camlp4of -c $<
+
+bitstring_persistent.cmi: bitstring_persistent.mli
+	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
+	  -I +camlp4 -pp camlp4of -c $<
+
+pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
+	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 camlp4lib.cma \
+	  -pp camlp4of -c $< -o $@
+
+bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
+	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma camlp4lib.cma \
+	  bitstring.cma bitstring_persistent.cma \
+	  $< -o $@
 
 # Tests and examples.
 
-PP	= -pp "camlp4o bitmatch.cma pa_bitmatch.cmo"
+PP	= -pp "camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
 
-test: pa_bitmatch.cmo bitmatch.cma
+test: pa_bitstring.cmo bitstring.cma bitstring_persistent.cma 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; \
+	    -package unix -linkpkg -I . bitstring.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
 
-examples:
+tests/test.bmpp: create_test_pattern
+	./$< $@.new
+	mv $@.new $@
+
+create_test_pattern: create_test_pattern.cmo
+	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
+	  unix.cma -I +camlp4 camlp4lib.cma \
+	  -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_bitstring.cmo bitstring.cma bitstring_persistent.cma
 	@for f in $(EXAMPLES); do \
 	  echo Building $$f; \
-	  $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(PP) \
-	    -package unix -linkpkg -I . bitmatch.cma $$f.ml -o $$f; \
+	  $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
+	    -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
+print-tests: pa_bitstring.cmo bitstring_persistent.cma
 	@for f in $(TESTS); do \
 	  echo Test: $$f.ml; \
-	  cmd="camlp4o bitmatch.cma pa_bitmatch.cmo -printer pr_o.cmo $$f.ml"; \
+	  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 pa_bitmatch.cmo -printer pr_o.cmo $$f.ml; \
+	  camlp4o bitstring.cma bitstring_persistent.cma pa_bitstring.cmo \
+	    -printer pr_o.cmo $$f.ml; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
@@ -92,11 +149,14 @@ 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)
+	@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.
 
@@ -104,15 +164,18 @@ ifneq ($(OCAMLDOC),)
 doc:
 	rm -rf html
 	mkdir html
-	$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html bitmatch.mli bitmatch.ml
+	$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html -I +camlp4 \
+	  bitstring.mli bitstring_persistent.mli
 endif
 
 # Install.
 
 install:
-	ocamlfind install bitmatch META *.mli *.cmx *.cma *.cmxa *.a \
-		bitmatch.cmi \
-		pa_bitmatch.cmo
+	ocamlfind install bitstring META *.mli *.cmx *.cma *.cmxa *.a \
+		bitstring.cmi \
+		bitstring_persistent.cmi \
+		pa_bitstring.cmo
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
 # Standard rules.
 
@@ -124,10 +187,19 @@ install:
 	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -c $<
 
 depend: .depend
+	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-.depend: bitmatch.ml bitmatch.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) $^ > $@
+	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) \
+	  bitstring.ml bitstring.mli \
+	  bitstring_objinfo.ml >> $@
+	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) -pp camlp4of \
+	  bitstring_persistent.ml bitstring_persistent.mli \
+	  create_test_pattern.ml >> $@
 
 ifeq ($(wildcard .depend),.depend)
 include .depend
@@ -142,6 +214,7 @@ 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