aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPierre Letouzey2016-06-01 00:59:46 +0200
committerPierre Letouzey2016-06-01 00:59:46 +0200
commit114d5f0d0bca9f01d7a5ab3381a9b9ca4291191a (patch)
tree3aeacfad3a11279599bf4362f8318eb2d8b62ccd /Makefile
parent842dfef1d52c739119808ea1dec3509c0cf86435 (diff)
parentd0a9edabf59a858625d11516cdb230d223a77aeb (diff)
Merge branch 'yet-another-makefile-bigbang' into trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 0 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index c5415d9f6f..17ff8041f1 100644
--- a/Makefile
+++ b/Makefile
@@ -63,15 +63,10 @@ define findx
$(shell find . $(FIND_VCS_CLAUSE) '(' -name $(1) ')' -exec $(2) {} \; | sed 's|^\./||')
endef
-# We now discriminate .ml4 files according to their need of grammar.cma
-# or q_constr.cmo
-USEGRAMMAR := '(\*.*camlp4deps.*grammar'
-
## Files in the source tree
LEXFILES := $(call find, '*.mll')
export MLLIBFILES := $(call find, '*.mllib')
-export ML4BASEFILES := $(call findx, '*.ml4', grep -L -e $(USEGRAMMAR))
export ML4FILES := $(call find, '*.ml4')
export CFILES := $(call find, '*.c')
@@ -150,10 +145,7 @@ endif
MAKE_OPTS := --warn-undefined-variable --no-builtin-rules
-GRAM_TARGETS := grammar/grammar.cma grammar/q_constr.cmo
-
submake:
- $(MAKE) $(MAKE_OPTS) -f Makefile.build BUILDGRAMMAR=1 $(GRAM_TARGETS)
$(MAKE) $(MAKE_OPTS) -f Makefile.build $(MAKECMDGOALS)
noconfig: