- Try to do better pretty printing when array elements are individually

[bpt/coccinelle.git] / bundles / sexplib / Makefile

diff --git a/bundles/sexplib/Makefile b/bundles/sexplib/Makefile
index 1db3885..cd61893 100644 (file)
--- a/bundles/sexplib/Makefile
+++ b/bundles/sexplib/Makefile
@@ -13,8 +13,8 @@ ifneq ($(MAKECMDGOALS),distclean)
 include ../../Makefile.config
 endif
 
-OCAMLCFLAGS ?= -g -dtypes
-OPTFLAGS ?= -g -dtypes
+OCAMLCFLAGS ?= -g
+OPTFLAGS ?= -g
 
 VERSION=7.0.5
 SEXPDIR=sexplib-$(VERSION)
@@ -22,8 +22,8 @@ SEXPLIB=$(SEXPDIR)/lib
 SEXPMARKER=$(SEXPDIR)/.marker
 
 PP_CMD=$(CPP) -x c -w -traditional -undef
-OCAMLC_CMD=$(OCAMLC) $(OCAMLCFLAGS) -I $(SEXPLIB) -thread -pp "${PP_CMD}"
-OCAMLOPT_CMD=$(OCAMLOPT) $(OPTFLAGS) -I $(SEXPLIB) -thread -pp "${PP_CMD}"
+OCAMLC_CMD=$(OCAMLC) $(OCAMLCFLAGS) -I $(SEXPLIB) -pp "${PP_CMD}"
+OCAMLOPT_CMD=$(OCAMLOPT) $(OPTFLAGS) -I $(SEXPLIB) -pp "${PP_CMD}"
 OCAMLDEP_CMD=$(OCAMLDEP) -I $(SEXPLIB) -pp "${PP_CMD}"
 
 all: .depend
@@ -34,6 +34,10 @@ all.opt: .depend
        @$(MAKE) all-opt-build
 all-opt-build: .depend $(SEXPMARKER) sexplib.cmxa META
 
+# prepares the source bundle for building.
+.prepare: $(SEXPMARKER)
+       touch .prepare
+
 clean:
        rm -f sexplib.cma sexplib.cmxa META \
                $(SEXPLIB)/*.cm[ioxa] \
@@ -45,6 +49,7 @@ clean:
 
 distclean: clean
        rm -rf $(SEXPDIR)
+       rm -f .prepare
 
 $(SEXPMARKER): $(SEXPDIR).tar.gz sexp-3.10-compat.patch
        $(TAR) xfvz $<
@@ -119,7 +124,9 @@ $(SEXPLIB)/conv_error.mli: $(SEXPLIB)/conv.cmi
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),depend-build)
-include .depend
+ifneq ($(FEATURE_OCAMLBUILD),yes)
+-include .depend
+endif
 endif
 endif
 endif