X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=cb71f5a876c20c24303ab974b87a50e4ee3ff11e;hb=f91107d9b5836be578669d819c131a81a330aa37;hp=a32488237f224eb463fd7a9a8146a0e4cc91871a;hpb=91f0f002debe015e52008af4f9ee889333ac7bb2;p=ocaml-bitstring.git

diff --git a/Makefile.in b/Makefile.in
index a324882..cb71f5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ OCAMLDOC	= @OCAMLDOC@
 INSTALL		= @INSTALL@
 TIME		= @TIME@
 GPROF		= @GPROF@
+SED		= @SED@
 BISECT_REPORT	= @BISECT_REPORT@
 
 BYTESWAP_H	= @BYTESWAP_H@
@@ -33,8 +34,8 @@ BYTESWAP_H	= @BYTESWAP_H@
 OCAMLLIB	= @OCAMLLIB@
 top_srcdir	= @top_srcdir@
 
-pkg_cil		= @pkg_cil@
-pkg_extlib	= @pkg_extlib@
+pkg_cil		= @OCAML_PKG_cil@
+pkg_extlib	= @OCAML_PKG_extlib@
 
 enable_coverage = @enable_coverage@
 
@@ -135,6 +136,8 @@ else
 PP	= -pp 'camlp4o $(OCAMLLIB)/bisect/bisect.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo'
 endif
 
+check: test
+
 test: pa_bitstring.cmo \
 	bitstring.cma bitstring_persistent.cma \
 	bitstring.cmxa bitstring_persistent.cmxa \
@@ -293,13 +296,20 @@ depend: .depend
 	  bitstring_persistent.ml bitstring_persistent.mli \
 	  bitstring_objinfo.ml \
 	  create_test_pattern.ml
-	rm -f .depend
+	rm -f $@ $@-t
 	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) \
 	  bitstring.ml bitstring.mli \
-	  bitstring_objinfo.ml >> $@
+	  bitstring_objinfo.ml | \
+	  $(SED) 's/ :/:/' | \
+	  $(SED) 's/ *$$//' | \
+	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' >> $@-t
 	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) -pp camlp4of \
 	  bitstring_persistent.ml bitstring_persistent.mli \
-	  create_test_pattern.ml >> $@
+	  create_test_pattern.ml | \
+	  $(SED) 's/ :/:/' | \
+	  $(SED) 's/ *$$//' | \
+	  $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' >> $@-t
+	mv $@-t $@
 
 ifeq ($(wildcard .depend),.depend)
 include .depend