From 0386265191303ca71d054e5f868d2a9e92f30fc5 Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Mon, 7 Dec 2015 13:00:04 +0100 Subject: Ignore *.cmt(i) files and allow global COMPFLAGS. Instead of using = to set the COMPFLAGS use += which allows it to specify custom compiler flags in for example the Makefile.config. Also remove *.cmt(i) files and add them to the .gitignore file. Bug 17742 --- Makefile.extr | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile.extr') diff --git a/Makefile.extr b/Makefile.extr index 3e37914e..971725f8 100644 --- a/Makefile.extr +++ b/Makefile.extr @@ -42,7 +42,7 @@ WARNINGS=-w -3 extraction/%.cmx: WARNINGS +=-w -20 extraction/%.cmo: WARNINGS +=-w -20 -COMPFLAGS=-g $(INCLUDES) $(MENHIR_INCLUDES) $(WARNINGS) +COMPFLAGS+=-g $(INCLUDES) $(MENHIR_INCLUDES) $(WARNINGS) # Using .opt compilers if available @@ -117,7 +117,7 @@ endif clean: rm -f $(EXECUTABLES) rm -f $(GENERATED) - for d in $(DIRS); do rm -f $$d/*.cm[iox] $$d/*.o; done + for d in $(DIRS); do rm -f $$d/*.cm[iotx] $$d/*cmti $$d/*.o; done rm -f backend/CMparser.automaton $(MAKE) -C cparser clean @@ -126,5 +126,3 @@ clean: depend: $(GENERATED) @echo "Analyzing OCaml dependencies" @$(OCAMLDEP) $(foreach d,$(DIRS),$(wildcard $(d)/*.mli $(d)/*.ml)) $(GENERATED) >.depend.extr || { rm -f .depend.extr; exit 2; } - - -- cgit