X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=a697d394dc473567fceacfe82ec1f7bc88a8f909;hb=9c50223e129d33742f2d172edff5761f8b4b8195;hp=b535b7a74a56f8a669633f5e1167175b117b8ce0;hpb=909f573d797eee83641263fbfe9c42417185ec26;p=ocaml-bitstring.git

diff --git a/Makefile.in b/Makefile.in
index b535b7a..a697d39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,9 @@ OCAMLMKLIB	= @OCAMLMKLIB@
 OCAMLDOC	= @OCAMLDOC@
 INSTALL		= @INSTALL@
 
+pkg_cil		= @pkg_cil@
+pkg_extlib	= @pkg_extlib@
+
 OCAMLCFLAGS	= -g
 OCAMLCPACKAGES	=
 OCAMLOPTFLAGS	=
@@ -34,31 +37,59 @@ 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:	bitmatch.cma bitmatch_persistent.cma \
+	bitmatch.cmxa bitmatch_persistent.cmxa \
+	pa_bitmatch.cmo \
+	bitmatch-objinfo
 	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
 bitmatch.cma: bitmatch_types.cmo bitmatch_config.cmo bitmatch.cmo
 	$(OCAMLFIND) ocamlc -a -o $@ $^
 
+bitmatch_persistent.cma: bitmatch_persistent.cmo
+	$(OCAMLFIND) ocamlc -a -o $@ $^
+
+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 $@ $^
 
-pa_bitmatch.cmo: pa_bitmatch.ml bitmatch.cma
+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.opt -c $< -o $@
+	  -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.
 
-PP	= -pp "camlp4o bitmatch.cma pa_bitmatch.cmo"
+PP	= -pp "camlp4o bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo"
 
-test: pa_bitmatch.cmo bitmatch.cma
+test: pa_bitmatch.cmo bitmatch.cma bitmatch_persistent.cma tests/test.bmpp
 	@for f in $(TESTS); do \
 	  echo Building $$f; \
 	  $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(PP) \
@@ -70,19 +101,34 @@ test: pa_bitmatch.cmo bitmatch.cma
 	done
 	@for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
 
-examples: pa_bitmatch.cmo bitmatch.cma
+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 . 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 $(OCAMLFLAGS) $(PP) \
+	  $(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
+print-tests: pa_bitmatch.cmo bitmatch_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 bitmatch.cma bitmatch_persistent.cma pa_bitmatch.cmo \
+	    -printer pr_o.cmo $$f.ml"; \
 	  echo $$cmd; \
 	  $$cmd; \
 	done
@@ -90,7 +136,8 @@ print-tests: pa_bitmatch.cmo
 print-examples: pa_bitmatch.cmo
 	@for f in $(EXAMPLES); do \
 	  echo Example: $$f.ml; \
-	  camlp4o bitmatch.cma pa_bitmatch.cmo -printer pr_o.cmo $$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
 
@@ -114,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.
@@ -122,6 +170,7 @@ 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
 
@@ -137,9 +186,17 @@ install:
 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