aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlmamane2007-08-07 10:20:12 +0000
committerlmamane2007-08-07 10:20:12 +0000
commitf4458b61e2c85e26570da6a299c3d11bac84d597 (patch)
tree04d87e250ae9d22af2facfe0a7e0c9d0ef9b57cc
parenta9bff78c7639e7f22be5f325cae066354454537e (diff)
Build system: _really_ don't recurse into VCS metadata for file lists
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10058 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile.common14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common
index f899953a07..cd0d6ab790 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -432,22 +432,22 @@ PRINTERSCMO:=\
dev/top_printers.cmo
FIND_VCS_CLAUSE:='(' -name '{arch}' -or -name '.svn' -or -name '_darcs' -or -name '.git' -or -name "$${GIT_DIR}" ')' -prune -or
-FIND_PRINTF_P:=| sed 's|^\./||'
+FIND_PRINTF_P:=-print | sed 's|^\./||'
-YACCFILES:= $(shell find . $(VCS_CLAUSE) '(' -name '*.mly' ')' $(FIND_PRINTF_P))
-LEXFILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.mll' ')' $(FIND_PRINTF_P))
+YACCFILES:=$(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.mly' ')' $(FIND_PRINTF_P))
+LEXFILES := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.mll' ')' $(FIND_PRINTF_P))
GENMLFILES:=$(LEXFILES:.mll=.ml) $(YACCFILES:.mly=.ml) \
scripts/tolink.ml kernel/copcodes.ml
GENMLIFILES:=$(YACCFILES:.mly=.mli)
GENHFILES:=kernel/byterun/coq_jumptbl.h
GENFILES:=$(GENMLFILES) $(GENMLIFILES) $(GENHFILES)
-MLFILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.ml' ')' $(FIND_PRINTF_P) | \
+MLFILES := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.ml' ')' $(FIND_PRINTF_P) | \
while read f; do if ! [ -e "$${f}4" ]; then echo "$$f"; fi; done) \
$(GENMLFILES)
-MLIFILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.mli' ')' $(FIND_PRINTF_P)) \
+MLIFILES := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.mli' ')' $(FIND_PRINTF_P)) \
$(GENMLIFILES)
-ML4FILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.ml4' ')' $(FIND_PRINTF_P))
-VFILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.v' ')' $(FIND_PRINTF_P))
+ML4FILES := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.ml4' ')' $(FIND_PRINTF_P))
+VFILES := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.v' ')' $(FIND_PRINTF_P))
CFILES := $(shell find kernel/byterun -name '*.c')
ML4FILESML:= $(ML4FILES:.ml4=.ml)