From 1d933c489d1f9d064fd54a4487754a86a0aed506 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Mon, 24 Mar 2014 18:37:24 +0100
Subject: Revert "Makefile: the initial build of grammar.cma is now
 directory-driven"

This reverts commit f694544d016b085b3cd10007b9f7716ae2c3b022.

This commit was wrong, since (at least) the highparsing part depends
on the toplevel directory. I still didn't had time to fix that, so
in the meantime let's revert it.
---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 109196bea4..5f5397fa72 100644
--- a/Makefile
+++ b/Makefile
@@ -59,11 +59,20 @@ define find
  $(shell find . $(FIND_VCS_CLAUSE) '(' -name $(1) ')' -print | sed 's|^\./||')
 endef
 
+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
 
 YACCFILES:=$(call find, '*.mly')
 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')
 
-- 
cgit v1.2.3