q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ce65929422dc73aebc333a26d243a85a9a481bac
commit ce65929422dc73aebc333a26d243a85a9a481bac
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Mon Jun 1 16:59:00 2015 +0100
autotools: remove EOLIAN_FLAGS
We don't need to specify each dir separately as Eolian
has been searching recursively for quite a while.
---
src/Makefile.am | 11 -----------
src/Makefile_Elua_Helper.am | 2 +-
src/Makefile_Eolian_Cxx.am | 3 ---
src/Makefile_Eolian_Cxx_Helper.am | 2 +-
src/Makefile_Eolian_Helper.am | 8 ++++----
5 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ff8e1d..b930b54 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,17 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES =
BUILT_SOURCES =
-EOLIAN_FLAGS = -I$(srcdir)\
- -I$(srcdir)/lib/eo \
- -I$(srcdir)/lib/ector \
- -I$(srcdir)/lib/evas/canvas \
- -I$(srcdir)/lib/edje \
- -I$(srcdir)/lib/efl/interfaces \
- -I$(srcdir)/lib/ecore_audio \
- -I$(srcdir)/lib/ecore \
- -I$(srcdir)/lib/ecore_con \
- -I$(srcdir)/lib/eio
-
DIST_SUBDIRS =
SUBDIRS =
diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am
index 10b1554..870a772 100644
--- a/src/Makefile_Elua_Helper.am
+++ b/src/Makefile_Elua_Helper.am
@@ -20,6 +20,6 @@ am__v_ELUA_0 = @echo " ELUA " $@;
SUFFIXES += .lua
%.eo.lua: %.eo ${_ELUA_GEN_DEP}
- $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $<
+ $(AM_V_ELUA)$(ELUA_GEN) -I$(srcdir) -o $@ $<
CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 3246324..b310bbe 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -56,9 +56,6 @@ bin_eolian_cxx_eolian_cxx_DEPENDENCIES =
@USE_EOLIAN_INTERNAL_LIBS@
if EFL_ENABLE_TESTS
-EOLIAN_FLAGS += \
- -I$(srcdir)
-
check_PROGRAMS += tests/eolian_cxx/eolian_cxx_suite
TESTS += tests/eolian_cxx/eolian_cxx_suite
diff --git a/src/Makefile_Eolian_Cxx_Helper.am
b/src/Makefile_Eolian_Cxx_Helper.am
index 1b06afd..64dd131 100644
--- a/src/Makefile_Eolian_Cxx_Helper.am
+++ b/src/Makefile_Eolian_Cxx_Helper.am
@@ -15,6 +15,6 @@ SUFFIXES += .eo.hh
%.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
$(AM_V_EOLCXX) \
$(MKDIR_P) $(dir $@); \
- $(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $<
+ $(EOLIAN_CXX) -I$(srcdir) -o $@ $<
CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index 34ea60f..e533fd9 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -15,21 +15,21 @@ SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h
%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL) \
$(MKDIR_P) $(dir $@); \
- $(EOLIAN_GEN) --eo --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
+ $(EOLIAN_GEN) --eo --legacy -I$(srcdir) --gc -o $@ $<
%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL) \
$(MKDIR_P) $(dir $@); \
- $(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $<
+ $(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $<
%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
$(AM_V_EOL) \
$(MKDIR_P) $(dir $@); \
- $(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $<
+ $(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $<
%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL) \
$(MKDIR_P) $(dir $@); \
- $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
+ $(EOLIAN_GEN) --legacy -I$(srcdir) --gh -o $@ $<
CLEANFILES += $(BUILT_SOURCES)
--
