summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Ecore.am18
-rw-r--r--src/Makefile_Ecore_Audio.am5
-rw-r--r--src/Makefile_Ecore_Cocoa.am6
-rw-r--r--src/Makefile_Ecore_Con.am9
-rw-r--r--src/Makefile_Ecore_Evas.am45
-rw-r--r--src/Makefile_Ecore_FB.am6
-rw-r--r--src/Makefile_Ecore_File.am6
-rw-r--r--src/Makefile_Ecore_Imf.am38
-rw-r--r--src/Makefile_Ecore_Input.am12
-rw-r--r--src/Makefile_Ecore_Ipc.am6
-rw-r--r--src/Makefile_Ecore_Psl1ght.am6
-rw-r--r--src/Makefile_Ecore_SDL.am6
-rw-r--r--src/Makefile_Ecore_Wayland.am6
-rw-r--r--src/Makefile_Ecore_Win32.am7
-rw-r--r--src/Makefile_Ecore_WinCE.am7
-rw-r--r--src/Makefile_Ecore_X.am5
-rw-r--r--src/Makefile_Eet.am16
-rw-r--r--src/Makefile_Eina.am3
-rw-r--r--src/Makefile_Eio.am6
-rw-r--r--src/Makefile_Embryo.am9
-rw-r--r--src/Makefile_Eo.am30
-rw-r--r--src/Makefile_Escape.am3
-rw-r--r--src/Makefile_Evas.am237
-rw-r--r--src/Makefile_Evil.am6
24 files changed, 66 insertions, 432 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 3e7684a..1251ca9 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -49,11 +49,9 @@ endif
49 49
50lib_ecore_libecore_la_CPPFLAGS = \ 50lib_ecore_libecore_la_CPPFLAGS = \
51-I$(top_srcdir)/src/lib/eina \ 51-I$(top_srcdir)/src/lib/eina \
52-I$(top_builddir)/src/lib/eina \
52-I$(top_srcdir)/src/lib/eo \ 53-I$(top_srcdir)/src/lib/eo \
53-I$(top_srcdir)/src/lib/ecore \ 54-I$(top_srcdir)/src/lib/ecore \
54-I$(top_builddir)/src/lib/eina \
55-I$(top_builddir)/src/lib/eo \
56-I$(top_builddir)/src/lib/ecore \
57-DEFL_ECORE_BUILD \ 55-DEFL_ECORE_BUILD \
58@EFL_CFLAGS@ \ 56@EFL_CFLAGS@ \
59@EFL_COV_CFLAGS@ \ 57@EFL_COV_CFLAGS@ \
@@ -61,14 +59,12 @@ lib_ecore_libecore_la_CPPFLAGS = \
61 59
62if HAVE_WINDOWS 60if HAVE_WINDOWS
63lib_ecore_libecore_la_CPPFLAGS += \ 61lib_ecore_libecore_la_CPPFLAGS += \
64-I$(top_srcdir)/src/lib/evil \ 62-I$(top_srcdir)/src/lib/evil
65-I$(top_builddir)/src/lib/evil
66endif 63endif
67 64
68if HAVE_PS3 65if HAVE_PS3
69lib_ecore_libecore_la_CPPFLAGS += \ 66lib_ecore_libecore_la_CPPFLAGS += \
70-I$(top_srcdir)/src/lib/escape \ 67-I$(top_srcdir)/src/lib/escape
71-I$(top_builddir)/src/lib/escape
72endif 68endif
73 69
74lib_ecore_libecore_la_LIBADD = \ 70lib_ecore_libecore_la_LIBADD = \
@@ -102,19 +98,13 @@ tests/ecore/ecore_suite.h
102 98
103tests_ecore_ecore_suite_CPPFLAGS = \ 99tests_ecore_ecore_suite_CPPFLAGS = \
104-I$(top_srcdir)/src/lib/eina \ 100-I$(top_srcdir)/src/lib/eina \
101-I$(top_builddir)/src/lib/eina \
105-I$(top_srcdir)/src/lib/eo \ 102-I$(top_srcdir)/src/lib/eo \
106-I$(top_srcdir)/src/lib/ecore \ 103-I$(top_srcdir)/src/lib/ecore \
107-I$(top_srcdir)/src/lib/ecore_audio \ 104-I$(top_srcdir)/src/lib/ecore_audio \
108-I$(top_srcdir)/src/lib/ecore_con \ 105-I$(top_srcdir)/src/lib/ecore_con \
109-I$(top_srcdir)/src/lib/ecore_file \ 106-I$(top_srcdir)/src/lib/ecore_file \
110-I$(top_srcdir)/src/lib/ecore_x \ 107-I$(top_srcdir)/src/lib/ecore_x \
111-I$(top_builddir)/src/lib/eina \
112-I$(top_builddir)/src/lib/eo \
113-I$(top_builddir)/src/lib/ecore \
114-I$(top_builddir)/src/lib/ecore_audio \
115-I$(top_builddir)/src/lib/ecore_con \
116-I$(top_builddir)/src/lib/ecore_file \
117-I$(top_builddir)/src/lib/ecore_x \
118-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 108-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
119@CHECK_CFLAGS@ 109@CHECK_CFLAGS@
120 110
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 7862ad9..a6cd46a 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -18,13 +18,10 @@ lib/ecore_audio/ecore_audio_private.h
18 18
19lib_ecore_audio_libecore_audio_la_CPPFLAGS = \ 19lib_ecore_audio_libecore_audio_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \ 20-I$(top_srcdir)/src/lib/eina \
21-I$(top_builddir)/src/lib/eina \
21-I$(top_srcdir)/src/lib/eo \ 22-I$(top_srcdir)/src/lib/eo \
22-I$(top_srcdir)/src/lib/eet \ 23-I$(top_srcdir)/src/lib/eet \
23-I$(top_srcdir)/src/lib/ecore \ 24-I$(top_srcdir)/src/lib/ecore \
24-I$(top_builddir)/src/lib/eina \
25-I$(top_builddir)/src/lib/eo \
26-I$(top_builddir)/src/lib/eet \
27-I$(top_builddir)/src/lib/ecore \
28-DEFL_ECORE_AUDIO_BUILD \ 25-DEFL_ECORE_AUDIO_BUILD \
29@EFL_CFLAGS@ \ 26@EFL_CFLAGS@ \
30@EFL_COV_CFLAGS@ \ 27@EFL_COV_CFLAGS@ \
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index f7f8291..a897dbb 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -15,15 +15,11 @@ lib/ecore_cocoa/ecore_cocoa_private.h
15 15
16lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \ 16lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \
17-I$(top_srcdir)/src/lib/eina \ 17-I$(top_srcdir)/src/lib/eina \
18-I$(top_builddir)/src/lib/eina \
18-I$(top_srcdir)/src/lib/eo \ 19-I$(top_srcdir)/src/lib/eo \
19-I$(top_srcdir)/src/lib/ecore \ 20-I$(top_srcdir)/src/lib/ecore \
20-I$(top_srcdir)/src/lib/ecore_input \ 21-I$(top_srcdir)/src/lib/ecore_input \
21-I$(top_srcdir)/src/lib/ecore_cocoa \ 22-I$(top_srcdir)/src/lib/ecore_cocoa \
22-I$(top_builddir)/src/lib/eina \
23-I$(top_builddir)/src/lib/eo \
24-I$(top_builddir)/src/lib/ecore \
25-I$(top_builddir)/src/lib/ecore_input \
26-I$(top_builddir)/src/lib/ecore_cocoa \
27@EFL_CFLAGS@ \ 23@EFL_CFLAGS@ \
28@EFL_COV_CFLAGS@ 24@EFL_COV_CFLAGS@
29 25
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index f2e6ee8..5ef183c 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -35,15 +35,11 @@ endif
35 35
36lib_ecore_con_libecore_con_la_CPPFLAGS = \ 36lib_ecore_con_libecore_con_la_CPPFLAGS = \
37-I$(top_srcdir)/src/lib/eina \ 37-I$(top_srcdir)/src/lib/eina \
38-I$(top_builddir)/src/lib/eina \
38-I$(top_srcdir)/src/lib/eo \ 39-I$(top_srcdir)/src/lib/eo \
39-I$(top_srcdir)/src/lib/eet \ 40-I$(top_srcdir)/src/lib/eet \
40-I$(top_srcdir)/src/lib/ecore \ 41-I$(top_srcdir)/src/lib/ecore \
41-I$(top_srcdir)/src/lib/ecore_con \ 42-I$(top_srcdir)/src/lib/ecore_con \
42-I$(top_builddir)/src/lib/eina \
43-I$(top_builddir)/src/lib/eo \
44-I$(top_builddir)/src/lib/eet \
45-I$(top_builddir)/src/lib/ecore \
46-I$(top_builddir)/src/lib/ecore_con \
47-DEFL_ECORE_CON_BUILD \ 43-DEFL_ECORE_CON_BUILD \
48@EFL_CFLAGS@ \ 44@EFL_CFLAGS@ \
49@EFL_COV_CFLAGS@ \ 45@EFL_COV_CFLAGS@ \
@@ -51,8 +47,7 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \
51 47
52if HAVE_WINDOWS 48if HAVE_WINDOWS
53lib_ecore_con_libecore_con_la_CPPFLAGS += \ 49lib_ecore_con_libecore_con_la_CPPFLAGS += \
54-I$(top_srcdir)/src/lib/evil \ 50-I$(top_srcdir)/src/lib/evil
55-I$(top_builddir)/src/lib/evil
56endif 51endif
57 52
58lib_ecore_con_libecore_con_la_LIBADD = \ 53lib_ecore_con_libecore_con_la_LIBADD = \
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index f0f5aa8..79faae6 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -18,6 +18,7 @@ lib/ecore_evas/ecore_evas_private.h
18 18
19lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ 19lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \ 20-I$(top_srcdir)/src/lib/eina \
21-I$(top_builddir)/src/lib/eina \
21-I$(top_srcdir)/src/lib/eo \ 22-I$(top_srcdir)/src/lib/eo \
22-I$(top_srcdir)/src/lib/evas \ 23-I$(top_srcdir)/src/lib/evas \
23-I$(top_srcdir)/src/lib/ecore \ 24-I$(top_srcdir)/src/lib/ecore \
@@ -26,15 +27,6 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/ecore_input_evas \ 27-I$(top_srcdir)/src/lib/ecore_input_evas \
27-I$(top_srcdir)/src/lib/ecore_evas \ 28-I$(top_srcdir)/src/lib/ecore_evas \
28-I$(top_srcdir)/src/modules/evas/engines/buffer \ 29-I$(top_srcdir)/src/modules/evas/engines/buffer \
29-I$(top_builddir)/src/lib/eina \
30-I$(top_builddir)/src/lib/eo \
31-I$(top_builddir)/src/lib/evas \
32-I$(top_builddir)/src/lib/ecore \
33-I$(top_builddir)/src/lib/ecore_ipc \
34-I$(top_builddir)/src/lib/ecore_input \
35-I$(top_builddir)/src/lib/ecore_input_evas \
36-I$(top_builddir)/src/lib/ecore_evas \
37-I$(top_builddir)/src/modules/evas/engines/buffer \
38-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 30-DPACKAGE_LIB_DIR=\"$(libdir)\" \
39-DEFL_ECORE_EVAS_BUILD \ 31-DEFL_ECORE_EVAS_BUILD \
40@EFL_CFLAGS@ \ 32@EFL_CFLAGS@ \
@@ -42,8 +34,7 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
42 34
43if HAVE_WINDOWS 35if HAVE_WINDOWS
44lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ 36lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
45-I$(top_srcdir)/src/lib/evil \ 37-I$(top_srcdir)/src/lib/evil
46-I$(top_builddir)/src/lib/evil
47endif 38endif
48 39
49lib_ecore_evas_libecore_evas_la_LIBADD = \ 40lib_ecore_evas_libecore_evas_la_LIBADD = \
@@ -84,11 +75,9 @@ modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES)
84modules_ecore_evas_engines_x_module_la_CPPFLAGS = \ 75modules_ecore_evas_engines_x_module_la_CPPFLAGS = \
85$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 76$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
86-I$(top_srcdir)/src/lib/ecore_x \ 77-I$(top_srcdir)/src/lib/ecore_x \
87-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
88-I$(top_srcdir)/src/modules/evas/engines/gl_x11 \
89-I$(top_builddir)/src/lib/ecore_x \ 78-I$(top_builddir)/src/lib/ecore_x \
90-I$(top_builddir)/src/modules/evas/engines/software_x11 \ 79-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
91-I$(top_builddir)/src/modules/evas/engines/gl_x11 80-I$(top_srcdir)/src/modules/evas/engines/gl_x11
92modules_ecore_evas_engines_x_module_la_LIBADD = \ 81modules_ecore_evas_engines_x_module_la_LIBADD = \
93lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 82lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
94lib/ecore_x/libecore_x.la 83lib/ecore_x/libecore_x.la
@@ -104,9 +93,7 @@ modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES)
104modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \ 93modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \
105$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 94$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
106-I$(top_srcdir)/src/lib/ecore_cocoa \ 95-I$(top_srcdir)/src/lib/ecore_cocoa \
107-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa \ 96-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa
108-I$(top_builddir)/src/lib/ecore_cocoa \
109-I$(top_builddir)/src/modules/evas/engines/gl_cocoa
110modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ 97modules_ecore_evas_engines_cocoa_module_la_LIBADD = \
111lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 98lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
112lib/ecore_cocoa/libecore_cocoa.la 99lib/ecore_cocoa/libecore_cocoa.la
@@ -122,9 +109,7 @@ modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES)
122modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \ 109modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \
123$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 110$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
124-I$(top_srcdir)/src/lib/ecore_fb \ 111-I$(top_srcdir)/src/lib/ecore_fb \
125-I$(top_srcdir)/src/modules/evas/engines/fb \ 112-I$(top_srcdir)/src/modules/evas/engines/fb
126-I$(top_builddir)/src/lib/ecore_fb \
127-I$(top_builddir)/src/modules/evas/engines/fb
128modules_ecore_evas_engines_fb_module_la_LIBADD = \ 113modules_ecore_evas_engines_fb_module_la_LIBADD = \
129lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 114lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
130lib/ecore_fb/libecore_fb.la 115lib/ecore_fb/libecore_fb.la
@@ -140,9 +125,7 @@ modules_ecore_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHTSOURCES)
140modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \ 125modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \
141$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 126$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
142-I$(top_srcdir)/src/lib/ecore_psl1ght \ 127-I$(top_srcdir)/src/lib/ecore_psl1ght \
143-I$(top_srcdir)/src/modules/evas/engines/psl1ght \ 128-I$(top_srcdir)/src/modules/evas/engines/psl1ght
144-I$(top_builddir)/src/lib/ecore_psl1ght \
145-I$(top_builddir)/src/modules/evas/engines/psl1ght
146modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ 129modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \
147lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 130lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
148lib/ecore_psl1ght/libecore_psl1ght.la 131lib/ecore_psl1ght/libecore_psl1ght.la
@@ -164,9 +147,6 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
164-I$(top_srcdir)/src/lib/ecore_wayland \ 147-I$(top_srcdir)/src/lib/ecore_wayland \
165-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \ 148-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
166-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ 149-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
167-I$(top_builddir)/src/lib/ecore_wayland \
168-I$(top_builddir)/src/modules/evas/engines/wayland_shm \
169-I$(top_builddir)/src/modules/evas/engines/wayland_egl \
170@ECORE_WAYLAND_CFLAGS@ 150@ECORE_WAYLAND_CFLAGS@
171modules_ecore_evas_engines_wayland_module_la_LIBADD = \ 151modules_ecore_evas_engines_wayland_module_la_LIBADD = \
172lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 152lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
@@ -184,9 +164,7 @@ modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES)
184modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \ 164modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \
185$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 165$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
186-I$(top_srcdir)/src/lib/ecore_sdl \ 166-I$(top_srcdir)/src/lib/ecore_sdl \
187-I$(top_srcdir)/src/modules/evas/engines/gl_sdl \ 167-I$(top_srcdir)/src/modules/evas/engines/gl_sdl
188-I$(top_builddir)/src/lib/ecore_sdl \
189-I$(top_builddir)/src/modules/evas/engines/gl_sdl
190modules_ecore_evas_engines_sdl_module_la_LIBADD = \ 168modules_ecore_evas_engines_sdl_module_la_LIBADD = \
191lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 169lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
192lib/ecore_sdl/libecore_sdl.la 170lib/ecore_sdl/libecore_sdl.la
@@ -204,12 +182,9 @@ modules_ecore_evas_engines_win32_module_la_CPPFLAGS = \
204$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 182$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
205-I$(top_srcdir)/src/lib/ecore_win32 \ 183-I$(top_srcdir)/src/lib/ecore_win32 \
206-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ 184-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
207-I$(top_srcdir)/src/modules/evas/engines/software_gdi \ 185-I$(top_srcdir)/src/modules/evas/engines/software_gdi
208-I$(top_builddir)/src/lib/ecore_win32 \
209-I$(top_builddir)/src/modules/evas/engines/software_ddraw \
210-I$(top_builddir)/src/modules/evas/engines/software_gdi
211modules_ecore_evas_engines_win32_module_la_LIBADD = \ 186modules_ecore_evas_engines_win32_module_la_LIBADD = \
212lib/ecore/libeecore_evas.la @EFL_LIBS@ \ 187lib/ecore/libecore_evas.la @EFL_LIBS@ \
213lib/ecore_win32/libecore_win32.la 188lib/ecore_win32/libecore_win32.la
214modules_ecore_evas_engines_win32_module_la_LDFLAGS = -no-undefined -module -avoid-version 189modules_ecore_evas_engines_win32_module_la_LDFLAGS = -no-undefined -module -avoid-version
215modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static 190modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index 97748f8..cac0968 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -20,15 +20,11 @@ lib/ecore_fb/ecore_fb_private.h
20 20
21lib_ecore_fb_libecore_fb_la_CPPFLAGS = \ 21lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/eina \ 22-I$(top_srcdir)/src/lib/eina \
23-I$(top_builddir)/src/lib/eina \
23-I$(top_srcdir)/src/lib/eo \ 24-I$(top_srcdir)/src/lib/eo \
24-I$(top_srcdir)/src/lib/ecore \ 25-I$(top_srcdir)/src/lib/ecore \
25-I$(top_srcdir)/src/lib/ecore_input \ 26-I$(top_srcdir)/src/lib/ecore_input \
26-I$(top_srcdir)/src/lib/ecore_fb \ 27-I$(top_srcdir)/src/lib/ecore_fb \
27-I$(top_builddir)/src/lib/eina \
28-I$(top_builddir)/src/lib/eo \
29-I$(top_builddir)/src/lib/ecore \
30-I$(top_builddir)/src/lib/ecore_input \
31-I$(top_builddir)/src/lib/ecore_fb \
32@EFL_CFLAGS@ \ 28@EFL_CFLAGS@ \
33@EFL_COV_CFLAGS@ \ 29@EFL_COV_CFLAGS@ \
34@ECORE_FB_CFLAGS@ 30@ECORE_FB_CFLAGS@
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index cd98246..73a047c 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -29,15 +29,11 @@ endif
29 29
30lib_ecore_file_libecore_file_la_CPPFLAGS = \ 30lib_ecore_file_libecore_file_la_CPPFLAGS = \
31-I$(top_srcdir)/src/lib/eina \ 31-I$(top_srcdir)/src/lib/eina \
32-I$(top_builddir)/src/lib/eina \
32-I$(top_srcdir)/src/lib/eo \ 33-I$(top_srcdir)/src/lib/eo \
33-I$(top_srcdir)/src/lib/ecore \ 34-I$(top_srcdir)/src/lib/ecore \
34-I$(top_srcdir)/src/lib/ecore_con \ 35-I$(top_srcdir)/src/lib/ecore_con \
35-I$(top_srcdir)/src/lib/ecore_file \ 36-I$(top_srcdir)/src/lib/ecore_file \
36-I$(top_builddir)/src/lib/eina \
37-I$(top_builddir)/src/lib/eo \
38-I$(top_builddir)/src/lib/ecore \
39-I$(top_builddir)/src/lib/ecore_con \
40-I$(top_builddir)/src/lib/ecore_file \
41-DEFL_ECORE_FILE_BUILD \ 37-DEFL_ECORE_FILE_BUILD \
42@EFL_CFLAGS@ \ 38@EFL_CFLAGS@ \
43@EFL_COV_CFLAGS@ 39@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index 5634b90..f2bcd74 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -17,13 +17,10 @@ lib/ecore_imf/ecore_imf_private.h
17 17
18lib_ecore_imf_libecore_imf_la_CPPFLAGS = \ 18lib_ecore_imf_libecore_imf_la_CPPFLAGS = \
19-I$(top_srcdir)/src/lib/eina \ 19-I$(top_srcdir)/src/lib/eina \
20-I$(top_builddir)/src/lib/eina \
20-I$(top_srcdir)/src/lib/eo \ 21-I$(top_srcdir)/src/lib/eo \
21-I$(top_srcdir)/src/lib/ecore \ 22-I$(top_srcdir)/src/lib/ecore \
22-I$(top_srcdir)/src/lib/ecore_imf \ 23-I$(top_srcdir)/src/lib/ecore_imf \
23-I$(top_builddir)/src/lib/eina \
24-I$(top_builddir)/src/lib/eo \
25-I$(top_builddir)/src/lib/ecore \
26-I$(top_builddir)/src/lib/ecore_imf \
27-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24-DPACKAGE_LIB_DIR=\"$(libdir)\" \
28-DEFL_ECORE_IMF_BUILD \ 25-DEFL_ECORE_IMF_BUILD \
29@EFL_CFLAGS@ \ 26@EFL_CFLAGS@ \
@@ -45,17 +42,12 @@ lib/ecore_imf/ecore_imf_evas.c
45 42
46lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \ 43lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \
47-I$(top_srcdir)/src/lib/eina \ 44-I$(top_srcdir)/src/lib/eina \
45-I$(top_builddir)/src/lib/eina \
48-I$(top_srcdir)/src/lib/eo \ 46-I$(top_srcdir)/src/lib/eo \
49-I$(top_srcdir)/src/lib/evas \ 47-I$(top_srcdir)/src/lib/evas \
50-I$(top_srcdir)/src/lib/ecore \ 48-I$(top_srcdir)/src/lib/ecore \
51-I$(top_srcdir)/src/lib/ecore_imf \ 49-I$(top_srcdir)/src/lib/ecore_imf \
52-I$(top_srcdir)/src/lib/ecore_imf_evas \ 50-I$(top_srcdir)/src/lib/ecore_imf_evas \
53-I$(top_builddir)/src/lib/eina \
54-I$(top_builddir)/src/lib/eo \
55-I$(top_builddir)/src/lib/evas \
56-I$(top_builddir)/src/lib/ecore \
57-I$(top_builddir)/src/lib/ecore_imf \
58-I$(top_builddir)/src/lib/ecore_imf_evas \
59-DEFL_ECORE_IMF_EVAS_BUILD \ 51-DEFL_ECORE_IMF_EVAS_BUILD \
60@EFL_CFLAGS@ \ 52@EFL_CFLAGS@ \
61@EFL_COV_CFLAGS@ 53@EFL_COV_CFLAGS@
@@ -83,20 +75,15 @@ modules/ecore/immodules/ibus/ibus_imcontext.c \
83modules/ecore/immodules/ibus/ibus_imcontext.h 75modules/ecore/immodules/ibus/ibus_imcontext.h
84modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \ 76modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
85-I$(top_srcdir)/src/lib/eina \ 77-I$(top_srcdir)/src/lib/eina \
78-I$(top_builddir)/src/lib/eina \
86-I$(top_srcdir)/src/lib/eo \ 79-I$(top_srcdir)/src/lib/eo \
87-I$(top_srcdir)/src/lib/ecore \ 80-I$(top_srcdir)/src/lib/ecore \
88-I$(top_srcdir)/src/lib/ecore_input \ 81-I$(top_srcdir)/src/lib/ecore_input \
89-I$(top_srcdir)/src/lib/ecore_x \ 82-I$(top_srcdir)/src/lib/ecore_x \
83-I$(top_builddir)/src/lib/ecore_x \
90-I$(top_srcdir)/src/lib/ecore_imf \ 84-I$(top_srcdir)/src/lib/ecore_imf \
91-I$(top_srcdir)/src/lib/ecore_evas \ 85-I$(top_srcdir)/src/lib/ecore_evas \
92-I$(top_srcdir)/src/lib/evas \ 86-I$(top_srcdir)/src/lib/evas \
93-I$(top_builddir)/src/lib/eina \
94-I$(top_builddir)/src/lib/eo \
95-I$(top_builddir)/src/lib/ecore \
96-I$(top_builddir)/src/lib/ecore_input \
97-I$(top_builddir)/src/lib/ecore_x \
98-I$(top_builddir)/src/lib/ecore_imf \
99-I$(top_builddir)/src/lib/ecore_evas \
100-DEFL_ECORE_IMF_EVAS_BUILD \ 87-DEFL_ECORE_IMF_EVAS_BUILD \
101@EFL_CFLAGS@ \ 88@EFL_CFLAGS@ \
102@EFL_COV_CFLAGS@ \ 89@EFL_COV_CFLAGS@ \
@@ -124,20 +111,15 @@ modules/ecore/immodules/scim/scim_imcontext.cpp \
124modules/ecore/immodules/scim/scim_imcontext.h 111modules/ecore/immodules/scim/scim_imcontext.h
125modules_ecore_immodules_scim_scim_la_CPPFLAGS = \ 112modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
126-I$(top_srcdir)/src/lib/eina \ 113-I$(top_srcdir)/src/lib/eina \
114-I$(top_builddir)/src/lib/eina \
127-I$(top_srcdir)/src/lib/eo \ 115-I$(top_srcdir)/src/lib/eo \
128-I$(top_srcdir)/src/lib/ecore \ 116-I$(top_srcdir)/src/lib/ecore \
129-I$(top_srcdir)/src/lib/ecore_input \ 117-I$(top_srcdir)/src/lib/ecore_input \
130-I$(top_srcdir)/src/lib/ecore_x \ 118-I$(top_srcdir)/src/lib/ecore_x \
119-I$(top_builddir)/src/lib/ecore_x \
131-I$(top_srcdir)/src/lib/ecore_imf \ 120-I$(top_srcdir)/src/lib/ecore_imf \
132-I$(top_srcdir)/src/lib/ecore_evas \ 121-I$(top_srcdir)/src/lib/ecore_evas \
133-I$(top_srcdir)/src/lib/evas \ 122-I$(top_srcdir)/src/lib/evas \
134-I$(top_builddir)/src/lib/eina \
135-I$(top_builddir)/src/lib/eo \
136-I$(top_builddir)/src/lib/ecore \
137-I$(top_builddir)/src/lib/ecore_input \
138-I$(top_builddir)/src/lib/ecore_x \
139-I$(top_builddir)/src/lib/ecore_imf \
140-I$(top_builddir)/src/lib/ecore_evas \
141-DEFL_ECORE_IMF_EVAS_BUILD \ 123-DEFL_ECORE_IMF_EVAS_BUILD \
142@EFL_CFLAGS@ \ 124@EFL_CFLAGS@ \
143@EFL_COV_CFLAGS@ \ 125@EFL_COV_CFLAGS@ \
@@ -163,17 +145,13 @@ modules_ecore_immodules_xim_xim_la_SOURCES = \
163modules/ecore/immodules/xim/ecore_imf_xim.c 145modules/ecore/immodules/xim/ecore_imf_xim.c
164modules_ecore_immodules_xim_xim_la_CPPFLAGS = \ 146modules_ecore_immodules_xim_xim_la_CPPFLAGS = \
165-I$(top_srcdir)/src/lib/eina \ 147-I$(top_srcdir)/src/lib/eina \
148-I$(top_builddir)/src/lib/eina \
166-I$(top_srcdir)/src/lib/eo \ 149-I$(top_srcdir)/src/lib/eo \
167-I$(top_srcdir)/src/lib/ecore \ 150-I$(top_srcdir)/src/lib/ecore \
168-I$(top_srcdir)/src/lib/ecore_input \ 151-I$(top_srcdir)/src/lib/ecore_input \
169-I$(top_srcdir)/src/lib/ecore_x \ 152-I$(top_srcdir)/src/lib/ecore_x \
170-I$(top_srcdir)/src/lib/ecore_imf \
171-I$(top_builddir)/src/lib/eina \
172-I$(top_builddir)/src/lib/eo \
173-I$(top_builddir)/src/lib/ecore \
174-I$(top_builddir)/src/lib/ecore_input \
175-I$(top_builddir)/src/lib/ecore_x \ 153-I$(top_builddir)/src/lib/ecore_x \
176-I$(top_builddir)/src/lib/ecore_imf \ 154-I$(top_srcdir)/src/lib/ecore_imf \
177-DEFL_ECORE_IMF_EVAS_BUILD \ 155-DEFL_ECORE_IMF_EVAS_BUILD \
178@EFL_CFLAGS@ \ 156@EFL_CFLAGS@ \
179@EFL_COV_CFLAGS@ 157@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index e199380..ab6d491 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -17,13 +17,10 @@ lib/ecore_input/ecore_input_private.h
17 17
18lib_ecore_input_libecore_input_la_CPPFLAGS = \ 18lib_ecore_input_libecore_input_la_CPPFLAGS = \
19-I$(top_srcdir)/src/lib/eina \ 19-I$(top_srcdir)/src/lib/eina \
20-I$(top_builddir)/src/lib/eina \
20-I$(top_srcdir)/src/lib/eo \ 21-I$(top_srcdir)/src/lib/eo \
21-I$(top_srcdir)/src/lib/ecore \ 22-I$(top_srcdir)/src/lib/ecore \
22-I$(top_srcdir)/src/lib/ecore_input \ 23-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_builddir)/src/lib/eina \
24-I$(top_builddir)/src/lib/eo \
25-I$(top_builddir)/src/lib/ecore \
26-I$(top_builddir)/src/lib/ecore_input \
27-DEFL_ECORE_INPUT_BUILD \ 24-DEFL_ECORE_INPUT_BUILD \
28@EFL_CFLAGS@ \ 25@EFL_CFLAGS@ \
29@EFL_COV_CFLAGS@ 26@EFL_COV_CFLAGS@
@@ -47,17 +44,12 @@ lib/ecore_input/ecore_input_evas_private.h
47 44
48lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \ 45lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \
49-I$(top_srcdir)/src/lib/eina \ 46-I$(top_srcdir)/src/lib/eina \
47-I$(top_builddir)/src/lib/eina \
50-I$(top_srcdir)/src/lib/eo \ 48-I$(top_srcdir)/src/lib/eo \
51-I$(top_srcdir)/src/lib/evas \ 49-I$(top_srcdir)/src/lib/evas \
52-I$(top_srcdir)/src/lib/ecore \ 50-I$(top_srcdir)/src/lib/ecore \
53-I$(top_srcdir)/src/lib/ecore_input \ 51-I$(top_srcdir)/src/lib/ecore_input \
54-I$(top_srcdir)/src/lib/ecore_input_evas \ 52-I$(top_srcdir)/src/lib/ecore_input_evas \
55-I$(top_builddir)/src/lib/eina \
56-I$(top_builddir)/src/lib/eo \
57-I$(top_builddir)/src/lib/evas \
58-I$(top_builddir)/src/lib/ecore \
59-I$(top_builddir)/src/lib/ecore_input \
60-I$(top_builddir)/src/lib/ecore_input_evas \
61-DEFL_ECORE_INPUT_EVAS_BUILD \ 53-DEFL_ECORE_INPUT_EVAS_BUILD \
62@EFL_CFLAGS@ \ 54@EFL_CFLAGS@ \
63@EFL_COV_CFLAGS@ 55@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index ba09f37..ea219d1 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -13,15 +13,11 @@ lib/ecore_ipc/ecore_ipc_private.h
13 13
14lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \ 14lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \
15-I$(top_srcdir)/src/lib/eina \ 15-I$(top_srcdir)/src/lib/eina \
16-I$(top_builddir)/src/lib/eina \
16-I$(top_srcdir)/src/lib/eo \ 17-I$(top_srcdir)/src/lib/eo \
17-I$(top_srcdir)/src/lib/ecore \ 18-I$(top_srcdir)/src/lib/ecore \
18-I$(top_srcdir)/src/lib/ecore_con \ 19-I$(top_srcdir)/src/lib/ecore_con \
19-I$(top_srcdir)/src/lib/ecore_ipc \ 20-I$(top_srcdir)/src/lib/ecore_ipc \
20-I$(top_builddir)/src/lib/eina \
21-I$(top_builddir)/src/lib/eo \
22-I$(top_builddir)/src/lib/ecore \
23-I$(top_builddir)/src/lib/ecore_con \
24-I$(top_builddir)/src/lib/ecore_ipc \
25-DEFL_ECORE_IPC_BUILD \ 21-DEFL_ECORE_IPC_BUILD \
26@EFL_CFLAGS@ \ 22@EFL_CFLAGS@ \
27@EFL_COV_CFLAGS@ 23@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index 9ac146c..71b4378 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -16,15 +16,11 @@ lib/ecore_psl1ght/ecore_psl1ght_private.h
16 16
17lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \ 17lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \
18-I$(top_srcdir)/src/lib/eina \ 18-I$(top_srcdir)/src/lib/eina \
19-I$(top_builddir)/src/lib/eina \
19-I$(top_srcdir)/src/lib/eo \ 20-I$(top_srcdir)/src/lib/eo \
20-I$(top_srcdir)/src/lib/ecore \ 21-I$(top_srcdir)/src/lib/ecore \
21-I$(top_srcdir)/src/lib/ecore_input \ 22-I$(top_srcdir)/src/lib/ecore_input \
22-I$(top_srcdir)/src/lib/ecore_psl1ght \ 23-I$(top_srcdir)/src/lib/ecore_psl1ght \
23-I$(top_builddir)/src/lib/eina \
24-I$(top_builddir)/src/lib/eo \
25-I$(top_builddir)/src/lib/ecore \
26-I$(top_builddir)/src/lib/ecore_input \
27-I$(top_builddir)/src/lib/ecore_psl1ght \
28-DEFL_ECORE_PSL1GHT_BUILD \ 24-DEFL_ECORE_PSL1GHT_BUILD \
29@EFL_CFLAGS@ \ 25@EFL_CFLAGS@ \
30@EFL_COV_CFLAGS@ 26@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index 62e7a10..11406f0 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -14,15 +14,11 @@ lib/ecore_sdl/ecore_sdl_private.h
14 14
15lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \ 15lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \
16-I$(top_srcdir)/src/lib/eina \ 16-I$(top_srcdir)/src/lib/eina \
17-I$(top_builddir)/src/lib/eina \
17-I$(top_srcdir)/src/lib/eo \ 18-I$(top_srcdir)/src/lib/eo \
18-I$(top_srcdir)/src/lib/ecore \ 19-I$(top_srcdir)/src/lib/ecore \
19-I$(top_srcdir)/src/lib/ecore_input \ 20-I$(top_srcdir)/src/lib/ecore_input \
20-I$(top_srcdir)/src/lib/ecore_sdl \ 21-I$(top_srcdir)/src/lib/ecore_sdl \
21-I$(top_builddir)/src/lib/eina \
22-I$(top_builddir)/src/lib/eo \
23-I$(top_builddir)/src/lib/ecore \
24-I$(top_builddir)/src/lib/ecore_input \
25-I$(top_builddir)/src/lib/ecore_sdl \
26-DEFL_ECORE_SDL_BUILD \ 22-DEFL_ECORE_SDL_BUILD \
27@EFL_CFLAGS@ \ 23@EFL_CFLAGS@ \
28@EFL_COV_CFLAGS@ \ 24@EFL_COV_CFLAGS@ \
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index 696342f..d4a111f 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -17,15 +17,11 @@ lib/ecore_wayland/ecore_wl_private.h
17 17
18lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \ 18lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \
19-I$(top_srcdir)/src/lib/eina \ 19-I$(top_srcdir)/src/lib/eina \
20-I$(top_builddir)/src/lib/eina \
20-I$(top_srcdir)/src/lib/eo \ 21-I$(top_srcdir)/src/lib/eo \
21-I$(top_srcdir)/src/lib/ecore \ 22-I$(top_srcdir)/src/lib/ecore \
22-I$(top_srcdir)/src/lib/ecore_input \ 23-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_srcdir)/src/lib/ecore_wayland \ 24-I$(top_srcdir)/src/lib/ecore_wayland \
24-I$(top_builddir)/src/lib/eina \
25-I$(top_builddir)/src/lib/eo \
26-I$(top_builddir)/src/lib/ecore \
27-I$(top_builddir)/src/lib/ecore_input \
28-I$(top_builddir)/src/lib/ecore_wayland \
29@EFL_CFLAGS@ \ 25@EFL_CFLAGS@ \
30@EFL_COV_CFLAGS@ \ 26@EFL_COV_CFLAGS@ \
31@ECORE_WAYLAND_CFLAGS@ 27@ECORE_WAYLAND_CFLAGS@
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index 2491ca5..c54e8be 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -26,16 +26,11 @@ lib/ecore_win32/ecore_win32_dnd_drop_target.h
26lib_ecore_win32_libecore_win32_la_CPPFLAGS = \ 26lib_ecore_win32_libecore_win32_la_CPPFLAGS = \
27-I$(top_srcdir)/src/lib/evil \ 27-I$(top_srcdir)/src/lib/evil \
28-I$(top_srcdir)/src/lib/eina \ 28-I$(top_srcdir)/src/lib/eina \
29-I$(top_builddir)/src/lib/eina \
29-I$(top_srcdir)/src/lib/eo \ 30-I$(top_srcdir)/src/lib/eo \
30-I$(top_srcdir)/src/lib/ecore \ 31-I$(top_srcdir)/src/lib/ecore \
31-I$(top_srcdir)/src/lib/ecore_input \ 32-I$(top_srcdir)/src/lib/ecore_input \
32-I$(top_srcdir)/src/lib/ecore_win32 \ 33-I$(top_srcdir)/src/lib/ecore_win32 \
33-I$(top_builddir)/src/lib/evil \
34-I$(top_builddir)/src/lib/eina \
35-I$(top_builddir)/src/lib/eo \
36-I$(top_builddir)/src/lib/ecore \
37-I$(top_builddir)/src/lib/ecore_input \
38-I$(top_builddir)/src/lib/ecore_win32 \
39-DEFL_ECORE_WIN32_BUILD \ 34-DEFL_ECORE_WIN32_BUILD \
40@EFL_CFLAGS@ \ 35@EFL_CFLAGS@ \
41@EFL_COV_CFLAGS@ 36@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 7bf5264..9ab16b5 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -16,16 +16,11 @@ lib/ecore_wince/ecore_wince_private.h
16lib_ecore_wince_libecore_wince_la_CPPFLAGS = \ 16lib_ecore_wince_libecore_wince_la_CPPFLAGS = \
17-I$(top_srcdir)/src/lib/evil \ 17-I$(top_srcdir)/src/lib/evil \
18-I$(top_srcdir)/src/lib/eina \ 18-I$(top_srcdir)/src/lib/eina \
19-I$(top_builddir)/src/lib/eina \
19-I$(top_srcdir)/src/lib/eo \ 20-I$(top_srcdir)/src/lib/eo \
20-I$(top_srcdir)/src/lib/ecore \ 21-I$(top_srcdir)/src/lib/ecore \
21-I$(top_srcdir)/src/lib/ecore_input \ 22-I$(top_srcdir)/src/lib/ecore_input \
22-I$(top_srcdir)/src/lib/ecore_wince \ 23-I$(top_srcdir)/src/lib/ecore_wince \
23-I$(top_builddir)/src/lib/evil \
24-I$(top_builddir)/src/lib/eina \
25-I$(top_builddir)/src/lib/eo \
26-I$(top_builddir)/src/lib/ecore \
27-I$(top_builddir)/src/lib/ecore_input \
28-I$(top_builddir)/src/lib/ecore_wince \
29-DEFL_ECORE_WINCE_BUILD \ 24-DEFL_ECORE_WINCE_BUILD \
30@EFL_CFLAGS@ \ 25@EFL_CFLAGS@ \
31@EFL_COV_CFLAGS@ 26@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index d5e1979..c1c81e8 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -97,14 +97,11 @@ endif
97 97
98lib_ecore_x_libecore_x_la_CPPFLAGS = \ 98lib_ecore_x_libecore_x_la_CPPFLAGS = \
99-I$(top_srcdir)/src/lib/eina \ 99-I$(top_srcdir)/src/lib/eina \
100-I$(top_builddir)/src/lib/eina \
100-I$(top_srcdir)/src/lib/eo \ 101-I$(top_srcdir)/src/lib/eo \
101-I$(top_srcdir)/src/lib/ecore \ 102-I$(top_srcdir)/src/lib/ecore \
102-I$(top_srcdir)/src/lib/ecore_input \ 103-I$(top_srcdir)/src/lib/ecore_input \
103-I$(top_srcdir)/src/lib/ecore_x \ 104-I$(top_srcdir)/src/lib/ecore_x \
104-I$(top_builddir)/src/lib/eina \
105-I$(top_builddir)/src/lib/eo \
106-I$(top_builddir)/src/lib/ecore \
107-I$(top_builddir)/src/lib/ecore_input \
108-I$(top_builddir)/src/lib/ecore_x \ 105-I$(top_builddir)/src/lib/ecore_x \
109-DEFL_ECORE_X_BUILD \ 106-DEFL_ECORE_X_BUILD \
110@EFL_CFLAGS@ \ 107@EFL_CFLAGS@ \
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 79d9a62..658276c 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -24,11 +24,9 @@ static_libs/lz4/lz4hc.h
24 24
25lib_eet_libeet_la_CPPFLAGS = \ 25lib_eet_libeet_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/eina \ 26-I$(top_srcdir)/src/lib/eina \
27-I$(top_builddir)/src/lib/eina \
27-I$(top_srcdir)/src/lib/eet \ 28-I$(top_srcdir)/src/lib/eet \
28-I$(top_srcdir)/src/static_libs/lz4 \ 29-I$(top_srcdir)/src/static_libs/lz4 \
29-I$(top_builddir)/src/lib/eina \
30-I$(top_builddir)/src/lib/eet \
31-I$(top_builddir)/src/static_libs/lz4 \
32-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 30-DPACKAGE_BIN_DIR=\"$(bindir)\" \
33-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 31-DPACKAGE_LIB_DIR=\"$(libdir)\" \
34-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 32-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@@ -39,8 +37,7 @@ lib_eet_libeet_la_CPPFLAGS = \
39 37
40if HAVE_WINDOWS 38if HAVE_WINDOWS
41lib_eet_libeet_la_CPPFLAGS += \ 39lib_eet_libeet_la_CPPFLAGS += \
42-I$(top_srcdir)/src/lib/evil \ 40-I$(top_srcdir)/src/lib/evil
43-I$(top_builddir)/src/lib/evil
44endif 41endif
45 42
46lib_eet_libeet_la_LIBADD = lib/eina/libeina.la 43lib_eet_libeet_la_LIBADD = lib/eina/libeina.la
@@ -63,9 +60,8 @@ bin_eet_eet_SOURCES = bin/eet/eet_main.c
63 60
64bin_eet_eet_CPPFLAGS = \ 61bin_eet_eet_CPPFLAGS = \
65-I$(top_srcdir)/src/lib/eina \ 62-I$(top_srcdir)/src/lib/eina \
66-I$(top_srcdir)/src/lib/eet \
67-I$(top_builddir)/src/lib/eina \ 63-I$(top_builddir)/src/lib/eina \
68-I$(top_builddir)/src/lib/eet \ 64-I$(top_srcdir)/src/lib/eet \
69-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 65-DPACKAGE_BIN_DIR=\"$(bindir)\" \
70-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 66-DPACKAGE_LIB_DIR=\"$(libdir)\" \
71-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 67-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@@ -75,8 +71,7 @@ bin_eet_eet_CPPFLAGS = \
75 71
76if HAVE_WINDOWS 72if HAVE_WINDOWS
77bin_eet_eet_CPPFLAGS += \ 73bin_eet_eet_CPPFLAGS += \
78-I$(top_srcdir)/src/lib/evil \ 74-I$(top_srcdir)/src/lib/evil
79-I$(top_builddir)/src/lib/evil
80endif 75endif
81 76
82bin_eet_eet_LDADD = \ 77bin_eet_eet_LDADD = \
@@ -102,9 +97,8 @@ tests/eet/eet_suite.h
102 97
103tests_eet_eet_suite_CPPFLAGS = \ 98tests_eet_eet_suite_CPPFLAGS = \
104-I$(top_srcdir)/src/lib/eina \ 99-I$(top_srcdir)/src/lib/eina \
105-I$(top_srcdir)/src/lib/eet \
106-I$(top_builddir)/src/lib/eina \ 100-I$(top_builddir)/src/lib/eina \
107-I$(top_builddir)/src/lib/eet \ 101-I$(top_srcdir)/src/lib/eet \
108-DTESTS_SRC_DIR=\"$(top_srcdir)\" \ 102-DTESTS_SRC_DIR=\"$(top_srcdir)\" \
109@CHECK_CFLAGS@ \ 103@CHECK_CFLAGS@ \
110@EET_CFLAGS@ 104@EET_CFLAGS@
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index d3f5738..b7acbe9 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -216,8 +216,7 @@ lib_eina_libeina_la_CPPFLAGS = \
216 216
217if HAVE_WINDOWS 217if HAVE_WINDOWS
218lib_eina_libeina_la_CPPFLAGS += \ 218lib_eina_libeina_la_CPPFLAGS += \
219-I$(top_srcdir)/src/lib/evil \ 219-I$(top_srcdir)/src/lib/evil
220-I$(top_builddir)/src/lib/evil
221endif 220endif
222 221
223lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ 222lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 626756f..6c3058c 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -28,15 +28,11 @@ endif
28 28
29lib_eio_libeio_la_CPPFLAGS = \ 29lib_eio_libeio_la_CPPFLAGS = \
30-I$(top_srcdir)/src/lib/eina \ 30-I$(top_srcdir)/src/lib/eina \
31-I$(top_builddir)/src/lib/eina \
31-I$(top_srcdir)/src/lib/eo \ 32-I$(top_srcdir)/src/lib/eo \
32-I$(top_srcdir)/src/lib/eet \ 33-I$(top_srcdir)/src/lib/eet \
33-I$(top_srcdir)/src/lib/ecore \ 34-I$(top_srcdir)/src/lib/ecore \
34-I$(top_srcdir)/src/lib/eio \ 35-I$(top_srcdir)/src/lib/eio \
35-I$(top_builddir)/src/lib/eina \
36-I$(top_builddir)/src/lib/eo \
37-I$(top_builddir)/src/lib/eet \
38-I$(top_builddir)/src/lib/ecore \
39-I$(top_builddir)/src/lib/eio \
40-DEFL_EIO_BUILD \ 36-DEFL_EIO_BUILD \
41@EFL_CFLAGS@ \ 37@EFL_CFLAGS@ \
42@EFL_COV_CFLAGS@ 38@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 32f6b14..7d8e9ec 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -27,8 +27,7 @@ lib_embryo_libembryo_la_CPPFLAGS = \
27 27
28if HAVE_WINDOWS 28if HAVE_WINDOWS
29lib_embryo_libembryo_la_CPPFLAGS += \ 29lib_embryo_libembryo_la_CPPFLAGS += \
30-I$(top_srcdir)/src/lib/evil \ 30-I$(top_srcdir)/src/lib/evil
31-I$(top_builddir)/src/lib/evil
32endif 31endif
33 32
34lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la 33lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la
@@ -63,9 +62,8 @@ bin/embryo/embryo_cc_prefix.h
63 62
64bin_embryo_embryo_cc_CPPFLAGS = \ 63bin_embryo_embryo_cc_CPPFLAGS = \
65-I$(top_srcdir)/src/lib/eina \ 64-I$(top_srcdir)/src/lib/eina \
66-I$(top_srcdir)/src/lib/embryo \
67-I$(top_builddir)/src/lib/eina \ 65-I$(top_builddir)/src/lib/eina \
68-I$(top_builddir)/src/lib/embryo \ 66-I$(top_srcdir)/src/lib/embryo \
69-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 67-DPACKAGE_BIN_DIR=\"$(bindir)\" \
70-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 68-DPACKAGE_LIB_DIR=\"$(libdir)\" \
71-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 69-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@@ -73,8 +71,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \
73 71
74if HAVE_WINDOWS 72if HAVE_WINDOWS
75bin_embryo_embryo_cc_CPPFLAGS += \ 73bin_embryo_embryo_cc_CPPFLAGS += \
76-I$(top_srcdir)/src/lib/evil \ 74-I$(top_srcdir)/src/lib/evil
77-I$(top_builddir)/src/lib/evil
78endif 75endif
79 76
80bin_embryo_embryo_cc_LDADD = \ 77bin_embryo_embryo_cc_LDADD = \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 22fa8fa..0d1bb77 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -13,9 +13,8 @@ lib/eo/eo_private.h
13 13
14lib_eo_libeo_la_CPPFLAGS = \ 14lib_eo_libeo_la_CPPFLAGS = \
15-I$(top_srcdir)/src/lib/eina \ 15-I$(top_srcdir)/src/lib/eina \
16-I$(top_srcdir)/src/lib/eo \
17-I$(top_builddir)/src/lib/eina \ 16-I$(top_builddir)/src/lib/eina \
18-I$(top_builddir)/src/lib/eo \ 17-I$(top_srcdir)/src/lib/eo \
19-DNDEBUG \ 18-DNDEBUG \
20-DEFL_EO_BUILD \ 19-DEFL_EO_BUILD \
21@EFL_CFLAGS@ \ 20@EFL_CFLAGS@ \
@@ -24,8 +23,7 @@ lib_eo_libeo_la_CPPFLAGS = \
24 23
25if HAVE_WINDOWS 24if HAVE_WINDOWS
26lib_eo_libeo_la_CPPFLAGS += \ 25lib_eo_libeo_la_CPPFLAGS += \
27-I$(top_srcdir)/src/lib/evil \ 26-I$(top_srcdir)/src/lib/evil
28-I$(top_builddir)/src/lib/evil
29endif 27endif
30 28
31lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ 29lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@
@@ -57,9 +55,8 @@ tests/eo/access/access_simple_protected.h
57 55
58tests_eo_test_access_CPPFLAGS = \ 56tests_eo_test_access_CPPFLAGS = \
59-I$(top_srcdir)/src/lib/eina \ 57-I$(top_srcdir)/src/lib/eina \
60-I$(top_srcdir)/src/lib/eo \
61-I$(top_builddir)/src/lib/eina \ 58-I$(top_builddir)/src/lib/eina \
62-I$(top_builddir)/src/lib/eo \ 59-I$(top_srcdir)/src/lib/eo \
63@CHECK_CFLAGS@ \ 60@CHECK_CFLAGS@ \
64@EO_CFLAGS@ 61@EO_CFLAGS@
65 62
@@ -76,9 +73,8 @@ tests/eo/composite_objects/composite_objects_simple.h
76 73
77tests_eo_test_composite_objects_CPPFLAGS = \ 74tests_eo_test_composite_objects_CPPFLAGS = \
78-I$(top_srcdir)/src/lib/eina \ 75-I$(top_srcdir)/src/lib/eina \
79-I$(top_srcdir)/src/lib/eo \
80-I$(top_builddir)/src/lib/eina \ 76-I$(top_builddir)/src/lib/eina \
81-I$(top_builddir)/src/lib/eo \ 77-I$(top_srcdir)/src/lib/eo \
82@CHECK_CFLAGS@ \ 78@CHECK_CFLAGS@ \
83@EO_CFLAGS@ 79@EO_CFLAGS@
84 80
@@ -107,9 +103,8 @@ tests/eo/constructors/constructors_simple7.h
107 103
108tests_eo_test_constructors_CPPFLAGS = \ 104tests_eo_test_constructors_CPPFLAGS = \
109-I$(top_srcdir)/src/lib/eina \ 105-I$(top_srcdir)/src/lib/eina \
110-I$(top_srcdir)/src/lib/eo \
111-I$(top_builddir)/src/lib/eina \ 106-I$(top_builddir)/src/lib/eina \
112-I$(top_builddir)/src/lib/eo \ 107-I$(top_srcdir)/src/lib/eo \
113@CHECK_CFLAGS@ \ 108@CHECK_CFLAGS@ \
114@EO_CFLAGS@ 109@EO_CFLAGS@
115 110
@@ -130,9 +125,8 @@ tests/eo/suite/eo_test_init.c
130 125
131tests_eo_eo_suite_CPPFLAGS = \ 126tests_eo_eo_suite_CPPFLAGS = \
132-I$(top_srcdir)/src/lib/eina \ 127-I$(top_srcdir)/src/lib/eina \
133-I$(top_srcdir)/src/lib/eo \
134-I$(top_builddir)/src/lib/eina \ 128-I$(top_builddir)/src/lib/eina \
135-I$(top_builddir)/src/lib/eo \ 129-I$(top_srcdir)/src/lib/eo \
136-DNDEBUG \ 130-DNDEBUG \
137@CHECK_CFLAGS@ \ 131@CHECK_CFLAGS@ \
138@EO_CFLAGS@ 132@EO_CFLAGS@
@@ -157,9 +151,8 @@ tests/eo/function_overrides/function_overrides_simple.h
157 151
158tests_eo_test_function_overrides_CPPFLAGS = \ 152tests_eo_test_function_overrides_CPPFLAGS = \
159-I$(top_srcdir)/src/lib/eina \ 153-I$(top_srcdir)/src/lib/eina \
160-I$(top_srcdir)/src/lib/eo \
161-I$(top_builddir)/src/lib/eina \ 154-I$(top_builddir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eo \ 155-I$(top_srcdir)/src/lib/eo \
163@CHECK_CFLAGS@ \ 156@CHECK_CFLAGS@ \
164@EO_CFLAGS@ 157@EO_CFLAGS@
165 158
@@ -178,9 +171,8 @@ tests/eo/interface/interface_simple.h
178 171
179tests_eo_test_interface_CPPFLAGS = \ 172tests_eo_test_interface_CPPFLAGS = \
180-I$(top_srcdir)/src/lib/eina \ 173-I$(top_srcdir)/src/lib/eina \
181-I$(top_srcdir)/src/lib/eo \
182-I$(top_builddir)/src/lib/eina \ 174-I$(top_builddir)/src/lib/eina \
183-I$(top_builddir)/src/lib/eo \ 175-I$(top_srcdir)/src/lib/eo \
184@CHECK_CFLAGS@ \ 176@CHECK_CFLAGS@ \
185@EO_CFLAGS@ 177@EO_CFLAGS@
186 178
@@ -205,9 +197,8 @@ tests/eo/mixin/mixin_simple.h
205 197
206tests_eo_test_mixin_CPPFLAGS = \ 198tests_eo_test_mixin_CPPFLAGS = \
207-I$(top_srcdir)/src/lib/eina \ 199-I$(top_srcdir)/src/lib/eina \
208-I$(top_srcdir)/src/lib/eo \
209-I$(top_builddir)/src/lib/eina \ 200-I$(top_builddir)/src/lib/eina \
210-I$(top_builddir)/src/lib/eo \ 201-I$(top_srcdir)/src/lib/eo \
211@CHECK_CFLAGS@ \ 202@CHECK_CFLAGS@ \
212@EO_CFLAGS@ 203@EO_CFLAGS@
213 204
@@ -222,9 +213,8 @@ tests/eo/signals/signals_simple.h
222 213
223tests_eo_test_signals_CPPFLAGS = \ 214tests_eo_test_signals_CPPFLAGS = \
224-I$(top_srcdir)/src/lib/eina \ 215-I$(top_srcdir)/src/lib/eina \
225-I$(top_srcdir)/src/lib/eo \
226-I$(top_builddir)/src/lib/eina \ 216-I$(top_builddir)/src/lib/eina \
227-I$(top_builddir)/src/lib/eo \ 217-I$(top_srcdir)/src/lib/eo \
228@CHECK_CFLAGS@ \ 218@CHECK_CFLAGS@ \
229@EO_CFLAGS@ 219@EO_CFLAGS@
230 220
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index d237d18..4b8ffb2 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -19,7 +19,6 @@ lib/escape/escape_mman.c \
19lib/escape/escape_unistd.c 19lib/escape/escape_unistd.c
20 20
21lib_escape_libescape_la_CPPFLAGS = \ 21lib_escape_libescape_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/escape \ 22-I$(top_srcdir)/src/lib/escape
23-I$(top_builddir)/src/lib/escape
24lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ 23lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
25lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@ 24lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index e7e17bb..fbddad2 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -191,23 +191,15 @@ lib/evas/common/evas_font_ot.h
191 191
192lib_evas_libevas_la_CPPFLAGS = \ 192lib_evas_libevas_la_CPPFLAGS = \
193-I$(top_srcdir)/src/lib/evas \ 193-I$(top_srcdir)/src/lib/evas \
194-I$(top_builddir)/src/lib/evas \
195-I$(top_srcdir)/src/lib/evas/include \ 194-I$(top_srcdir)/src/lib/evas/include \
196-I$(top_builddir)/src/lib/evas/include \
197-I$(top_srcdir)/src/lib/evas/cserve2 \ 195-I$(top_srcdir)/src/lib/evas/cserve2 \
198-I$(top_builddir)/src/lib/evas/cserve2 \
199-I$(top_srcdir)/src/lib/evas/file \ 196-I$(top_srcdir)/src/lib/evas/file \
200-I$(top_builddir)/src/lib/evas/file \
201-I$(top_srcdir)/src/static_libs/liblinebreak \ 197-I$(top_srcdir)/src/static_libs/liblinebreak \
202-I$(top_builddir)/src/static_libs/liblinebreak \
203-I$(top_srcdir)/src/lib/evas/common \ 198-I$(top_srcdir)/src/lib/evas/common \
204-I$(top_builddir)/src/lib/evas/common \
205-I$(top_srcdir)/src/lib/eina \ 199-I$(top_srcdir)/src/lib/eina \
206-I$(top_builddir)/src/lib/eina \ 200-I$(top_builddir)/src/lib/eina \
207-I$(top_srcdir)/src/lib/eo \ 201-I$(top_srcdir)/src/lib/eo \
208-I$(top_builddir)/src/lib/eo \
209-I$(top_srcdir)/src/lib/eet \ 202-I$(top_srcdir)/src/lib/eet \
210-I$(top_builddir)/src/lib/eet \
211-DEFL_EVAS_BUILD \ 203-DEFL_EVAS_BUILD \
212-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 204-DPACKAGE_BIN_DIR=\"$(bindir)\" \
213-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 205-DPACKAGE_LIB_DIR=\"$(libdir)\" \
@@ -232,8 +224,7 @@ lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@
232 224
233if HAVE_WINDOWS 225if HAVE_WINDOWS
234lib_evas_libevas_la_CPPFLAGS += \ 226lib_evas_libevas_la_CPPFLAGS += \
235-I$(top_srcdir)/src/lib/evil \ 227-I$(top_srcdir)/src/lib/evil
236-I$(top_builddir)/src/lib/evil
237endif 228endif
238 229
239lib_evas_libevas_la_CXXFLAGS = 230lib_evas_libevas_la_CXXFLAGS =
@@ -386,13 +377,9 @@ modules_evas_engines_software_generic_module_la_CPPFLAGS = \
386-I$(top_srcdir)/src/lib/eina \ 377-I$(top_srcdir)/src/lib/eina \
387-I$(top_builddir)/src/lib/eina \ 378-I$(top_builddir)/src/lib/eina \
388-I$(top_srcdir)/src/lib/eo \ 379-I$(top_srcdir)/src/lib/eo \
389-I$(top_builddir)/src/lib/eo \
390-I$(top_srcdir)/src/lib/evas \ 380-I$(top_srcdir)/src/lib/evas \
391-I$(top_builddir)/src/lib/evas \
392-I$(top_srcdir)/src/lib/evas/include \ 381-I$(top_srcdir)/src/lib/evas/include \
393-I$(top_builddir)/src/lib/evas/include \
394-I$(top_srcdir)/src/lib/evas/cserve2 \ 382-I$(top_srcdir)/src/lib/evas/cserve2 \
395-I$(top_builddir)/src/lib/evas/cserve2 \
396-DEFL_EVAS_BUILD \ 383-DEFL_EVAS_BUILD \
397@EFL_CFLAGS@ \ 384@EFL_CFLAGS@ \
398@EVAS_CFLAGS@ 385@EVAS_CFLAGS@
@@ -417,20 +404,15 @@ modules_evas_engines_buffer_module_la_CPPFLAGS = \
417-I$(top_srcdir)/src/lib/eina \ 404-I$(top_srcdir)/src/lib/eina \
418-I$(top_builddir)/src/lib/eina \ 405-I$(top_builddir)/src/lib/eina \
419-I$(top_srcdir)/src/lib/eo \ 406-I$(top_srcdir)/src/lib/eo \
420-I$(top_builddir)/src/lib/eo \
421-I$(top_srcdir)/src/lib/evas \ 407-I$(top_srcdir)/src/lib/evas \
422-I$(top_builddir)/src/lib/evas \
423-I$(top_srcdir)/src/lib/evas/include \ 408-I$(top_srcdir)/src/lib/evas/include \
424-I$(top_builddir)/src/lib/evas/include \
425-I$(top_srcdir)/src/lib/evas/cserve2 \ 409-I$(top_srcdir)/src/lib/evas/cserve2 \
426-I$(top_builddir)/src/lib/evas/cserve2 \
427-DEFL_EVAS_BUILD \ 410-DEFL_EVAS_BUILD \
428@EFL_CFLAGS@ \ 411@EFL_CFLAGS@ \
429@EVAS_CFLAGS@ 412@EVAS_CFLAGS@
430if HAVE_WINDOWS 413if HAVE_WINDOWS
431modules_evas_engines_buffer_module_la_CPPFLAGS += \ 414modules_evas_engines_buffer_module_la_CPPFLAGS += \
432-I$(top_srcdir)/src/lib/evil \ 415-I$(top_srcdir)/src/lib/evil
433-I$(top_builddir)/src/lib/evil
434endif 416endif
435modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ 417modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@
436modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version 418modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
@@ -458,13 +440,9 @@ modules_evas_engines_fb_module_la_CPPFLAGS = \
458-I$(top_srcdir)/src/lib/eina \ 440-I$(top_srcdir)/src/lib/eina \
459-I$(top_builddir)/src/lib/eina \ 441-I$(top_builddir)/src/lib/eina \
460-I$(top_srcdir)/src/lib/eo \ 442-I$(top_srcdir)/src/lib/eo \
461-I$(top_builddir)/src/lib/eo \
462-I$(top_srcdir)/src/lib/evas \ 443-I$(top_srcdir)/src/lib/evas \
463-I$(top_builddir)/src/lib/evas \
464-I$(top_srcdir)/src/lib/evas/include \ 444-I$(top_srcdir)/src/lib/evas/include \
465-I$(top_builddir)/src/lib/evas/include \
466-I$(top_srcdir)/src/lib/evas/cserve2 \ 445-I$(top_srcdir)/src/lib/evas/cserve2 \
467-I$(top_builddir)/src/lib/evas/cserve2 \
468@evas_engine_fb_cflags@ \ 446@evas_engine_fb_cflags@ \
469@EFL_CFLAGS@ \ 447@EFL_CFLAGS@ \
470@EVAS_CFLAGS@ 448@EVAS_CFLAGS@
@@ -578,15 +556,10 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
578-I$(top_srcdir)/src/lib/eina \ 556-I$(top_srcdir)/src/lib/eina \
579-I$(top_builddir)/src/lib/eina \ 557-I$(top_builddir)/src/lib/eina \
580-I$(top_srcdir)/src/lib/eo \ 558-I$(top_srcdir)/src/lib/eo \
581-I$(top_builddir)/src/lib/eo \
582-I$(top_srcdir)/src/lib/eet \ 559-I$(top_srcdir)/src/lib/eet \
583-I$(top_builddir)/src/lib/eet \
584-I$(top_srcdir)/src/lib/evas \ 560-I$(top_srcdir)/src/lib/evas \
585-I$(top_builddir)/src/lib/evas \
586-I$(top_srcdir)/src/lib/evas/include \ 561-I$(top_srcdir)/src/lib/evas/include \
587-I$(top_builddir)/src/lib/evas/include \
588-I$(top_srcdir)/src/lib/evas/cserve2 \ 562-I$(top_srcdir)/src/lib/evas/cserve2 \
589-I$(top_builddir)/src/lib/evas/cserve2 \
590-DEFL_EVAS_BUILD \ 563-DEFL_EVAS_BUILD \
591@EFL_CFLAGS@ \ 564@EFL_CFLAGS@ \
592@EVAS_CFLAGS@ 565@EVAS_CFLAGS@
@@ -620,17 +593,11 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
620-I$(top_srcdir)/src/lib/eina \ 593-I$(top_srcdir)/src/lib/eina \
621-I$(top_builddir)/src/lib/eina \ 594-I$(top_builddir)/src/lib/eina \
622-I$(top_srcdir)/src/lib/eo \ 595-I$(top_srcdir)/src/lib/eo \
623-I$(top_builddir)/src/lib/eo \
624-I$(top_srcdir)/src/lib/eet \ 596-I$(top_srcdir)/src/lib/eet \
625-I$(top_builddir)/src/lib/eet \
626-I$(top_srcdir)/src/lib/evas \ 597-I$(top_srcdir)/src/lib/evas \
627-I$(top_builddir)/src/lib/evas \
628-I$(top_srcdir)/src/lib/evas/include \ 598-I$(top_srcdir)/src/lib/evas/include \
629-I$(top_builddir)/src/lib/evas/include \
630-I$(top_srcdir)/src/lib/evas/cserve2 \ 599-I$(top_srcdir)/src/lib/evas/cserve2 \
631-I$(top_builddir)/src/lib/evas/cserve2 \
632-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 600-I$(top_srcdir)/src/modules/evas/engines/gl_common \
633-I$(top_builddir)/src/modules/evas/engines/gl_common \
634@evas_engine_gl_cocoa_cflags@ \ 601@evas_engine_gl_cocoa_cflags@ \
635@EFL_CFLAGS@ \ 602@EFL_CFLAGS@ \
636@EVAS_CFLAGS@ 603@EVAS_CFLAGS@
@@ -669,17 +636,11 @@ modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
669-I$(top_srcdir)/src/lib/eina \ 636-I$(top_srcdir)/src/lib/eina \
670-I$(top_builddir)/src/lib/eina \ 637-I$(top_builddir)/src/lib/eina \
671-I$(top_srcdir)/src/lib/eo \ 638-I$(top_srcdir)/src/lib/eo \
672-I$(top_builddir)/src/lib/eo \
673-I$(top_srcdir)/src/lib/eet \ 639-I$(top_srcdir)/src/lib/eet \
674-I$(top_builddir)/src/lib/eet \
675-I$(top_srcdir)/src/lib/evas \ 640-I$(top_srcdir)/src/lib/evas \
676-I$(top_builddir)/src/lib/evas \
677-I$(top_srcdir)/src/lib/evas/include \ 641-I$(top_srcdir)/src/lib/evas/include \
678-I$(top_builddir)/src/lib/evas/include \
679-I$(top_srcdir)/src/lib/evas/cserve2 \ 642-I$(top_srcdir)/src/lib/evas/cserve2 \
680-I$(top_builddir)/src/lib/evas/cserve2 \
681-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 643-I$(top_srcdir)/src/modules/evas/engines/gl_common \
682-I$(top_builddir)/src/modules/evas/engines/gl_common \
683@evas_engine_gl_sdl_cflags@ \ 644@evas_engine_gl_sdl_cflags@ \
684@EFL_CFLAGS@ \ 645@EFL_CFLAGS@ \
685@EVAS_CFLAGS@ 646@EVAS_CFLAGS@
@@ -718,17 +679,11 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
718-I$(top_srcdir)/src/lib/eina \ 679-I$(top_srcdir)/src/lib/eina \
719-I$(top_builddir)/src/lib/eina \ 680-I$(top_builddir)/src/lib/eina \
720-I$(top_srcdir)/src/lib/eo \ 681-I$(top_srcdir)/src/lib/eo \
721-I$(top_builddir)/src/lib/eo \
722-I$(top_srcdir)/src/lib/eet \ 682-I$(top_srcdir)/src/lib/eet \
723-I$(top_builddir)/src/lib/eet \
724-I$(top_srcdir)/src/lib/evas \ 683-I$(top_srcdir)/src/lib/evas \
725-I$(top_builddir)/src/lib/evas \
726-I$(top_srcdir)/src/lib/evas/include \ 684-I$(top_srcdir)/src/lib/evas/include \
727-I$(top_builddir)/src/lib/evas/include \
728-I$(top_srcdir)/src/lib/evas/cserve2 \ 685-I$(top_srcdir)/src/lib/evas/cserve2 \
729-I$(top_builddir)/src/lib/evas/cserve2 \
730-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 686-I$(top_srcdir)/src/modules/evas/engines/gl_common \
731-I$(top_builddir)/src/modules/evas/engines/gl_common \
732@evas_engine_gl_xlib_cflags@ \ 687@evas_engine_gl_xlib_cflags@ \
733@EFL_CFLAGS@ \ 688@EFL_CFLAGS@ \
734@EVAS_CFLAGS@ 689@EVAS_CFLAGS@
@@ -766,13 +721,9 @@ modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
766-I$(top_srcdir)/src/lib/eina \ 721-I$(top_srcdir)/src/lib/eina \
767-I$(top_builddir)/src/lib/eina \ 722-I$(top_builddir)/src/lib/eina \
768-I$(top_srcdir)/src/lib/eo \ 723-I$(top_srcdir)/src/lib/eo \
769-I$(top_builddir)/src/lib/eo \
770-I$(top_srcdir)/src/lib/evas \ 724-I$(top_srcdir)/src/lib/evas \
771-I$(top_builddir)/src/lib/evas \
772-I$(top_srcdir)/src/lib/evas/include \ 725-I$(top_srcdir)/src/lib/evas/include \
773-I$(top_builddir)/src/lib/evas/include \
774-I$(top_srcdir)/src/lib/evas/cserve2 \ 726-I$(top_srcdir)/src/lib/evas/cserve2 \
775-I$(top_builddir)/src/lib/evas/cserve2 \
776@evas_engine_psl1ght_cflags@ \ 727@evas_engine_psl1ght_cflags@ \
777@EFL_CFLAGS@ \ 728@EFL_CFLAGS@ \
778@EVAS_CFLAGS@ 729@EVAS_CFLAGS@
@@ -806,21 +757,16 @@ modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
806-I$(top_srcdir)/src/lib/eina \ 757-I$(top_srcdir)/src/lib/eina \
807-I$(top_builddir)/src/lib/eina \ 758-I$(top_builddir)/src/lib/eina \
808-I$(top_srcdir)/src/lib/eo \ 759-I$(top_srcdir)/src/lib/eo \
809-I$(top_builddir)/src/lib/eo \
810-I$(top_srcdir)/src/lib/evas \ 760-I$(top_srcdir)/src/lib/evas \
811-I$(top_builddir)/src/lib/evas \
812-I$(top_srcdir)/src/lib/evas/include \ 761-I$(top_srcdir)/src/lib/evas/include \
813-I$(top_builddir)/src/lib/evas/include \
814-I$(top_srcdir)/src/lib/evas/cserve2 \ 762-I$(top_srcdir)/src/lib/evas/cserve2 \
815-I$(top_builddir)/src/lib/evas/cserve2 \
816-DEFL_EVAS_BUILD \ 763-DEFL_EVAS_BUILD \
817@evas_engine_software_ddraw_cflags@ \ 764@evas_engine_software_ddraw_cflags@ \
818@EFL_CFLAGS@ \ 765@EFL_CFLAGS@ \
819@EVAS_CFLAGS@ 766@EVAS_CFLAGS@
820if HAVE_WINDOWS 767if HAVE_WINDOWS
821modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \ 768modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \
822-I$(top_srcdir)/src/lib/evil \ 769-I$(top_srcdir)/src/lib/evil
823-I$(top_builddir)/src/lib/evil
824endif 770endif
825modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions 771modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
826modules_evas_engines_software_ddraw_module_la_LIBADD = \ 772modules_evas_engines_software_ddraw_module_la_LIBADD = \
@@ -852,21 +798,16 @@ modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
852-I$(top_srcdir)/src/lib/eina \ 798-I$(top_srcdir)/src/lib/eina \
853-I$(top_builddir)/src/lib/eina \ 799-I$(top_builddir)/src/lib/eina \
854-I$(top_srcdir)/src/lib/eo \ 800-I$(top_srcdir)/src/lib/eo \
855-I$(top_builddir)/src/lib/eo \
856-I$(top_srcdir)/src/lib/evas \ 801-I$(top_srcdir)/src/lib/evas \
857-I$(top_builddir)/src/lib/evas \
858-I$(top_srcdir)/src/lib/evas/include \ 802-I$(top_srcdir)/src/lib/evas/include \
859-I$(top_builddir)/src/lib/evas/include \
860-I$(top_srcdir)/src/lib/evas/cserve2 \ 803-I$(top_srcdir)/src/lib/evas/cserve2 \
861-I$(top_builddir)/src/lib/evas/cserve2 \
862-DEFL_EVAS_BUILD \ 804-DEFL_EVAS_BUILD \
863@evas_engine_software_gdi_cflags@ \ 805@evas_engine_software_gdi_cflags@ \
864@EFL_CFLAGS@ \ 806@EFL_CFLAGS@ \
865@EVAS_CFLAGS@ 807@EVAS_CFLAGS@
866if HAVE_WINDOWS 808if HAVE_WINDOWS
867modules_evas_engines_software_gdi_module_la_CPPFLAGS += \ 809modules_evas_engines_software_gdi_module_la_CPPFLAGS += \
868-I$(top_srcdir)/src/lib/evil \ 810-I$(top_srcdir)/src/lib/evil
869-I$(top_builddir)/src/lib/evil
870endif 811endif
871modules_evas_engines_software_gdi_module_la_LIBADD = \ 812modules_evas_engines_software_gdi_module_la_LIBADD = \
872lib/evas/libevas.la \ 813lib/evas/libevas.la \
@@ -888,13 +829,9 @@ SOFTWARE_X11_CPPFLAGS = \
888-I$(top_srcdir)/src/lib/eina \ 829-I$(top_srcdir)/src/lib/eina \
889-I$(top_builddir)/src/lib/eina \ 830-I$(top_builddir)/src/lib/eina \
890-I$(top_srcdir)/src/lib/eo \ 831-I$(top_srcdir)/src/lib/eo \
891-I$(top_builddir)/src/lib/eo \
892-I$(top_srcdir)/src/lib/evas \ 832-I$(top_srcdir)/src/lib/evas \
893-I$(top_builddir)/src/lib/evas \
894-I$(top_srcdir)/src/lib/evas/include \ 833-I$(top_srcdir)/src/lib/evas/include \
895-I$(top_builddir)/src/lib/evas/include \
896-I$(top_srcdir)/src/lib/evas/cserve2 \ 834-I$(top_srcdir)/src/lib/evas/cserve2 \
897-I$(top_builddir)/src/lib/evas/cserve2 \
898@EFL_CFLAGS@ \ 835@EFL_CFLAGS@ \
899@EVAS_CFLAGS@ 836@EVAS_CFLAGS@
900SOFTWARE_X11_LIBADD = 837SOFTWARE_X11_LIBADD =
@@ -963,17 +900,11 @@ modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
963-I$(top_srcdir)/src/lib/eina \ 900-I$(top_srcdir)/src/lib/eina \
964-I$(top_builddir)/src/lib/eina \ 901-I$(top_builddir)/src/lib/eina \
965-I$(top_srcdir)/src/lib/eo \ 902-I$(top_srcdir)/src/lib/eo \
966-I$(top_builddir)/src/lib/eo \
967-I$(top_srcdir)/src/lib/eet \ 903-I$(top_srcdir)/src/lib/eet \
968-I$(top_builddir)/src/lib/eet \
969-I$(top_srcdir)/src/lib/evas \ 904-I$(top_srcdir)/src/lib/evas \
970-I$(top_builddir)/src/lib/evas \
971-I$(top_srcdir)/src/lib/evas/include \ 905-I$(top_srcdir)/src/lib/evas/include \
972-I$(top_builddir)/src/lib/evas/include \
973-I$(top_srcdir)/src/lib/evas/cserve2 \ 906-I$(top_srcdir)/src/lib/evas/cserve2 \
974-I$(top_builddir)/src/lib/evas/cserve2 \
975-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 907-I$(top_srcdir)/src/modules/evas/engines/gl_common \
976-I$(top_builddir)/src/modules/evas/engines/gl_common \
977@evas_engine_wayland_egl_cflags@ \ 908@evas_engine_wayland_egl_cflags@ \
978@EFL_CFLAGS@ \ 909@EFL_CFLAGS@ \
979@EVAS_CFLAGS@ 910@EVAS_CFLAGS@
@@ -1006,13 +937,9 @@ modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
1006-I$(top_srcdir)/src/lib/eina \ 937-I$(top_srcdir)/src/lib/eina \
1007-I$(top_builddir)/src/lib/eina \ 938-I$(top_builddir)/src/lib/eina \
1008-I$(top_srcdir)/src/lib/eo \ 939-I$(top_srcdir)/src/lib/eo \
1009-I$(top_builddir)/src/lib/eo \
1010-I$(top_srcdir)/src/lib/evas \ 940-I$(top_srcdir)/src/lib/evas \
1011-I$(top_builddir)/src/lib/evas \
1012-I$(top_srcdir)/src/lib/evas/include \ 941-I$(top_srcdir)/src/lib/evas/include \
1013-I$(top_builddir)/src/lib/evas/include \
1014-I$(top_srcdir)/src/lib/evas/cserve2 \ 942-I$(top_srcdir)/src/lib/evas/cserve2 \
1015-I$(top_builddir)/src/lib/evas/cserve2 \
1016@evas_engine_wayland_shm_cflags@ \ 943@evas_engine_wayland_shm_cflags@ \
1017@EFL_CFLAGS@ \ 944@EFL_CFLAGS@ \
1018@EVAS_CFLAGS@ 945@EVAS_CFLAGS@
@@ -1040,11 +967,8 @@ modules_evas_loaders_bmp_module_la_CPPFLAGS = \
1040-I$(top_srcdir)/src/lib/eina \ 967-I$(top_srcdir)/src/lib/eina \
1041-I$(top_builddir)/src/lib/eina \ 968-I$(top_builddir)/src/lib/eina \
1042-I$(top_srcdir)/src/lib/eo \ 969-I$(top_srcdir)/src/lib/eo \
1043-I$(top_builddir)/src/lib/eo \
1044-I$(top_srcdir)/src/lib/evas \ 970-I$(top_srcdir)/src/lib/evas \
1045-I$(top_builddir)/src/lib/evas \
1046-I$(top_srcdir)/src/lib/evas/include \ 971-I$(top_srcdir)/src/lib/evas/include \
1047-I$(top_builddir)/src/lib/evas/include \
1048-DEFL_EVAS_BUILD \ 972-DEFL_EVAS_BUILD \
1049@evas_image_loader_bmp_cflags@ \ 973@evas_image_loader_bmp_cflags@ \
1050@EFL_CFLAGS@ \ 974@EFL_CFLAGS@ \
@@ -1072,13 +996,9 @@ modules_evas_loaders_eet_module_la_CPPFLAGS = \
1072-I$(top_srcdir)/src/lib/eina \ 996-I$(top_srcdir)/src/lib/eina \
1073-I$(top_builddir)/src/lib/eina \ 997-I$(top_builddir)/src/lib/eina \
1074-I$(top_srcdir)/src/lib/eo \ 998-I$(top_srcdir)/src/lib/eo \
1075-I$(top_builddir)/src/lib/eo \
1076-I$(top_srcdir)/src/lib/eet \ 999-I$(top_srcdir)/src/lib/eet \
1077-I$(top_builddir)/src/lib/eet \
1078-I$(top_srcdir)/src/lib/evas \ 1000-I$(top_srcdir)/src/lib/evas \
1079-I$(top_builddir)/src/lib/evas \
1080-I$(top_srcdir)/src/lib/evas/include \ 1001-I$(top_srcdir)/src/lib/evas/include \
1081-I$(top_builddir)/src/lib/evas/include \
1082-DEFL_EVAS_BUILD \ 1002-DEFL_EVAS_BUILD \
1083@evas_image_loader_eet_cflags@ \ 1003@evas_image_loader_eet_cflags@ \
1084@EFL_CFLAGS@ \ 1004@EFL_CFLAGS@ \
@@ -1105,11 +1025,8 @@ modules_evas_loaders_generic_module_la_CPPFLAGS = \
1105-I$(top_srcdir)/src/lib/eina \ 1025-I$(top_srcdir)/src/lib/eina \
1106-I$(top_builddir)/src/lib/eina \ 1026-I$(top_builddir)/src/lib/eina \
1107-I$(top_srcdir)/src/lib/eo \ 1027-I$(top_srcdir)/src/lib/eo \
1108-I$(top_builddir)/src/lib/eo \
1109-I$(top_srcdir)/src/lib/evas \ 1028-I$(top_srcdir)/src/lib/evas \
1110-I$(top_builddir)/src/lib/evas \
1111-I$(top_srcdir)/src/lib/evas/include \ 1029-I$(top_srcdir)/src/lib/evas/include \
1112-I$(top_builddir)/src/lib/evas/include \
1113-DEFL_EVAS_BUILD \ 1030-DEFL_EVAS_BUILD \
1114@evas_image_loader_generic_cflags@ \ 1031@evas_image_loader_generic_cflags@ \
1115@EFL_CFLAGS@ \ 1032@EFL_CFLAGS@ \
@@ -1136,11 +1053,8 @@ modules_evas_loaders_gif_module_la_CPPFLAGS = \
1136-I$(top_srcdir)/src/lib/eina \ 1053-I$(top_srcdir)/src/lib/eina \
1137-I$(top_builddir)/src/lib/eina \ 1054-I$(top_builddir)/src/lib/eina \
1138-I$(top_srcdir)/src/lib/eo \ 1055-I$(top_srcdir)/src/lib/eo \
1139-I$(top_builddir)/src/lib/eo \
1140-I$(top_srcdir)/src/lib/evas \ 1056-I$(top_srcdir)/src/lib/evas \
1141-I$(top_builddir)/src/lib/evas \
1142-I$(top_srcdir)/src/lib/evas/include \ 1057-I$(top_srcdir)/src/lib/evas/include \
1143-I$(top_builddir)/src/lib/evas/include \
1144-DEFL_EVAS_BUILD \ 1058-DEFL_EVAS_BUILD \
1145@evas_image_loader_gif_cflags@ \ 1059@evas_image_loader_gif_cflags@ \
1146@EFL_CFLAGS@ \ 1060@EFL_CFLAGS@ \
@@ -1167,11 +1081,8 @@ modules_evas_loaders_ico_module_la_CPPFLAGS = \
1167-I$(top_srcdir)/src/lib/eina \ 1081-I$(top_srcdir)/src/lib/eina \
1168-I$(top_builddir)/src/lib/eina \ 1082-I$(top_builddir)/src/lib/eina \
1169-I$(top_srcdir)/src/lib/eo \ 1083-I$(top_srcdir)/src/lib/eo \
1170-I$(top_builddir)/src/lib/eo \
1171-I$(top_srcdir)/src/lib/evas \ 1084-I$(top_srcdir)/src/lib/evas \
1172-I$(top_builddir)/src/lib/evas \
1173-I$(top_srcdir)/src/lib/evas/include \ 1085-I$(top_srcdir)/src/lib/evas/include \
1174-I$(top_builddir)/src/lib/evas/include \
1175-DEFL_EVAS_BUILD \ 1086-DEFL_EVAS_BUILD \
1176@evas_image_loader_ico_cflags@ \ 1087@evas_image_loader_ico_cflags@ \
1177@EFL_CFLAGS@ \ 1088@EFL_CFLAGS@ \
@@ -1201,11 +1112,8 @@ modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
1201-I$(top_srcdir)/src/lib/eina \ 1112-I$(top_srcdir)/src/lib/eina \
1202-I$(top_builddir)/src/lib/eina \ 1113-I$(top_builddir)/src/lib/eina \
1203-I$(top_srcdir)/src/lib/eo \ 1114-I$(top_srcdir)/src/lib/eo \
1204-I$(top_builddir)/src/lib/eo \
1205-I$(top_srcdir)/src/lib/evas \ 1115-I$(top_srcdir)/src/lib/evas \
1206-I$(top_builddir)/src/lib/evas \
1207-I$(top_srcdir)/src/lib/evas/include \ 1116-I$(top_srcdir)/src/lib/evas/include \
1208-I$(top_builddir)/src/lib/evas/include \
1209-DEFL_EVAS_BUILD \ 1117-DEFL_EVAS_BUILD \
1210@evas_image_loader_jpeg_cflags@ \ 1118@evas_image_loader_jpeg_cflags@ \
1211@EFL_CFLAGS@ \ 1119@EFL_CFLAGS@ \
@@ -1224,11 +1132,8 @@ modules_evas_savers_jpeg_module_la_CPPFLAGS = \
1224-I$(top_srcdir)/src/lib/eina \ 1132-I$(top_srcdir)/src/lib/eina \
1225-I$(top_builddir)/src/lib/eina \ 1133-I$(top_builddir)/src/lib/eina \
1226-I$(top_srcdir)/src/lib/eo \ 1134-I$(top_srcdir)/src/lib/eo \
1227-I$(top_builddir)/src/lib/eo \
1228-I$(top_srcdir)/src/lib/evas \ 1135-I$(top_srcdir)/src/lib/evas \
1229-I$(top_builddir)/src/lib/evas \
1230-I$(top_srcdir)/src/lib/evas/include \ 1136-I$(top_srcdir)/src/lib/evas/include \
1231-I$(top_builddir)/src/lib/evas/include \
1232@evas_image_loader_jpeg_cflags@ \ 1137@evas_image_loader_jpeg_cflags@ \
1233@EFL_CFLAGS@ \ 1138@EFL_CFLAGS@ \
1234@EVAS_CFLAGS@ 1139@EVAS_CFLAGS@
@@ -1255,11 +1160,8 @@ modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
1255-I$(top_srcdir)/src/lib/eina \ 1160-I$(top_srcdir)/src/lib/eina \
1256-I$(top_builddir)/src/lib/eina \ 1161-I$(top_builddir)/src/lib/eina \
1257-I$(top_srcdir)/src/lib/eo \ 1162-I$(top_srcdir)/src/lib/eo \
1258-I$(top_builddir)/src/lib/eo \
1259-I$(top_srcdir)/src/lib/evas \ 1163-I$(top_srcdir)/src/lib/evas \
1260-I$(top_builddir)/src/lib/evas \
1261-I$(top_srcdir)/src/lib/evas/include \ 1164-I$(top_srcdir)/src/lib/evas/include \
1262-I$(top_builddir)/src/lib/evas/include \
1263-DEFL_EVAS_BUILD \ 1165-DEFL_EVAS_BUILD \
1264@evas_image_loader_pmaps_cflags@ \ 1166@evas_image_loader_pmaps_cflags@ \
1265@EFL_CFLAGS@ \ 1167@EFL_CFLAGS@ \
@@ -1286,11 +1188,8 @@ modules_evas_loaders_png_module_la_CPPFLAGS = \
1286-I$(top_srcdir)/src/lib/eina \ 1188-I$(top_srcdir)/src/lib/eina \
1287-I$(top_builddir)/src/lib/eina \ 1189-I$(top_builddir)/src/lib/eina \
1288-I$(top_srcdir)/src/lib/eo \ 1190-I$(top_srcdir)/src/lib/eo \
1289-I$(top_builddir)/src/lib/eo \
1290-I$(top_srcdir)/src/lib/evas \ 1191-I$(top_srcdir)/src/lib/evas \
1291-I$(top_builddir)/src/lib/evas \
1292-I$(top_srcdir)/src/lib/evas/include \ 1192-I$(top_srcdir)/src/lib/evas/include \
1293-I$(top_builddir)/src/lib/evas/include \
1294-DEFL_EVAS_BUILD \ 1193-DEFL_EVAS_BUILD \
1295@evas_image_loader_png_cflags@ \ 1194@evas_image_loader_png_cflags@ \
1296@EFL_CFLAGS@ \ 1195@EFL_CFLAGS@ \
@@ -1309,11 +1208,8 @@ modules_evas_savers_png_module_la_CPPFLAGS = \
1309-I$(top_srcdir)/src/lib/eina \ 1208-I$(top_srcdir)/src/lib/eina \
1310-I$(top_builddir)/src/lib/eina \ 1209-I$(top_builddir)/src/lib/eina \
1311-I$(top_srcdir)/src/lib/eo \ 1210-I$(top_srcdir)/src/lib/eo \
1312-I$(top_builddir)/src/lib/eo \
1313-I$(top_srcdir)/src/lib/evas \ 1211-I$(top_srcdir)/src/lib/evas \
1314-I$(top_builddir)/src/lib/evas \
1315-I$(top_srcdir)/src/lib/evas/include \ 1212-I$(top_srcdir)/src/lib/evas/include \
1316-I$(top_builddir)/src/lib/evas/include \
1317-DEFL_EVAS_BUILD \ 1213-DEFL_EVAS_BUILD \
1318@evas_image_loader_png_cflags@ \ 1214@evas_image_loader_png_cflags@ \
1319@EFL_CFLAGS@ \ 1215@EFL_CFLAGS@ \
@@ -1340,11 +1236,8 @@ modules_evas_loaders_psd_module_la_CPPFLAGS = \
1340-I$(top_srcdir)/src/lib/eina \ 1236-I$(top_srcdir)/src/lib/eina \
1341-I$(top_builddir)/src/lib/eina \ 1237-I$(top_builddir)/src/lib/eina \
1342-I$(top_srcdir)/src/lib/eo \ 1238-I$(top_srcdir)/src/lib/eo \
1343-I$(top_builddir)/src/lib/eo \
1344-I$(top_srcdir)/src/lib/evas \ 1239-I$(top_srcdir)/src/lib/evas \
1345-I$(top_builddir)/src/lib/evas \
1346-I$(top_srcdir)/src/lib/evas/include \ 1240-I$(top_srcdir)/src/lib/evas/include \
1347-I$(top_builddir)/src/lib/evas/include \
1348-DEFL_EVAS_BUILD \ 1241-DEFL_EVAS_BUILD \
1349@evas_image_loader_psd_cflags@ \ 1242@evas_image_loader_psd_cflags@ \
1350@EFL_CFLAGS@ \ 1243@EFL_CFLAGS@ \
@@ -1371,11 +1264,8 @@ modules_evas_loaders_svg_module_la_CPPFLAGS = \
1371-I$(top_srcdir)/src/lib/eina \ 1264-I$(top_srcdir)/src/lib/eina \
1372-I$(top_builddir)/src/lib/eina \ 1265-I$(top_builddir)/src/lib/eina \
1373-I$(top_srcdir)/src/lib/eo \ 1266-I$(top_srcdir)/src/lib/eo \
1374-I$(top_builddir)/src/lib/eo \
1375-I$(top_srcdir)/src/lib/evas \ 1267-I$(top_srcdir)/src/lib/evas \
1376-I$(top_builddir)/src/lib/evas \
1377-I$(top_srcdir)/src/lib/evas/include \ 1268-I$(top_srcdir)/src/lib/evas/include \
1378-I$(top_builddir)/src/lib/evas/include \
1379-DEFL_EVAS_BUILD \ 1269-DEFL_EVAS_BUILD \
1380@evas_image_loader_svg_cflags@ \ 1270@evas_image_loader_svg_cflags@ \
1381@EFL_CFLAGS@ \ 1271@EFL_CFLAGS@ \
@@ -1402,11 +1292,8 @@ modules_evas_loaders_tga_module_la_CPPFLAGS = \
1402-I$(top_srcdir)/src/lib/eina \ 1292-I$(top_srcdir)/src/lib/eina \
1403-I$(top_builddir)/src/lib/eina \ 1293-I$(top_builddir)/src/lib/eina \
1404-I$(top_srcdir)/src/lib/eo \ 1294-I$(top_srcdir)/src/lib/eo \
1405-I$(top_builddir)/src/lib/eo \
1406-I$(top_srcdir)/src/lib/evas \ 1295-I$(top_srcdir)/src/lib/evas \
1407-I$(top_builddir)/src/lib/evas \
1408-I$(top_srcdir)/src/lib/evas/include \ 1296-I$(top_srcdir)/src/lib/evas/include \
1409-I$(top_builddir)/src/lib/evas/include \
1410-DEFL_EVAS_BUILD \ 1297-DEFL_EVAS_BUILD \
1411@evas_image_loader_tga_cflags@ \ 1298@evas_image_loader_tga_cflags@ \
1412@EFL_CFLAGS@ \ 1299@EFL_CFLAGS@ \
@@ -1433,19 +1320,15 @@ modules_evas_loaders_tiff_module_la_CPPFLAGS = \
1433-I$(top_srcdir)/src/lib/eina \ 1320-I$(top_srcdir)/src/lib/eina \
1434-I$(top_builddir)/src/lib/eina \ 1321-I$(top_builddir)/src/lib/eina \
1435-I$(top_srcdir)/src/lib/eo \ 1322-I$(top_srcdir)/src/lib/eo \
1436-I$(top_builddir)/src/lib/eo \
1437-I$(top_srcdir)/src/lib/evas \ 1323-I$(top_srcdir)/src/lib/evas \
1438-I$(top_builddir)/src/lib/evas \
1439-I$(top_srcdir)/src/lib/evas/include \ 1324-I$(top_srcdir)/src/lib/evas/include \
1440-I$(top_builddir)/src/lib/evas/include \
1441-DEFL_EVAS_BUILD \ 1325-DEFL_EVAS_BUILD \
1442@evas_image_loader_tiff_cflags@ \ 1326@evas_image_loader_tiff_cflags@ \
1443@EFL_CFLAGS@ \ 1327@EFL_CFLAGS@ \
1444@EVAS_CFLAGS@ 1328@EVAS_CFLAGS@
1445if HAVE_WINDOWS 1329if HAVE_WINDOWS
1446modules_evas_loaders_tiff_module_la_CPPFLAGS += \ 1330modules_evas_loaders_tiff_module_la_CPPFLAGS += \
1447-I$(top_srcdir)/src/lib/evil \ 1331-I$(top_srcdir)/src/lib/evil
1448-I$(top_builddir)/src/lib/evil
1449endif 1332endif
1450modules_evas_loaders_tiff_module_la_LIBADD = \ 1333modules_evas_loaders_tiff_module_la_LIBADD = \
1451lib/evas/libevas.la \ 1334lib/evas/libevas.la \
@@ -1461,19 +1344,15 @@ modules_evas_savers_tiff_module_la_CPPFLAGS = \
1461-I$(top_srcdir)/src/lib/eina \ 1344-I$(top_srcdir)/src/lib/eina \
1462-I$(top_builddir)/src/lib/eina \ 1345-I$(top_builddir)/src/lib/eina \
1463-I$(top_srcdir)/src/lib/eo \ 1346-I$(top_srcdir)/src/lib/eo \
1464-I$(top_builddir)/src/lib/eo \
1465-I$(top_srcdir)/src/lib/evas \ 1347-I$(top_srcdir)/src/lib/evas \
1466-I$(top_builddir)/src/lib/evas \
1467-I$(top_srcdir)/src/lib/evas/include \ 1348-I$(top_srcdir)/src/lib/evas/include \
1468-I$(top_builddir)/src/lib/evas/include \
1469-DEFL_EVAS_BUILD \ 1349-DEFL_EVAS_BUILD \
1470@evas_image_loader_tiff_cflags@ \ 1350@evas_image_loader_tiff_cflags@ \
1471@EFL_CFLAGS@ \ 1351@EFL_CFLAGS@ \
1472@EVAS_CFLAGS@ 1352@EVAS_CFLAGS@
1473if HAVE_WINDOWS 1353if HAVE_WINDOWS
1474modules_evas_savers_tiff_module_la_CPPFLAGS += \ 1354modules_evas_savers_tiff_module_la_CPPFLAGS += \
1475-I$(top_srcdir)/src/lib/evil \ 1355-I$(top_srcdir)/src/lib/evil
1476-I$(top_builddir)/src/lib/evil
1477endif 1356endif
1478modules_evas_savers_tiff_module_la_LIBADD = \ 1357modules_evas_savers_tiff_module_la_LIBADD = \
1479lib/evas/libevas.la \ 1358lib/evas/libevas.la \
@@ -1497,11 +1376,8 @@ modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
1497-I$(top_srcdir)/src/lib/eina \ 1376-I$(top_srcdir)/src/lib/eina \
1498-I$(top_builddir)/src/lib/eina \ 1377-I$(top_builddir)/src/lib/eina \
1499-I$(top_srcdir)/src/lib/eo \ 1378-I$(top_srcdir)/src/lib/eo \
1500-I$(top_builddir)/src/lib/eo \
1501-I$(top_srcdir)/src/lib/evas \ 1379-I$(top_srcdir)/src/lib/evas \
1502-I$(top_builddir)/src/lib/evas \
1503-I$(top_srcdir)/src/lib/evas/include \ 1380-I$(top_srcdir)/src/lib/evas/include \
1504-I$(top_builddir)/src/lib/evas/include \
1505-DEFL_EVAS_BUILD \ 1381-DEFL_EVAS_BUILD \
1506@evas_image_loader_wbmp_cflags@ \ 1382@evas_image_loader_wbmp_cflags@ \
1507@EFL_CFLAGS@ \ 1383@EFL_CFLAGS@ \
@@ -1528,11 +1404,8 @@ modules_evas_loaders_webp_module_la_CPPFLAGS = \
1528-I$(top_srcdir)/src/lib/eina \ 1404-I$(top_srcdir)/src/lib/eina \
1529-I$(top_builddir)/src/lib/eina \ 1405-I$(top_builddir)/src/lib/eina \
1530-I$(top_srcdir)/src/lib/eo \ 1406-I$(top_srcdir)/src/lib/eo \
1531-I$(top_builddir)/src/lib/eo \
1532-I$(top_srcdir)/src/lib/evas \ 1407-I$(top_srcdir)/src/lib/evas \
1533-I$(top_builddir)/src/lib/evas \
1534-I$(top_srcdir)/src/lib/evas/include \ 1408-I$(top_srcdir)/src/lib/evas/include \
1535-I$(top_builddir)/src/lib/evas/include \
1536-DEFL_EVAS_BUILD \ 1409-DEFL_EVAS_BUILD \
1537@evas_image_loader_webp_cflags@ \ 1410@evas_image_loader_webp_cflags@ \
1538@EFL_CFLAGS@ \ 1411@EFL_CFLAGS@ \
@@ -1559,11 +1432,8 @@ modules_evas_loaders_xpm_module_la_CPPFLAGS = \
1559-I$(top_srcdir)/src/lib/eina \ 1432-I$(top_srcdir)/src/lib/eina \
1560-I$(top_builddir)/src/lib/eina \ 1433-I$(top_builddir)/src/lib/eina \
1561-I$(top_srcdir)/src/lib/eo \ 1434-I$(top_srcdir)/src/lib/eo \
1562-I$(top_builddir)/src/lib/eo \
1563-I$(top_srcdir)/src/lib/evas \ 1435-I$(top_srcdir)/src/lib/evas \
1564-I$(top_builddir)/src/lib/evas \
1565-I$(top_srcdir)/src/lib/evas/include \ 1436-I$(top_srcdir)/src/lib/evas/include \
1566-I$(top_builddir)/src/lib/evas/include \
1567-DEFL_EVAS_BUILD \ 1437-DEFL_EVAS_BUILD \
1568@evas_image_loader_xpm_cflags@ \ 1438@evas_image_loader_xpm_cflags@ \
1569@EFL_CFLAGS@ \ 1439@EFL_CFLAGS@ \
@@ -1610,20 +1480,10 @@ bin_evas_evas_cserve2_CPPFLAGS = \
1610-I$(top_srcdir)/src/lib/eina \ 1480-I$(top_srcdir)/src/lib/eina \
1611-I$(top_builddir)/src/lib/eina \ 1481-I$(top_builddir)/src/lib/eina \
1612-I$(top_srcdir)/src/lib/eo \ 1482-I$(top_srcdir)/src/lib/eo \
1613-I$(top_builddir)/src/lib/eo \
1614-I$(top_srcdir)/src/lib/evas \ 1483-I$(top_srcdir)/src/lib/evas \
1615-I$(top_builddir)/src/lib/evas \
1616-I$(top_srcdir)/src/lib/evas/include \ 1484-I$(top_srcdir)/src/lib/evas/include \
1617-I$(top_builddir)/src/lib/evas/include \
1618-I$(top_srcdir)/src/lib/evas/cserve2 \ 1485-I$(top_srcdir)/src/lib/evas/cserve2 \
1619-I$(top_builddir)/src/lib/evas/cserve2 \
1620-I$(top_srcdir)/src/lib/eet \ 1486-I$(top_srcdir)/src/lib/eet \
1621-I$(top_builddir)/src/lib/eina \
1622-I$(top_builddir)/src/lib/eo \
1623-I$(top_builddir)/src/lib/evas \
1624-I$(top_builddir)/src/lib/evas/include \
1625-I$(top_builddir)/src/lib/evas/cserve2 \
1626-I$(top_builddir)/src/lib/eet \
1627-DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \ 1487-DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \
1628@EVAS_CFLAGS@ \ 1488@EVAS_CFLAGS@ \
1629@EFL_CFLAGS@ 1489@EFL_CFLAGS@
@@ -1642,13 +1502,9 @@ bin_evas_evas_cserve2_client_CPPFLAGS = \
1642-I$(top_srcdir)/src/lib/eina \ 1502-I$(top_srcdir)/src/lib/eina \
1643-I$(top_builddir)/src/lib/eina \ 1503-I$(top_builddir)/src/lib/eina \
1644-I$(top_srcdir)/src/lib/eo \ 1504-I$(top_srcdir)/src/lib/eo \
1645-I$(top_builddir)/src/lib/eo \
1646-I$(top_srcdir)/src/lib/evas \ 1505-I$(top_srcdir)/src/lib/evas \
1647-I$(top_builddir)/src/lib/evas \
1648-I$(top_srcdir)/src/lib/evas/include \ 1506-I$(top_srcdir)/src/lib/evas/include \
1649-I$(top_builddir)/src/lib/evas/include \
1650-I$(top_srcdir)/src/lib/evas/cserve2 \ 1507-I$(top_srcdir)/src/lib/evas/cserve2 \
1651-I$(top_builddir)/src/lib/evas/cserve2 \
1652@EVAS_CFLAGS@ \ 1508@EVAS_CFLAGS@ \
1653@EFL_CFLAGS@ 1509@EFL_CFLAGS@
1654 1510
@@ -1659,13 +1515,9 @@ bin_evas_evas_cserve2_usage_CPPFLAGS = \
1659-I$(top_srcdir)/src/lib/eina \ 1515-I$(top_srcdir)/src/lib/eina \
1660-I$(top_builddir)/src/lib/eina \ 1516-I$(top_builddir)/src/lib/eina \
1661-I$(top_srcdir)/src/lib/eo \ 1517-I$(top_srcdir)/src/lib/eo \
1662-I$(top_builddir)/src/lib/eo \
1663-I$(top_srcdir)/src/lib/evas \ 1518-I$(top_srcdir)/src/lib/evas \
1664-I$(top_builddir)/src/lib/evas \
1665-I$(top_srcdir)/src/lib/evas/include \ 1519-I$(top_srcdir)/src/lib/evas/include \
1666-I$(top_builddir)/src/lib/evas/include \
1667-I$(top_srcdir)/src/lib/evas/cserve2 \ 1520-I$(top_srcdir)/src/lib/evas/cserve2 \
1668-I$(top_builddir)/src/lib/evas/cserve2 \
1669@EVAS_CFLAGS@ \ 1521@EVAS_CFLAGS@ \
1670@EFL_CFLAGS@ 1522@EFL_CFLAGS@
1671 1523
@@ -1681,13 +1533,9 @@ bin_evas_evas_cserve2_debug_CPPFLAGS = \
1681-I$(top_srcdir)/src/lib/eina \ 1533-I$(top_srcdir)/src/lib/eina \
1682-I$(top_builddir)/src/lib/eina \ 1534-I$(top_builddir)/src/lib/eina \
1683-I$(top_srcdir)/src/lib/eo \ 1535-I$(top_srcdir)/src/lib/eo \
1684-I$(top_builddir)/src/lib/eo \
1685-I$(top_srcdir)/src/lib/evas \ 1536-I$(top_srcdir)/src/lib/evas \
1686-I$(top_builddir)/src/lib/evas \
1687-I$(top_srcdir)/src/lib/evas/include \ 1537-I$(top_srcdir)/src/lib/evas/include \
1688-I$(top_builddir)/src/lib/evas/include \
1689-I$(top_srcdir)/src/lib/evas/cserve2 \ 1538-I$(top_srcdir)/src/lib/evas/cserve2 \
1690-I$(top_builddir)/src/lib/evas/cserve2 \
1691@EVAS_CFLAGS@ \ 1539@EVAS_CFLAGS@ \
1692@EFL_CFLAGS@ 1540@EFL_CFLAGS@
1693 1541
@@ -1704,13 +1552,9 @@ bin_evas_evas_cserve2_slave_CPPFLAGS = \
1704-I$(top_srcdir)/src/lib/eina \ 1552-I$(top_srcdir)/src/lib/eina \
1705-I$(top_builddir)/src/lib/eina \ 1553-I$(top_builddir)/src/lib/eina \
1706-I$(top_srcdir)/src/lib/eo \ 1554-I$(top_srcdir)/src/lib/eo \
1707-I$(top_builddir)/src/lib/eo \
1708-I$(top_srcdir)/src/lib/evas \ 1555-I$(top_srcdir)/src/lib/evas \
1709-I$(top_builddir)/src/lib/evas \
1710-I$(top_srcdir)/src/lib/evas/include \ 1556-I$(top_srcdir)/src/lib/evas/include \
1711-I$(top_builddir)/src/lib/evas/include \
1712-I$(top_srcdir)/src/lib/evas/cserve2 \ 1557-I$(top_srcdir)/src/lib/evas/cserve2 \
1713-I$(top_builddir)/src/lib/evas/cserve2 \
1714-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 1558-DPACKAGE_LIB_DIR=\"$(libdir)\" \
1715@EVAS_CFLAGS@ \ 1559@EVAS_CFLAGS@ \
1716@EFL_CFLAGS@ 1560@EFL_CFLAGS@
@@ -1729,13 +1573,9 @@ bin_evas_dummy_slave_CPPFLAGS = \
1729-I$(top_srcdir)/src/lib/eina \ 1573-I$(top_srcdir)/src/lib/eina \
1730-I$(top_builddir)/src/lib/eina \ 1574-I$(top_builddir)/src/lib/eina \
1731-I$(top_srcdir)/src/lib/eo \ 1575-I$(top_srcdir)/src/lib/eo \
1732-I$(top_builddir)/src/lib/eo \
1733-I$(top_srcdir)/src/lib/evas \ 1576-I$(top_srcdir)/src/lib/evas \
1734-I$(top_builddir)/src/lib/evas \
1735-I$(top_srcdir)/src/lib/evas/include \ 1577-I$(top_srcdir)/src/lib/evas/include \
1736-I$(top_builddir)/src/lib/evas/include \
1737-I$(top_srcdir)/src/lib/evas/cserve2 \ 1578-I$(top_srcdir)/src/lib/evas/cserve2 \
1738-I$(top_builddir)/src/lib/evas/cserve2 \
1739@EVAS_CFLAGS@ \ 1579@EVAS_CFLAGS@ \
1740@EFL_CFLAGS@ 1580@EFL_CFLAGS@
1741 1581
@@ -1753,15 +1593,10 @@ bin_evas_loaders_bmp_module_la_CPPFLAGS = \
1753-I$(top_srcdir)/src/lib/eina \ 1593-I$(top_srcdir)/src/lib/eina \
1754-I$(top_builddir)/src/lib/eina \ 1594-I$(top_builddir)/src/lib/eina \
1755-I$(top_srcdir)/src/lib/eo \ 1595-I$(top_srcdir)/src/lib/eo \
1756-I$(top_builddir)/src/lib/eo \
1757-I$(top_srcdir)/src/lib/evas \ 1596-I$(top_srcdir)/src/lib/evas \
1758-I$(top_builddir)/src/lib/evas \
1759-I$(top_srcdir)/src/lib/evas/include \ 1597-I$(top_srcdir)/src/lib/evas/include \
1760-I$(top_builddir)/src/lib/evas/include \
1761-I$(top_srcdir)/src/lib/evas/cserve2 \ 1598-I$(top_srcdir)/src/lib/evas/cserve2 \
1762-I$(top_builddir)/src/lib/evas/cserve2 \
1763-I$(top_srcdir)/src/bin/evas \ 1599-I$(top_srcdir)/src/bin/evas \
1764-I$(top_builddir)/src/bin/evas \
1765@EFL_CFLAGS@ \ 1600@EFL_CFLAGS@ \
1766@EVAS_CFLAGS@ 1601@EVAS_CFLAGS@
1767bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm 1602bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm
@@ -1777,17 +1612,11 @@ bin_evas_loaders_eet_module_la_CPPFLAGS = \
1777-I$(top_srcdir)/src/lib/eina \ 1612-I$(top_srcdir)/src/lib/eina \
1778-I$(top_builddir)/src/lib/eina \ 1613-I$(top_builddir)/src/lib/eina \
1779-I$(top_srcdir)/src/lib/eo \ 1614-I$(top_srcdir)/src/lib/eo \
1780-I$(top_builddir)/src/lib/eo \
1781-I$(top_srcdir)/src/lib/eet \ 1615-I$(top_srcdir)/src/lib/eet \
1782-I$(top_builddir)/src/lib/eet \
1783-I$(top_srcdir)/src/lib/evas \ 1616-I$(top_srcdir)/src/lib/evas \
1784-I$(top_builddir)/src/lib/evas \
1785-I$(top_srcdir)/src/lib/evas/include \ 1617-I$(top_srcdir)/src/lib/evas/include \
1786-I$(top_builddir)/src/lib/evas/include \
1787-I$(top_srcdir)/src/lib/evas/cserve2 \ 1618-I$(top_srcdir)/src/lib/evas/cserve2 \
1788-I$(top_builddir)/src/lib/evas/cserve2 \
1789-I$(top_srcdir)/src/bin/evas \ 1619-I$(top_srcdir)/src/bin/evas \
1790-I$(top_builddir)/src/bin/evas \
1791@evas_image_loader_eet_cflags@ \ 1620@evas_image_loader_eet_cflags@ \
1792@EFL_CFLAGS@ \ 1621@EFL_CFLAGS@ \
1793@EVAS_CFLAGS@ 1622@EVAS_CFLAGS@
@@ -1806,15 +1635,10 @@ bin_evas_loaders_ico_module_la_CPPFLAGS = \
1806-I$(top_srcdir)/src/lib/eina \ 1635-I$(top_srcdir)/src/lib/eina \
1807-I$(top_builddir)/src/lib/eina \ 1636-I$(top_builddir)/src/lib/eina \
1808-I$(top_srcdir)/src/lib/eo \ 1637-I$(top_srcdir)/src/lib/eo \
1809-I$(top_builddir)/src/lib/eo \
1810-I$(top_srcdir)/src/lib/evas \ 1638-I$(top_srcdir)/src/lib/evas \
1811-I$(top_builddir)/src/lib/evas \
1812-I$(top_srcdir)/src/lib/evas/include \ 1639-I$(top_srcdir)/src/lib/evas/include \
1813-I$(top_builddir)/src/lib/evas/include \
1814-I$(top_srcdir)/src/lib/evas/cserve2 \ 1640-I$(top_srcdir)/src/lib/evas/cserve2 \
1815-I$(top_builddir)/src/lib/evas/cserve2 \
1816-I$(top_srcdir)/src/bin/evas \ 1641-I$(top_srcdir)/src/bin/evas \
1817-I$(top_builddir)/src/bin/evas \
1818@evas_image_loader_ico_cflags@ \ 1642@evas_image_loader_ico_cflags@ \
1819@EFL_CFLAGS@ \ 1643@EFL_CFLAGS@ \
1820@EVAS_CFLAGS@ 1644@EVAS_CFLAGS@
@@ -1831,15 +1655,10 @@ bin_evas_loaders_jpeg_module_la_CPPFLAGS = \
1831-I$(top_srcdir)/src/lib/eina \ 1655-I$(top_srcdir)/src/lib/eina \
1832-I$(top_builddir)/src/lib/eina \ 1656-I$(top_builddir)/src/lib/eina \
1833-I$(top_srcdir)/src/lib/eo \ 1657-I$(top_srcdir)/src/lib/eo \
1834-I$(top_builddir)/src/lib/eo \
1835-I$(top_srcdir)/src/lib/evas \ 1658-I$(top_srcdir)/src/lib/evas \
1836-I$(top_builddir)/src/lib/evas \
1837-I$(top_srcdir)/src/lib/evas/include \ 1659-I$(top_srcdir)/src/lib/evas/include \
1838-I$(top_builddir)/src/lib/evas/include \
1839-I$(top_srcdir)/src/lib/evas/cserve2 \ 1660-I$(top_srcdir)/src/lib/evas/cserve2 \
1840-I$(top_builddir)/src/lib/evas/cserve2 \
1841-I$(top_srcdir)/src/bin/evas \ 1661-I$(top_srcdir)/src/bin/evas \
1842-I$(top_builddir)/src/bin/evas \
1843@evas_image_loader_jpeg_cflags@ \ 1662@evas_image_loader_jpeg_cflags@ \
1844@EFL_CFLAGS@ \ 1663@EFL_CFLAGS@ \
1845@EVAS_CFLAGS@ 1664@EVAS_CFLAGS@
@@ -1856,15 +1675,10 @@ bin_evas_loaders_pmaps_module_la_CPPFLAGS = \
1856-I$(top_srcdir)/src/lib/eina \ 1675-I$(top_srcdir)/src/lib/eina \
1857-I$(top_builddir)/src/lib/eina \ 1676-I$(top_builddir)/src/lib/eina \
1858-I$(top_srcdir)/src/lib/eo \ 1677-I$(top_srcdir)/src/lib/eo \
1859-I$(top_builddir)/src/lib/eo \
1860-I$(top_srcdir)/src/lib/evas \ 1678-I$(top_srcdir)/src/lib/evas \
1861-I$(top_builddir)/src/lib/evas \
1862-I$(top_srcdir)/src/lib/evas/include \ 1679-I$(top_srcdir)/src/lib/evas/include \
1863-I$(top_builddir)/src/lib/evas/include \
1864-I$(top_srcdir)/src/lib/evas/cserve2 \ 1680-I$(top_srcdir)/src/lib/evas/cserve2 \
1865-I$(top_builddir)/src/lib/evas/cserve2 \
1866-I$(top_srcdir)/src/bin/evas \ 1681-I$(top_srcdir)/src/bin/evas \
1867-I$(top_builddir)/src/bin/evas \
1868@evas_image_loader_pmaps_cflags@ \ 1682@evas_image_loader_pmaps_cflags@ \
1869@EFL_CFLAGS@ \ 1683@EFL_CFLAGS@ \
1870@EVAS_CFLAGS@ 1684@EVAS_CFLAGS@
@@ -1881,15 +1695,10 @@ bin_evas_loaders_png_module_la_CPPFLAGS = \
1881-I$(top_srcdir)/src/lib/eina \ 1695-I$(top_srcdir)/src/lib/eina \
1882-I$(top_builddir)/src/lib/eina \ 1696-I$(top_builddir)/src/lib/eina \
1883-I$(top_srcdir)/src/lib/eo \ 1697-I$(top_srcdir)/src/lib/eo \
1884-I$(top_builddir)/src/lib/eo \
1885-I$(top_srcdir)/src/lib/evas \ 1698-I$(top_srcdir)/src/lib/evas \
1886-I$(top_builddir)/src/lib/evas \
1887-I$(top_srcdir)/src/lib/evas/include \ 1699-I$(top_srcdir)/src/lib/evas/include \
1888-I$(top_builddir)/src/lib/evas/include \
1889-I$(top_srcdir)/src/lib/evas/cserve2 \ 1700-I$(top_srcdir)/src/lib/evas/cserve2 \
1890-I$(top_builddir)/src/lib/evas/cserve2 \
1891-I$(top_srcdir)/src/bin/evas \ 1701-I$(top_srcdir)/src/bin/evas \
1892-I$(top_builddir)/src/bin/evas \
1893@evas_image_loader_png_cflags@ \ 1702@evas_image_loader_png_cflags@ \
1894@EFL_CFLAGS@ \ 1703@EFL_CFLAGS@ \
1895@EVAS_CFLAGS@ 1704@EVAS_CFLAGS@
@@ -1906,15 +1715,10 @@ bin_evas_loaders_psd_module_la_CPPFLAGS = \
1906-I$(top_srcdir)/src/lib/eina \ 1715-I$(top_srcdir)/src/lib/eina \
1907-I$(top_builddir)/src/lib/eina \ 1716-I$(top_builddir)/src/lib/eina \
1908-I$(top_srcdir)/src/lib/eo \ 1717-I$(top_srcdir)/src/lib/eo \
1909-I$(top_builddir)/src/lib/eo \
1910-I$(top_srcdir)/src/lib/evas \ 1718-I$(top_srcdir)/src/lib/evas \
1911-I$(top_builddir)/src/lib/evas \
1912-I$(top_srcdir)/src/lib/evas/include \ 1719-I$(top_srcdir)/src/lib/evas/include \
1913-I$(top_builddir)/src/lib/evas/include \
1914-I$(top_srcdir)/src/lib/evas/cserve2 \ 1720-I$(top_srcdir)/src/lib/evas/cserve2 \
1915-I$(top_builddir)/src/lib/evas/cserve2 \
1916-I$(top_srcdir)/src/bin/evas \ 1721-I$(top_srcdir)/src/bin/evas \
1917-I$(top_builddir)/src/bin/evas \
1918@evas_image_loader_psd_cflags@ \ 1722@evas_image_loader_psd_cflags@ \
1919@EFL_CFLAGS@ \ 1723@EFL_CFLAGS@ \
1920@EVAS_CFLAGS@ 1724@EVAS_CFLAGS@
@@ -1931,15 +1735,10 @@ bin_evas_loaders_tga_module_la_CPPFLAGS = \
1931-I$(top_srcdir)/src/lib/eina \ 1735-I$(top_srcdir)/src/lib/eina \
1932-I$(top_builddir)/src/lib/eina \ 1736-I$(top_builddir)/src/lib/eina \
1933-I$(top_srcdir)/src/lib/eo \ 1737-I$(top_srcdir)/src/lib/eo \
1934-I$(top_builddir)/src/lib/eo \
1935-I$(top_srcdir)/src/lib/evas \ 1738-I$(top_srcdir)/src/lib/evas \
1936-I$(top_builddir)/src/lib/evas \
1937-I$(top_srcdir)/src/lib/evas/include \ 1739-I$(top_srcdir)/src/lib/evas/include \
1938-I$(top_builddir)/src/lib/evas/include \
1939-I$(top_srcdir)/src/lib/evas/cserve2 \ 1740-I$(top_srcdir)/src/lib/evas/cserve2 \
1940-I$(top_builddir)/src/lib/evas/cserve2 \
1941-I$(top_srcdir)/src/bin/evas \ 1741-I$(top_srcdir)/src/bin/evas \
1942-I$(top_builddir)/src/bin/evas \
1943@evas_image_loader_tga_cflags@ \ 1742@evas_image_loader_tga_cflags@ \
1944@EFL_CFLAGS@ \ 1743@EFL_CFLAGS@ \
1945@EVAS_CFLAGS@ 1744@EVAS_CFLAGS@
@@ -1956,15 +1755,10 @@ bin_evas_loaders_tiff_module_la_CPPFLAGS = \
1956-I$(top_srcdir)/src/lib/eina \ 1755-I$(top_srcdir)/src/lib/eina \
1957-I$(top_builddir)/src/lib/eina \ 1756-I$(top_builddir)/src/lib/eina \
1958-I$(top_srcdir)/src/lib/eo \ 1757-I$(top_srcdir)/src/lib/eo \
1959-I$(top_builddir)/src/lib/eo \
1960-I$(top_srcdir)/src/lib/evas \ 1758-I$(top_srcdir)/src/lib/evas \
1961-I$(top_builddir)/src/lib/evas \
1962-I$(top_srcdir)/src/lib/evas/include \ 1759-I$(top_srcdir)/src/lib/evas/include \
1963-I$(top_builddir)/src/lib/evas/include \
1964-I$(top_srcdir)/src/lib/evas/cserve2 \ 1760-I$(top_srcdir)/src/lib/evas/cserve2 \
1965-I$(top_builddir)/src/lib/evas/cserve2 \
1966-I$(top_srcdir)/src/bin/evas \ 1761-I$(top_srcdir)/src/bin/evas \
1967-I$(top_builddir)/src/bin/evas \
1968@evas_image_loader_tiff_cflags@ \ 1762@evas_image_loader_tiff_cflags@ \
1969@EFL_CFLAGS@ \ 1763@EFL_CFLAGS@ \
1970@EVAS_CFLAGS@ 1764@EVAS_CFLAGS@
@@ -1981,15 +1775,10 @@ bin_evas_loaders_wbmp_module_la_CPPFLAGS = \
1981-I$(top_srcdir)/src/lib/eina \ 1775-I$(top_srcdir)/src/lib/eina \
1982-I$(top_builddir)/src/lib/eina \ 1776-I$(top_builddir)/src/lib/eina \
1983-I$(top_srcdir)/src/lib/eo \ 1777-I$(top_srcdir)/src/lib/eo \
1984-I$(top_builddir)/src/lib/eo \
1985-I$(top_srcdir)/src/lib/evas \ 1778-I$(top_srcdir)/src/lib/evas \
1986-I$(top_builddir)/src/lib/evas \
1987-I$(top_srcdir)/src/lib/evas/include \ 1779-I$(top_srcdir)/src/lib/evas/include \
1988-I$(top_builddir)/src/lib/evas/include \
1989-I$(top_srcdir)/src/lib/evas/cserve2 \ 1780-I$(top_srcdir)/src/lib/evas/cserve2 \
1990-I$(top_builddir)/src/lib/evas/cserve2 \
1991-I$(top_srcdir)/src/bin/evas \ 1781-I$(top_srcdir)/src/bin/evas \
1992-I$(top_builddir)/src/bin/evas \
1993@evas_image_loader_wbmp_cflags@ \ 1782@evas_image_loader_wbmp_cflags@ \
1994@EFL_CFLAGS@ \ 1783@EFL_CFLAGS@ \
1995@EVAS_CFLAGS@ 1784@EVAS_CFLAGS@
@@ -2006,15 +1795,10 @@ bin_evas_loaders_webp_module_la_CPPFLAGS = \
2006-I$(top_srcdir)/src/lib/eina \ 1795-I$(top_srcdir)/src/lib/eina \
2007-I$(top_builddir)/src/lib/eina \ 1796-I$(top_builddir)/src/lib/eina \
2008-I$(top_srcdir)/src/lib/eo \ 1797-I$(top_srcdir)/src/lib/eo \
2009-I$(top_builddir)/src/lib/eo \
2010-I$(top_srcdir)/src/lib/evas \ 1798-I$(top_srcdir)/src/lib/evas \
2011-I$(top_builddir)/src/lib/evas \
2012-I$(top_srcdir)/src/lib/evas/include \ 1799-I$(top_srcdir)/src/lib/evas/include \
2013-I$(top_builddir)/src/lib/evas/include \
2014-I$(top_srcdir)/src/lib/evas/cserve2 \ 1800-I$(top_srcdir)/src/lib/evas/cserve2 \
2015-I$(top_builddir)/src/lib/evas/cserve2 \
2016-I$(top_srcdir)/src/bin/evas \ 1801-I$(top_srcdir)/src/bin/evas \
2017-I$(top_builddir)/src/bin/evas \
2018@evas_image_loader_webp_cflags@ \ 1802@evas_image_loader_webp_cflags@ \
2019@EFL_CFLAGS@ \ 1803@EFL_CFLAGS@ \
2020@EVAS_CFLAGS@ 1804@EVAS_CFLAGS@
@@ -2031,15 +1815,10 @@ bin_evas_loaders_xpm_module_la_CPPFLAGS = \
2031-I$(top_srcdir)/src/lib/eina \ 1815-I$(top_srcdir)/src/lib/eina \
2032-I$(top_builddir)/src/lib/eina \ 1816-I$(top_builddir)/src/lib/eina \
2033-I$(top_srcdir)/src/lib/eo \ 1817-I$(top_srcdir)/src/lib/eo \
2034-I$(top_builddir)/src/lib/eo \
2035-I$(top_srcdir)/src/lib/evas \ 1818-I$(top_srcdir)/src/lib/evas \
2036-I$(top_builddir)/src/lib/evas \
2037-I$(top_srcdir)/src/lib/evas/include \ 1819-I$(top_srcdir)/src/lib/evas/include \
2038-I$(top_builddir)/src/lib/evas/include \
2039-I$(top_srcdir)/src/lib/evas/cserve2 \ 1820-I$(top_srcdir)/src/lib/evas/cserve2 \
2040-I$(top_builddir)/src/lib/evas/cserve2 \
2041-I$(top_srcdir)/src/bin/evas \ 1821-I$(top_srcdir)/src/bin/evas \
2042-I$(top_builddir)/src/bin/evas \
2043@evas_image_loader_xpm_cflags@ \ 1822@evas_image_loader_xpm_cflags@ \
2044@EFL_CFLAGS@ \ 1823@EFL_CFLAGS@ \
2045@EVAS_CFLAGS@ 1824@EVAS_CFLAGS@
@@ -2067,11 +1846,9 @@ tests/evas/evas_suite.h
2067 1846
2068tests_evas_evas_suite_CPPFLAGS = \ 1847tests_evas_evas_suite_CPPFLAGS = \
2069-I$(top_srcdir)/src/lib/eina \ 1848-I$(top_srcdir)/src/lib/eina \
1849-I$(top_builddir)/src/lib/eina \
2070-I$(top_srcdir)/src/lib/eo \ 1850-I$(top_srcdir)/src/lib/eo \
2071-I$(top_srcdir)/src/lib/evas \ 1851-I$(top_srcdir)/src/lib/evas \
2072-I$(top_builddir)/src/lib/eina \
2073-I$(top_builddir)/src/lib/eo \
2074-I$(top_builddir)/src/lib/evas \
2075@CHECK_CFLAGS@ \ 1852@CHECK_CFLAGS@ \
2076@EVAS_CFLAGS@ 1853@EVAS_CFLAGS@
2077 1854
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 531f5b0..bd4e53c 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -96,7 +96,6 @@ endif
96 96
97lib_evil_libevil_la_CPPFLAGS = \ 97lib_evil_libevil_la_CPPFLAGS = \
98-I$(top_srcdir)/src/lib/evil \ 98-I$(top_srcdir)/src/lib/evil \
99-I$(top_builddir)/src/lib/evil \
100@EVIL_CPPFLAGS@ 99@EVIL_CPPFLAGS@
101lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ 100lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@
102lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ 101lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
@@ -113,7 +112,6 @@ lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
113 112
114lib_evil_libdl_la_CPPFLAGS = \ 113lib_evil_libdl_la_CPPFLAGS = \
115-I$(top_srcdir)/src/lib/evil \ 114-I$(top_srcdir)/src/lib/evil \
116-I$(top_builddir)/src/lib/evil \
117@EVIL_DLFCN_CPPFLAGS@ 115@EVIL_DLFCN_CPPFLAGS@
118 116
119lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@ 117lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
@@ -160,14 +158,12 @@ endif
160 158
161bin_evil_evil_suite_CPPFLAGS = \ 159bin_evil_evil_suite_CPPFLAGS = \
162-I$(top_srcdir)/src/lib/evil \ 160-I$(top_srcdir)/src/lib/evil \
163-I$(top_builddir)/src/lib/evil \
164@EFL_CFLAGS@ \ 161@EFL_CFLAGS@ \
165@EVIL_CPPFLAGS@ 162@EVIL_CPPFLAGS@
166 163
167if HAVE_WINDOWS 164if HAVE_WINDOWS
168bin_evil_evil_suite_CPPFLAGS += \ 165bin_evil_evil_suite_CPPFLAGS += \
169-I$(top_srcdir)/src/lib/evil \ 166-I$(top_srcdir)/src/lib/evil
170-I$(top_builddir)/src/lib/evil
171endif 167endif
172 168
173bin_evil_evil_suite_LDADD = \ 169bin_evil_evil_suite_LDADD = \