summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-20 19:22:59 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-07-30 18:16:20 +0200
commit54907b199508f4a7b2058f683f1693993417b49b (patch)
treee17766f1ba986b9806f565bff5217a083baa63ef
parentd17bbc2a788f2a0e4490a8e2ba418cd902484cd8 (diff)
build: disable eolian implicit rules in subdir builds
the ../ rules override the global rules to block actions which would force eolian to generate files which should be managed by a higher level makefile this cuts a substantial amount of time out of distcheck from example builds Differential Revision: https://phab.enlightenment.org/D6660
-rw-r--r--src/Makefile_Eolian_Cxx_Helper.am5
-rw-r--r--src/Makefile_Eolian_Files_Helper.am7
-rw-r--r--src/Makefile_Eolian_Js_Helper.am2
3 files changed, 14 insertions, 0 deletions
diff --git a/src/Makefile_Eolian_Cxx_Helper.am b/src/Makefile_Eolian_Cxx_Helper.am
index 94f581e6e9..eb28a54e43 100644
--- a/src/Makefile_Eolian_Cxx_Helper.am
+++ b/src/Makefile_Eolian_Cxx_Helper.am
@@ -12,6 +12,11 @@ am__v_EOLCXX_0 = @echo " EOLCXX " $@;
12 12
13SUFFIXES += .eo.hh 13SUFFIXES += .eo.hh
14 14
15
16#disable rules for subdir builds to avoid recursive dependencies
17../%.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
18../%.eo.impl.hh: %.eo $(_EOLIAN_CXX_DEP)
19
15%.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP) 20%.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
16 $(AM_V_EOLCXX) \ 21 $(AM_V_EOLCXX) \
17 $(MKDIR_P) $(@D); \ 22 $(MKDIR_P) $(@D); \
diff --git a/src/Makefile_Eolian_Files_Helper.am b/src/Makefile_Eolian_Files_Helper.am
index 37d5114d14..35bf1318cc 100644
--- a/src/Makefile_Eolian_Files_Helper.am
+++ b/src/Makefile_Eolian_Files_Helper.am
@@ -5,6 +5,13 @@ am__v_EOL_0 = @echo " EOLIAN " $@;
5 5
6SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h 6SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h
7 7
8
9#disable rules for subdir builds to avoid recursive dependencies
10../%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
11../%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
12../%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
13../%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
14
8%.eo.c: %.eo ${_EOLIAN_GEN_DEP} 15%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
9 $(AM_V_EOL) \ 16 $(AM_V_EOL) \
10 $(MKDIR_P) $(@D); \ 17 $(MKDIR_P) $(@D); \
diff --git a/src/Makefile_Eolian_Js_Helper.am b/src/Makefile_Eolian_Js_Helper.am
index fc60a8db0d..e96db1a352 100644
--- a/src/Makefile_Eolian_Js_Helper.am
+++ b/src/Makefile_Eolian_Js_Helper.am
@@ -14,3 +14,5 @@ SUFFIXES += .eo.js.cc
14 14
15%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP) 15%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP)
16 $(AM_V_EOLJS)$(EOLIAN_JS) $(EOLIAN_FLAGS) -o $@ $< 16 $(AM_V_EOLJS)$(EOLIAN_JS) $(EOLIAN_FLAGS) -o $@ $<
17
18../%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP)