summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-06-01 16:59:00 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-06-01 17:28:45 +0100
commitce65929422dc73aebc333a26d243a85a9a481bac (patch)
treebde6b819b4c540372d03208f71e209e3eaa26dfc
parent0148350ce94be3dee92ccd9f15ae0549a4f81734 (diff)
autotools: remove EOLIAN_FLAGS
We don't need to specify each dir separately as Eolian has been searching recursively for quite a while.
-rw-r--r--src/Makefile.am11
-rw-r--r--src/Makefile_Elua_Helper.am2
-rw-r--r--src/Makefile_Eolian_Cxx.am3
-rw-r--r--src/Makefile_Eolian_Cxx_Helper.am2
-rw-r--r--src/Makefile_Eolian_Helper.am8
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
2CLEANFILES = 2CLEANFILES =
3BUILT_SOURCES = 3BUILT_SOURCES =
4 4
5EOLIAN_FLAGS = -I$(srcdir)\
6 -I$(srcdir)/lib/eo \
7 -I$(srcdir)/lib/ector \
8 -I$(srcdir)/lib/evas/canvas \
9 -I$(srcdir)/lib/edje \
10 -I$(srcdir)/lib/efl/interfaces \
11 -I$(srcdir)/lib/ecore_audio \
12 -I$(srcdir)/lib/ecore \
13 -I$(srcdir)/lib/ecore_con \
14 -I$(srcdir)/lib/eio
15
16DIST_SUBDIRS = 5DIST_SUBDIRS =
17SUBDIRS = 6SUBDIRS =
18 7
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 " $@;
20SUFFIXES += .lua 20SUFFIXES += .lua
21 21
22%.eo.lua: %.eo ${_ELUA_GEN_DEP} 22%.eo.lua: %.eo ${_ELUA_GEN_DEP}
23 $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $< 23 $(AM_V_ELUA)$(ELUA_GEN) -I$(srcdir) -o $@ $<
24 24
25CLEANFILES += $(BUILT_SOURCES) 25CLEANFILES += $(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@
56 56
57if EFL_ENABLE_TESTS 57if EFL_ENABLE_TESTS
58 58
59EOLIAN_FLAGS += \
60 -I$(srcdir)
61
62check_PROGRAMS += tests/eolian_cxx/eolian_cxx_suite 59check_PROGRAMS += tests/eolian_cxx/eolian_cxx_suite
63TESTS += tests/eolian_cxx/eolian_cxx_suite 60TESTS += tests/eolian_cxx/eolian_cxx_suite
64 61
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
15%.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP) 15%.eo.impl.hh %.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
16 $(AM_V_EOLCXX) \ 16 $(AM_V_EOLCXX) \
17 $(MKDIR_P) $(dir $@); \ 17 $(MKDIR_P) $(dir $@); \
18 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $< 18 $(EOLIAN_CXX) -I$(srcdir) -o $@ $<
19 19
20CLEANFILES += $(BUILT_SOURCES) 20CLEANFILES += $(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
15%.eo.c: %.eo ${_EOLIAN_GEN_DEP} 15%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
16 $(AM_V_EOL) \ 16 $(AM_V_EOL) \
17 $(MKDIR_P) $(dir $@); \ 17 $(MKDIR_P) $(dir $@); \
18 $(EOLIAN_GEN) --eo --legacy $(EOLIAN_FLAGS) --gc -o $@ $< 18 $(EOLIAN_GEN) --eo --legacy -I$(srcdir) --gc -o $@ $<
19 19
20%.eo.h: %.eo ${_EOLIAN_GEN_DEP} 20%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
21 $(AM_V_EOL) \ 21 $(AM_V_EOL) \
22 $(MKDIR_P) $(dir $@); \ 22 $(MKDIR_P) $(dir $@); \
23 $(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $< 23 $(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $<
24 24
25%.eot.h: %.eot ${_EOLIAN_GEN_DEP} 25%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
26 $(AM_V_EOL) \ 26 $(AM_V_EOL) \
27 $(MKDIR_P) $(dir $@); \ 27 $(MKDIR_P) $(dir $@); \
28 $(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $< 28 $(EOLIAN_GEN) --eo -I$(srcdir) --gh -o $@ $<
29 29
30%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP} 30%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
31 $(AM_V_EOL) \ 31 $(AM_V_EOL) \
32 $(MKDIR_P) $(dir $@); \ 32 $(MKDIR_P) $(dir $@); \
33 $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< 33 $(EOLIAN_GEN) --legacy -I$(srcdir) --gh -o $@ $<
34 34
35CLEANFILES += $(BUILT_SOURCES) 35CLEANFILES += $(BUILT_SOURCES)