summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-12-18 15:41:06 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-12-18 15:41:06 +0000
commit7470edfa5a0c53a0c71184fb31eccb27817f5e62 (patch)
treef0a9af76405aea169140d66178ae7cc754cc30a1
parent7b944729bb0c3f375407e54fb3bffb9281f1fced (diff)
sorry vincent. i know you dont like thus, but with this commit efl
tree simply is broken and doesnt compile. error here: ... src/Makefile_Evas.am:1809: unterminated conditionals: HAVE_WINDOWS_TRUE src/Makefile.am:24: src/Makefile_Evas.am' included from here src/Makefile.am:128: unterminated conditionals: HAVE_WINDOWS_TRUE src/Makefile.am: installing ./depcomp' automake: #################### automake: ## Internal Error ## automake: #################### automake: undefined condition TRUE' for RECURSIVE_TARGETS' automake: RECURSIVE_TARGETS: automake: { automake: HAVE_WINDOWS => { automake: type: += automake: where: /usr/share/automake-1.11/am/texinfos.am: automake: comment: automake: value: dvi-recursive html-recursive info-recursive pdf-recursive ps-recursive \ automake: install-dvi-recursive \ automake: install-html-recursive \ automake: install-info-recursive \ automake: install-pdf-recursive \ automake: install-ps-recursive all-recursive check-recursive installcheck-recursive automake: owner: Automake automake: } automake: } automake: automake: Please contact <bug-automake@gnu.org>. at /usr/share/automake-1.11/Automake/Channels.pm line 657 Automake::Channels::msg('automake', '', 'undefined condition TRUE\' for RECURSIVE_TARGETS\'\x{a}RECURSIV...') called at /usr/share/automake-1.11/Automake/ChannelDefs.pm line 208 Automake::ChannelDefs::prog_error('undefined condition TRUE\' for RECURSIVE_TARGETS\'\x{a}RECURSIV...') called at /usr/share/automake-1.11/Automake/Item.pm line 94 Automake::Item::rdef('Automake::Variable=HASH(0x38cbe20)', 'Automake::Condition=HASH(0x2832a48)') called at /usr/bin/automake line 4102 Automake::handle_subdirs() called at /usr/bin/automake line 8305 Automake::generate_makefile('src/Makefile.am', 'src/Makefile.in') called at /usr/bin/automake line 8602 Automake::handle_makefile('src/Makefile.in') called at /usr/bin/automake line 8616 Automake::handle_makefiles_serial() called at /usr/bin/automake line 8769 autoreconf: automake failed with exit status: 255 ... i looked at the HAVE_WINDOWS if's and it seems fine to me - i couldnt find what was missing, so i had to resort to a revert instead of fix :( sorry :( SVN revision: 81267
-rw-r--r--src/Makefile_Ecore.am16
-rw-r--r--src/Makefile_Ecore_Audio.am4
-rw-r--r--src/Makefile_Ecore_Cocoa.am5
-rw-r--r--src/Makefile_Ecore_Con.am8
-rw-r--r--src/Makefile_Ecore_Evas.am29
-rw-r--r--src/Makefile_Ecore_FB.am5
-rw-r--r--src/Makefile_Ecore_File.am5
-rw-r--r--src/Makefile_Ecore_Imf.am30
-rw-r--r--src/Makefile_Ecore_Input.am10
-rw-r--r--src/Makefile_Ecore_Ipc.am5
-rw-r--r--src/Makefile_Ecore_Psl1ght.am5
-rw-r--r--src/Makefile_Ecore_SDL.am5
-rw-r--r--src/Makefile_Ecore_Wayland.am5
-rw-r--r--src/Makefile_Ecore_Win32.am6
-rw-r--r--src/Makefile_Ecore_WinCE.am6
-rw-r--r--src/Makefile_Ecore_X.am5
-rw-r--r--src/Makefile_Eet.am13
-rw-r--r--src/Makefile_Eina.am10
-rw-r--r--src/Makefile_Eio.am5
-rw-r--r--src/Makefile_Embryo.am9
-rw-r--r--src/Makefile_Eo.am21
-rw-r--r--src/Makefile_Escape.am3
-rw-r--r--src/Makefile_Evas.am284
-rw-r--r--src/Makefile_Evil.am2
24 files changed, 480 insertions, 16 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 7e00c3e..3e7684a 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -51,6 +51,9 @@ lib_ecore_libecore_la_CPPFLAGS = \
51-I$(top_srcdir)/src/lib/eina \ 51-I$(top_srcdir)/src/lib/eina \
52-I$(top_srcdir)/src/lib/eo \ 52-I$(top_srcdir)/src/lib/eo \
53-I$(top_srcdir)/src/lib/ecore \ 53-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 \
54-DEFL_ECORE_BUILD \ 57-DEFL_ECORE_BUILD \
55@EFL_CFLAGS@ \ 58@EFL_CFLAGS@ \
56@EFL_COV_CFLAGS@ \ 59@EFL_COV_CFLAGS@ \
@@ -58,12 +61,14 @@ lib_ecore_libecore_la_CPPFLAGS = \
58 61
59if HAVE_WINDOWS 62if HAVE_WINDOWS
60lib_ecore_libecore_la_CPPFLAGS += \ 63lib_ecore_libecore_la_CPPFLAGS += \
61-I$(top_srcdir)/src/lib/evil 64-I$(top_srcdir)/src/lib/evil \
65-I$(top_builddir)/src/lib/evil
62endif 66endif
63 67
64if HAVE_PS3 68if HAVE_PS3
65lib_ecore_libecore_la_CPPFLAGS += \ 69lib_ecore_libecore_la_CPPFLAGS += \
66-I$(top_srcdir)/src/lib/escape 70-I$(top_srcdir)/src/lib/escape \
71-I$(top_builddir)/src/lib/escape
67endif 72endif
68 73
69lib_ecore_libecore_la_LIBADD = \ 74lib_ecore_libecore_la_LIBADD = \
@@ -103,6 +108,13 @@ tests_ecore_ecore_suite_CPPFLAGS = \
103-I$(top_srcdir)/src/lib/ecore_con \ 108-I$(top_srcdir)/src/lib/ecore_con \
104-I$(top_srcdir)/src/lib/ecore_file \ 109-I$(top_srcdir)/src/lib/ecore_file \
105-I$(top_srcdir)/src/lib/ecore_x \ 110-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 \
106-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 118-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
107@CHECK_CFLAGS@ 119@CHECK_CFLAGS@
108 120
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 7b21158..7862ad9 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -21,6 +21,10 @@ lib_ecore_audio_libecore_audio_la_CPPFLAGS = \
21-I$(top_srcdir)/src/lib/eo \ 21-I$(top_srcdir)/src/lib/eo \
22-I$(top_srcdir)/src/lib/eet \ 22-I$(top_srcdir)/src/lib/eet \
23-I$(top_srcdir)/src/lib/ecore \ 23-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 \
24-DEFL_ECORE_AUDIO_BUILD \ 28-DEFL_ECORE_AUDIO_BUILD \
25@EFL_CFLAGS@ \ 29@EFL_CFLAGS@ \
26@EFL_COV_CFLAGS@ \ 30@EFL_COV_CFLAGS@ \
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index 6229130..f7f8291 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -19,6 +19,11 @@ lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \
19-I$(top_srcdir)/src/lib/ecore \ 19-I$(top_srcdir)/src/lib/ecore \
20-I$(top_srcdir)/src/lib/ecore_input \ 20-I$(top_srcdir)/src/lib/ecore_input \
21-I$(top_srcdir)/src/lib/ecore_cocoa \ 21-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 \
22@EFL_CFLAGS@ \ 27@EFL_CFLAGS@ \
23@EFL_COV_CFLAGS@ 28@EFL_COV_CFLAGS@
24 29
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 72bf9b8..f2e6ee8 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -39,6 +39,11 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \
39-I$(top_srcdir)/src/lib/eet \ 39-I$(top_srcdir)/src/lib/eet \
40-I$(top_srcdir)/src/lib/ecore \ 40-I$(top_srcdir)/src/lib/ecore \
41-I$(top_srcdir)/src/lib/ecore_con \ 41-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 \
42-DEFL_ECORE_CON_BUILD \ 47-DEFL_ECORE_CON_BUILD \
43@EFL_CFLAGS@ \ 48@EFL_CFLAGS@ \
44@EFL_COV_CFLAGS@ \ 49@EFL_COV_CFLAGS@ \
@@ -46,7 +51,8 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \
46 51
47if HAVE_WINDOWS 52if HAVE_WINDOWS
48lib_ecore_con_libecore_con_la_CPPFLAGS += \ 53lib_ecore_con_libecore_con_la_CPPFLAGS += \
49-I$(top_srcdir)/src/lib/evil 54-I$(top_srcdir)/src/lib/evil \
55-I$(top_builddir)/src/lib/evil
50endif 56endif
51 57
52lib_ecore_con_libecore_con_la_LIBADD = \ 58lib_ecore_con_libecore_con_la_LIBADD = \
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 6f437df..f0f5aa8 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -26,6 +26,15 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/ecore_input_evas \ 26-I$(top_srcdir)/src/lib/ecore_input_evas \
27-I$(top_srcdir)/src/lib/ecore_evas \ 27-I$(top_srcdir)/src/lib/ecore_evas \
28-I$(top_srcdir)/src/modules/evas/engines/buffer \ 28-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 \
29-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 38-DPACKAGE_LIB_DIR=\"$(libdir)\" \
30-DEFL_ECORE_EVAS_BUILD \ 39-DEFL_ECORE_EVAS_BUILD \
31@EFL_CFLAGS@ \ 40@EFL_CFLAGS@ \
@@ -33,7 +42,8 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
33 42
34if HAVE_WINDOWS 43if HAVE_WINDOWS
35lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ 44lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
36-I$(top_srcdir)/src/lib/evil 45-I$(top_srcdir)/src/lib/evil \
46-I$(top_builddir)/src/lib/evil
37endif 47endif
38 48
39lib_ecore_evas_libecore_evas_la_LIBADD = \ 49lib_ecore_evas_libecore_evas_la_LIBADD = \
@@ -76,6 +86,9 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
76-I$(top_srcdir)/src/lib/ecore_x \ 86-I$(top_srcdir)/src/lib/ecore_x \
77-I$(top_srcdir)/src/modules/evas/engines/software_x11 \ 87-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
78-I$(top_srcdir)/src/modules/evas/engines/gl_x11 \ 88-I$(top_srcdir)/src/modules/evas/engines/gl_x11 \
89-I$(top_builddir)/src/lib/ecore_x \
90-I$(top_builddir)/src/modules/evas/engines/software_x11 \
91-I$(top_builddir)/src/modules/evas/engines/gl_x11
79modules_ecore_evas_engines_x_module_la_LIBADD = \ 92modules_ecore_evas_engines_x_module_la_LIBADD = \
80lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 93lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
81lib/ecore_x/libecore_x.la 94lib/ecore_x/libecore_x.la
@@ -92,6 +105,8 @@ modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \
92$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 105$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
93-I$(top_srcdir)/src/lib/ecore_cocoa \ 106-I$(top_srcdir)/src/lib/ecore_cocoa \
94-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa \ 107-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
95modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ 110modules_ecore_evas_engines_cocoa_module_la_LIBADD = \
96lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 111lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
97lib/ecore_cocoa/libecore_cocoa.la 112lib/ecore_cocoa/libecore_cocoa.la
@@ -108,6 +123,8 @@ modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \
108$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 123$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
109-I$(top_srcdir)/src/lib/ecore_fb \ 124-I$(top_srcdir)/src/lib/ecore_fb \
110-I$(top_srcdir)/src/modules/evas/engines/fb \ 125-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
111modules_ecore_evas_engines_fb_module_la_LIBADD = \ 128modules_ecore_evas_engines_fb_module_la_LIBADD = \
112lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 129lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
113lib/ecore_fb/libecore_fb.la 130lib/ecore_fb/libecore_fb.la
@@ -124,6 +141,8 @@ modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \
124$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 141$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
125-I$(top_srcdir)/src/lib/ecore_psl1ght \ 142-I$(top_srcdir)/src/lib/ecore_psl1ght \
126-I$(top_srcdir)/src/modules/evas/engines/psl1ght \ 143-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
127modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ 146modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \
128lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 147lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
129lib/ecore_psl1ght/libecore_psl1ght.la 148lib/ecore_psl1ght/libecore_psl1ght.la
@@ -145,6 +164,9 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
145-I$(top_srcdir)/src/lib/ecore_wayland \ 164-I$(top_srcdir)/src/lib/ecore_wayland \
146-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \ 165-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
147-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ 166-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 \
148@ECORE_WAYLAND_CFLAGS@ 170@ECORE_WAYLAND_CFLAGS@
149modules_ecore_evas_engines_wayland_module_la_LIBADD = \ 171modules_ecore_evas_engines_wayland_module_la_LIBADD = \
150lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 172lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
@@ -163,6 +185,8 @@ modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \
163$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 185$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
164-I$(top_srcdir)/src/lib/ecore_sdl \ 186-I$(top_srcdir)/src/lib/ecore_sdl \
165-I$(top_srcdir)/src/modules/evas/engines/gl_sdl \ 187-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
166modules_ecore_evas_engines_sdl_module_la_LIBADD = \ 190modules_ecore_evas_engines_sdl_module_la_LIBADD = \
167lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 191lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
168lib/ecore_sdl/libecore_sdl.la 192lib/ecore_sdl/libecore_sdl.la
@@ -181,6 +205,9 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
181-I$(top_srcdir)/src/lib/ecore_win32 \ 205-I$(top_srcdir)/src/lib/ecore_win32 \
182-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ 206-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
183-I$(top_srcdir)/src/modules/evas/engines/software_gdi \ 207-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
184modules_ecore_evas_engines_win32_module_la_LIBADD = \ 211modules_ecore_evas_engines_win32_module_la_LIBADD = \
185lib/ecore/libeecore_evas.la @EFL_LIBS@ \ 212lib/ecore/libeecore_evas.la @EFL_LIBS@ \
186lib/ecore_win32/libecore_win32.la 213lib/ecore_win32/libecore_win32.la
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index 8944546..97748f8 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -24,6 +24,11 @@ lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
24-I$(top_srcdir)/src/lib/ecore \ 24-I$(top_srcdir)/src/lib/ecore \
25-I$(top_srcdir)/src/lib/ecore_input \ 25-I$(top_srcdir)/src/lib/ecore_input \
26-I$(top_srcdir)/src/lib/ecore_fb \ 26-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 \
27@EFL_CFLAGS@ \ 32@EFL_CFLAGS@ \
28@EFL_COV_CFLAGS@ \ 33@EFL_COV_CFLAGS@ \
29@ECORE_FB_CFLAGS@ 34@ECORE_FB_CFLAGS@
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index 145a716..cd98246 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -33,6 +33,11 @@ lib_ecore_file_libecore_file_la_CPPFLAGS = \
33-I$(top_srcdir)/src/lib/ecore \ 33-I$(top_srcdir)/src/lib/ecore \
34-I$(top_srcdir)/src/lib/ecore_con \ 34-I$(top_srcdir)/src/lib/ecore_con \
35-I$(top_srcdir)/src/lib/ecore_file \ 35-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 \
36-DEFL_ECORE_FILE_BUILD \ 41-DEFL_ECORE_FILE_BUILD \
37@EFL_CFLAGS@ \ 42@EFL_CFLAGS@ \
38@EFL_COV_CFLAGS@ 43@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index d140793..5634b90 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -20,6 +20,10 @@ lib_ecore_imf_libecore_imf_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eo \ 20-I$(top_srcdir)/src/lib/eo \
21-I$(top_srcdir)/src/lib/ecore \ 21-I$(top_srcdir)/src/lib/ecore \
22-I$(top_srcdir)/src/lib/ecore_imf \ 22-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 \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 27-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DEFL_ECORE_IMF_BUILD \ 28-DEFL_ECORE_IMF_BUILD \
25@EFL_CFLAGS@ \ 29@EFL_CFLAGS@ \
@@ -46,6 +50,12 @@ lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \
46-I$(top_srcdir)/src/lib/ecore \ 50-I$(top_srcdir)/src/lib/ecore \
47-I$(top_srcdir)/src/lib/ecore_imf \ 51-I$(top_srcdir)/src/lib/ecore_imf \
48-I$(top_srcdir)/src/lib/ecore_imf_evas \ 52-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 \
49-DEFL_ECORE_IMF_EVAS_BUILD \ 59-DEFL_ECORE_IMF_EVAS_BUILD \
50@EFL_CFLAGS@ \ 60@EFL_CFLAGS@ \
51@EFL_COV_CFLAGS@ 61@EFL_COV_CFLAGS@
@@ -80,6 +90,13 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
80-I$(top_srcdir)/src/lib/ecore_imf \ 90-I$(top_srcdir)/src/lib/ecore_imf \
81-I$(top_srcdir)/src/lib/ecore_evas \ 91-I$(top_srcdir)/src/lib/ecore_evas \
82-I$(top_srcdir)/src/lib/evas \ 92-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 \
83-DEFL_ECORE_IMF_EVAS_BUILD \ 100-DEFL_ECORE_IMF_EVAS_BUILD \
84@EFL_CFLAGS@ \ 101@EFL_CFLAGS@ \
85@EFL_COV_CFLAGS@ \ 102@EFL_COV_CFLAGS@ \
@@ -114,6 +131,13 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
114-I$(top_srcdir)/src/lib/ecore_imf \ 131-I$(top_srcdir)/src/lib/ecore_imf \
115-I$(top_srcdir)/src/lib/ecore_evas \ 132-I$(top_srcdir)/src/lib/ecore_evas \
116-I$(top_srcdir)/src/lib/evas \ 133-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 \
117-DEFL_ECORE_IMF_EVAS_BUILD \ 141-DEFL_ECORE_IMF_EVAS_BUILD \
118@EFL_CFLAGS@ \ 142@EFL_CFLAGS@ \
119@EFL_COV_CFLAGS@ \ 143@EFL_COV_CFLAGS@ \
@@ -144,6 +168,12 @@ modules_ecore_immodules_xim_xim_la_CPPFLAGS = \
144-I$(top_srcdir)/src/lib/ecore_input \ 168-I$(top_srcdir)/src/lib/ecore_input \
145-I$(top_srcdir)/src/lib/ecore_x \ 169-I$(top_srcdir)/src/lib/ecore_x \
146-I$(top_srcdir)/src/lib/ecore_imf \ 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 \
176-I$(top_builddir)/src/lib/ecore_imf \
147-DEFL_ECORE_IMF_EVAS_BUILD \ 177-DEFL_ECORE_IMF_EVAS_BUILD \
148@EFL_CFLAGS@ \ 178@EFL_CFLAGS@ \
149@EFL_COV_CFLAGS@ 179@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index 33eda3d..e199380 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -20,6 +20,10 @@ lib_ecore_input_libecore_input_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eo \ 20-I$(top_srcdir)/src/lib/eo \
21-I$(top_srcdir)/src/lib/ecore \ 21-I$(top_srcdir)/src/lib/ecore \
22-I$(top_srcdir)/src/lib/ecore_input \ 22-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 \
23-DEFL_ECORE_INPUT_BUILD \ 27-DEFL_ECORE_INPUT_BUILD \
24@EFL_CFLAGS@ \ 28@EFL_CFLAGS@ \
25@EFL_COV_CFLAGS@ 29@EFL_COV_CFLAGS@
@@ -48,6 +52,12 @@ lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \
48-I$(top_srcdir)/src/lib/ecore \ 52-I$(top_srcdir)/src/lib/ecore \
49-I$(top_srcdir)/src/lib/ecore_input \ 53-I$(top_srcdir)/src/lib/ecore_input \
50-I$(top_srcdir)/src/lib/ecore_input_evas \ 54-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 \
51-DEFL_ECORE_INPUT_EVAS_BUILD \ 61-DEFL_ECORE_INPUT_EVAS_BUILD \
52@EFL_CFLAGS@ \ 62@EFL_CFLAGS@ \
53@EFL_COV_CFLAGS@ 63@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 08f2bab..ba09f37 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -17,6 +17,11 @@ lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \
17-I$(top_srcdir)/src/lib/ecore \ 17-I$(top_srcdir)/src/lib/ecore \
18-I$(top_srcdir)/src/lib/ecore_con \ 18-I$(top_srcdir)/src/lib/ecore_con \
19-I$(top_srcdir)/src/lib/ecore_ipc \ 19-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 \
20-DEFL_ECORE_IPC_BUILD \ 25-DEFL_ECORE_IPC_BUILD \
21@EFL_CFLAGS@ \ 26@EFL_CFLAGS@ \
22@EFL_COV_CFLAGS@ 27@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index f06baaf..9ac146c 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -20,6 +20,11 @@ lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/ecore \ 20-I$(top_srcdir)/src/lib/ecore \
21-I$(top_srcdir)/src/lib/ecore_input \ 21-I$(top_srcdir)/src/lib/ecore_input \
22-I$(top_srcdir)/src/lib/ecore_psl1ght \ 22-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 \
23-DEFL_ECORE_PSL1GHT_BUILD \ 28-DEFL_ECORE_PSL1GHT_BUILD \
24@EFL_CFLAGS@ \ 29@EFL_CFLAGS@ \
25@EFL_COV_CFLAGS@ 30@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index dc592b3..62e7a10 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -18,6 +18,11 @@ lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \
18-I$(top_srcdir)/src/lib/ecore \ 18-I$(top_srcdir)/src/lib/ecore \
19-I$(top_srcdir)/src/lib/ecore_input \ 19-I$(top_srcdir)/src/lib/ecore_input \
20-I$(top_srcdir)/src/lib/ecore_sdl \ 20-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 \
21-DEFL_ECORE_SDL_BUILD \ 26-DEFL_ECORE_SDL_BUILD \
22@EFL_CFLAGS@ \ 27@EFL_CFLAGS@ \
23@EFL_COV_CFLAGS@ \ 28@EFL_COV_CFLAGS@ \
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index 220da2a..696342f 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -21,6 +21,11 @@ lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \
21-I$(top_srcdir)/src/lib/ecore \ 21-I$(top_srcdir)/src/lib/ecore \
22-I$(top_srcdir)/src/lib/ecore_input \ 22-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_srcdir)/src/lib/ecore_wayland \ 23-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 \
24@EFL_CFLAGS@ \ 29@EFL_CFLAGS@ \
25@EFL_COV_CFLAGS@ \ 30@EFL_COV_CFLAGS@ \
26@ECORE_WAYLAND_CFLAGS@ 31@ECORE_WAYLAND_CFLAGS@
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index 6183155..2491ca5 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -30,6 +30,12 @@ lib_ecore_win32_libecore_win32_la_CPPFLAGS = \
30-I$(top_srcdir)/src/lib/ecore \ 30-I$(top_srcdir)/src/lib/ecore \
31-I$(top_srcdir)/src/lib/ecore_input \ 31-I$(top_srcdir)/src/lib/ecore_input \
32-I$(top_srcdir)/src/lib/ecore_win32 \ 32-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 \
33-DEFL_ECORE_WIN32_BUILD \ 39-DEFL_ECORE_WIN32_BUILD \
34@EFL_CFLAGS@ \ 40@EFL_CFLAGS@ \
35@EFL_COV_CFLAGS@ 41@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 3f73c64..7bf5264 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -20,6 +20,12 @@ lib_ecore_wince_libecore_wince_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/ecore \ 20-I$(top_srcdir)/src/lib/ecore \
21-I$(top_srcdir)/src/lib/ecore_input \ 21-I$(top_srcdir)/src/lib/ecore_input \
22-I$(top_srcdir)/src/lib/ecore_wince \ 22-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 \
23-DEFL_ECORE_WINCE_BUILD \ 29-DEFL_ECORE_WINCE_BUILD \
24@EFL_CFLAGS@ \ 30@EFL_CFLAGS@ \
25@EFL_COV_CFLAGS@ 31@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index ae53091..d5e1979 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -101,6 +101,11 @@ lib_ecore_x_libecore_x_la_CPPFLAGS = \
101-I$(top_srcdir)/src/lib/ecore \ 101-I$(top_srcdir)/src/lib/ecore \
102-I$(top_srcdir)/src/lib/ecore_input \ 102-I$(top_srcdir)/src/lib/ecore_input \
103-I$(top_srcdir)/src/lib/ecore_x \ 103-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 \
104-DEFL_ECORE_X_BUILD \ 109-DEFL_ECORE_X_BUILD \
105@EFL_CFLAGS@ \ 110@EFL_CFLAGS@ \
106@EFL_COV_CFLAGS@ \ 111@EFL_COV_CFLAGS@ \
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 44fbfe9..79d9a62 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -26,6 +26,9 @@ lib_eet_libeet_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/eina \ 26-I$(top_srcdir)/src/lib/eina \
27-I$(top_srcdir)/src/lib/eet \ 27-I$(top_srcdir)/src/lib/eet \
28-I$(top_srcdir)/src/static_libs/lz4 \ 28-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 \
29-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 32-DPACKAGE_BIN_DIR=\"$(bindir)\" \
30-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 33-DPACKAGE_LIB_DIR=\"$(libdir)\" \
31-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 34-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@@ -36,7 +39,8 @@ lib_eet_libeet_la_CPPFLAGS = \
36 39
37if HAVE_WINDOWS 40if HAVE_WINDOWS
38lib_eet_libeet_la_CPPFLAGS += \ 41lib_eet_libeet_la_CPPFLAGS += \
39-I$(top_srcdir)/src/lib/evil 42-I$(top_srcdir)/src/lib/evil \
43-I$(top_builddir)/src/lib/evil
40endif 44endif
41 45
42lib_eet_libeet_la_LIBADD = lib/eina/libeina.la 46lib_eet_libeet_la_LIBADD = lib/eina/libeina.la
@@ -60,6 +64,8 @@ bin_eet_eet_SOURCES = bin/eet/eet_main.c
60bin_eet_eet_CPPFLAGS = \ 64bin_eet_eet_CPPFLAGS = \
61-I$(top_srcdir)/src/lib/eina \ 65-I$(top_srcdir)/src/lib/eina \
62-I$(top_srcdir)/src/lib/eet \ 66-I$(top_srcdir)/src/lib/eet \
67-I$(top_builddir)/src/lib/eina \
68-I$(top_builddir)/src/lib/eet \
63-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 69-DPACKAGE_BIN_DIR=\"$(bindir)\" \
64-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 70-DPACKAGE_LIB_DIR=\"$(libdir)\" \
65-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 71-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@@ -69,7 +75,8 @@ bin_eet_eet_CPPFLAGS = \
69 75
70if HAVE_WINDOWS 76if HAVE_WINDOWS
71bin_eet_eet_CPPFLAGS += \ 77bin_eet_eet_CPPFLAGS += \
72-I$(top_srcdir)/src/lib/evil 78-I$(top_srcdir)/src/lib/evil \
79-I$(top_builddir)/src/lib/evil
73endif 80endif
74 81
75bin_eet_eet_LDADD = \ 82bin_eet_eet_LDADD = \
@@ -96,6 +103,8 @@ tests/eet/eet_suite.h
96tests_eet_eet_suite_CPPFLAGS = \ 103tests_eet_eet_suite_CPPFLAGS = \
97-I$(top_srcdir)/src/lib/eina \ 104-I$(top_srcdir)/src/lib/eina \
98-I$(top_srcdir)/src/lib/eet \ 105-I$(top_srcdir)/src/lib/eet \
106-I$(top_builddir)/src/lib/eina \
107-I$(top_builddir)/src/lib/eet \
99-DTESTS_SRC_DIR=\"$(top_srcdir)\" \ 108-DTESTS_SRC_DIR=\"$(top_srcdir)\" \
100@CHECK_CFLAGS@ \ 109@CHECK_CFLAGS@ \
101@EET_CFLAGS@ 110@EET_CFLAGS@
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index c8b0af4..d3f5738 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -159,6 +159,7 @@ einampchainedpool_LTLIBRARIES = chained_pool_module.la
159 159
160chained_pool_module_la_CPPFLAGS = \ 160chained_pool_module_la_CPPFLAGS = \
161-I$(top_srcdir)/src/lib/eina \ 161-I$(top_srcdir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eina \
162-DEFL_EINA_BUILD 163-DEFL_EINA_BUILD
163chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ 164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
164chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -175,6 +176,7 @@ einamponebig_LTLIBRARIES = one_big_module.la
175 176
176one_big_module_la_CPPFLAGS = \ 177one_big_module_la_CPPFLAGS = \
177-I$(top_srcdir)/src/lib/eina \ 178-I$(top_srcdir)/src/lib/eina \
179-I$(top_builddir)/src/lib/eina \
178-DEFL_EINA_BUILD 180-DEFL_EINA_BUILD
179one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ 181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
180one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -191,6 +193,7 @@ einamppassthrough_LTLIBRARIES = pass_through_module.la
191 193
192pass_through_module_la_CPPFLAGS = \ 194pass_through_module_la_CPPFLAGS = \
193-I$(top_srcdir)/src/lib/eina \ 195-I$(top_srcdir)/src/lib/eina \
196-I$(top_builddir)/src/lib/eina \
194-DEFL_EINA_BUILD 197-DEFL_EINA_BUILD
195pass_through_module_la_CFLAGS = @EINA_CFLAGS@ 198pass_through_module_la_CFLAGS = @EINA_CFLAGS@
196pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 199pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -201,6 +204,7 @@ endif
201 204
202lib_eina_libeina_la_CPPFLAGS = \ 205lib_eina_libeina_la_CPPFLAGS = \
203-I$(top_srcdir)/src/lib/eina \ 206-I$(top_srcdir)/src/lib/eina \
207-I$(top_builddir)/src/lib/eina \
204-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 208-DPACKAGE_BIN_DIR=\"$(bindir)\" \
205-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 209-DPACKAGE_LIB_DIR=\"$(libdir)\" \
206-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 210-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@@ -212,7 +216,8 @@ lib_eina_libeina_la_CPPFLAGS = \
212 216
213if HAVE_WINDOWS 217if HAVE_WINDOWS
214lib_eina_libeina_la_CPPFLAGS += \ 218lib_eina_libeina_la_CPPFLAGS += \
215-I$(top_srcdir)/src/lib/evil 219-I$(top_srcdir)/src/lib/evil \
220-I$(top_builddir)/src/lib/evil
216endif 221endif
217 222
218lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ 223lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@
@@ -279,6 +284,7 @@ tests/eina/eina_test_value.c
279 284
280tests_eina_eina_suite_CPPFLAGS = \ 285tests_eina_eina_suite_CPPFLAGS = \
281-I$(top_srcdir)/src/lib/eina \ 286-I$(top_srcdir)/src/lib/eina \
287-I$(top_builddir)/src/lib/eina \
282-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ 288-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
283@CHECK_CFLAGS@ \ 289@CHECK_CFLAGS@ \
284@EINA_CFLAGS@ 290@EINA_CFLAGS@
@@ -293,6 +299,7 @@ tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
293 299
294tests_eina_cxx_compile_test_CPPFLAGS = \ 300tests_eina_cxx_compile_test_CPPFLAGS = \
295-I$(top_srcdir)/src/lib/eina \ 301-I$(top_srcdir)/src/lib/eina \
302-I$(top_builddir)/src/lib/eina \
296@CHECK_CFLAGS@ \ 303@CHECK_CFLAGS@ \
297@EINA_CFLAGS@ 304@EINA_CFLAGS@
298 305
@@ -308,6 +315,7 @@ tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
308 315
309tests_eina_module_dummy_la_CPPFLAGS = \ 316tests_eina_module_dummy_la_CPPFLAGS = \
310-I$(top_srcdir)/src/lib/eina \ 317-I$(top_srcdir)/src/lib/eina \
318-I$(top_builddir)/src/lib/eina \
311-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ 319-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
312@CHECK_CFLAGS@ \ 320@CHECK_CFLAGS@ \
313@EINA_CFLAGS@ \ 321@EINA_CFLAGS@ \
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 3f3346c..626756f 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -32,6 +32,11 @@ lib_eio_libeio_la_CPPFLAGS = \
32-I$(top_srcdir)/src/lib/eet \ 32-I$(top_srcdir)/src/lib/eet \
33-I$(top_srcdir)/src/lib/ecore \ 33-I$(top_srcdir)/src/lib/ecore \
34-I$(top_srcdir)/src/lib/eio \ 34-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 \
35-DEFL_EIO_BUILD \ 40-DEFL_EIO_BUILD \
36@EFL_CFLAGS@ \ 41@EFL_CFLAGS@ \
37@EFL_COV_CFLAGS@ 42@EFL_COV_CFLAGS@
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 600b51c..32f6b14 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -18,6 +18,7 @@ lib/embryo/embryo_private.h
18 18
19lib_embryo_libembryo_la_CPPFLAGS = \ 19lib_embryo_libembryo_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \ 20-I$(top_srcdir)/src/lib/eina \
21-I$(top_builddir)/src/lib/eina \
21-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 22-DPACKAGE_BIN_DIR=\"$(bindir)\" \
22-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
23-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@@ -26,7 +27,8 @@ lib_embryo_libembryo_la_CPPFLAGS = \
26 27
27if HAVE_WINDOWS 28if HAVE_WINDOWS
28lib_embryo_libembryo_la_CPPFLAGS += \ 29lib_embryo_libembryo_la_CPPFLAGS += \
29-I$(top_srcdir)/src/lib/evil 30-I$(top_srcdir)/src/lib/evil \
31-I$(top_builddir)/src/lib/evil
30endif 32endif
31 33
32lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la 34lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la
@@ -62,6 +64,8 @@ bin/embryo/embryo_cc_prefix.h
62bin_embryo_embryo_cc_CPPFLAGS = \ 64bin_embryo_embryo_cc_CPPFLAGS = \
63-I$(top_srcdir)/src/lib/eina \ 65-I$(top_srcdir)/src/lib/eina \
64-I$(top_srcdir)/src/lib/embryo \ 66-I$(top_srcdir)/src/lib/embryo \
67-I$(top_builddir)/src/lib/eina \
68-I$(top_builddir)/src/lib/embryo \
65-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 69-DPACKAGE_BIN_DIR=\"$(bindir)\" \
66-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 70-DPACKAGE_LIB_DIR=\"$(libdir)\" \
67-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 71-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@@ -69,7 +73,8 @@ bin_embryo_embryo_cc_CPPFLAGS = \
69 73
70if HAVE_WINDOWS 74if HAVE_WINDOWS
71bin_embryo_embryo_cc_CPPFLAGS += \ 75bin_embryo_embryo_cc_CPPFLAGS += \
72-I$(top_srcdir)/src/lib/evil 76-I$(top_srcdir)/src/lib/evil \
77-I$(top_builddir)/src/lib/evil
73endif 78endif
74 79
75bin_embryo_embryo_cc_LDADD = \ 80bin_embryo_embryo_cc_LDADD = \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 65d2191..22fa8fa 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -14,6 +14,8 @@ lib/eo/eo_private.h
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 \ 16-I$(top_srcdir)/src/lib/eo \
17-I$(top_builddir)/src/lib/eina \
18-I$(top_builddir)/src/lib/eo \
17-DNDEBUG \ 19-DNDEBUG \
18-DEFL_EO_BUILD \ 20-DEFL_EO_BUILD \
19@EFL_CFLAGS@ \ 21@EFL_CFLAGS@ \
@@ -22,7 +24,8 @@ lib_eo_libeo_la_CPPFLAGS = \
22 24
23if HAVE_WINDOWS 25if HAVE_WINDOWS
24lib_eo_libeo_la_CPPFLAGS += \ 26lib_eo_libeo_la_CPPFLAGS += \
25-I$(top_srcdir)/src/lib/evil 27-I$(top_srcdir)/src/lib/evil \
28-I$(top_builddir)/src/lib/evil
26endif 29endif
27 30
28lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ 31lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@
@@ -55,6 +58,8 @@ tests/eo/access/access_simple_protected.h
55tests_eo_test_access_CPPFLAGS = \ 58tests_eo_test_access_CPPFLAGS = \
56-I$(top_srcdir)/src/lib/eina \ 59-I$(top_srcdir)/src/lib/eina \
57-I$(top_srcdir)/src/lib/eo \ 60-I$(top_srcdir)/src/lib/eo \
61-I$(top_builddir)/src/lib/eina \
62-I$(top_builddir)/src/lib/eo \
58@CHECK_CFLAGS@ \ 63@CHECK_CFLAGS@ \
59@EO_CFLAGS@ 64@EO_CFLAGS@
60 65
@@ -72,6 +77,8 @@ tests/eo/composite_objects/composite_objects_simple.h
72tests_eo_test_composite_objects_CPPFLAGS = \ 77tests_eo_test_composite_objects_CPPFLAGS = \
73-I$(top_srcdir)/src/lib/eina \ 78-I$(top_srcdir)/src/lib/eina \
74-I$(top_srcdir)/src/lib/eo \ 79-I$(top_srcdir)/src/lib/eo \
80-I$(top_builddir)/src/lib/eina \
81-I$(top_builddir)/src/lib/eo \
75@CHECK_CFLAGS@ \ 82@CHECK_CFLAGS@ \
76@EO_CFLAGS@ 83@EO_CFLAGS@
77 84
@@ -101,6 +108,8 @@ tests/eo/constructors/constructors_simple7.h
101tests_eo_test_constructors_CPPFLAGS = \ 108tests_eo_test_constructors_CPPFLAGS = \
102-I$(top_srcdir)/src/lib/eina \ 109-I$(top_srcdir)/src/lib/eina \
103-I$(top_srcdir)/src/lib/eo \ 110-I$(top_srcdir)/src/lib/eo \
111-I$(top_builddir)/src/lib/eina \
112-I$(top_builddir)/src/lib/eo \
104@CHECK_CFLAGS@ \ 113@CHECK_CFLAGS@ \
105@EO_CFLAGS@ 114@EO_CFLAGS@
106 115
@@ -122,6 +131,8 @@ tests/eo/suite/eo_test_init.c
122tests_eo_eo_suite_CPPFLAGS = \ 131tests_eo_eo_suite_CPPFLAGS = \
123-I$(top_srcdir)/src/lib/eina \ 132-I$(top_srcdir)/src/lib/eina \
124-I$(top_srcdir)/src/lib/eo \ 133-I$(top_srcdir)/src/lib/eo \
134-I$(top_builddir)/src/lib/eina \
135-I$(top_builddir)/src/lib/eo \
125-DNDEBUG \ 136-DNDEBUG \
126@CHECK_CFLAGS@ \ 137@CHECK_CFLAGS@ \
127@EO_CFLAGS@ 138@EO_CFLAGS@
@@ -147,6 +158,8 @@ tests/eo/function_overrides/function_overrides_simple.h
147tests_eo_test_function_overrides_CPPFLAGS = \ 158tests_eo_test_function_overrides_CPPFLAGS = \
148-I$(top_srcdir)/src/lib/eina \ 159-I$(top_srcdir)/src/lib/eina \
149-I$(top_srcdir)/src/lib/eo \ 160-I$(top_srcdir)/src/lib/eo \
161-I$(top_builddir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eo \
150@CHECK_CFLAGS@ \ 163@CHECK_CFLAGS@ \
151@EO_CFLAGS@ 164@EO_CFLAGS@
152 165
@@ -166,6 +179,8 @@ tests/eo/interface/interface_simple.h
166tests_eo_test_interface_CPPFLAGS = \ 179tests_eo_test_interface_CPPFLAGS = \
167-I$(top_srcdir)/src/lib/eina \ 180-I$(top_srcdir)/src/lib/eina \
168-I$(top_srcdir)/src/lib/eo \ 181-I$(top_srcdir)/src/lib/eo \
182-I$(top_builddir)/src/lib/eina \
183-I$(top_builddir)/src/lib/eo \
169@CHECK_CFLAGS@ \ 184@CHECK_CFLAGS@ \
170@EO_CFLAGS@ 185@EO_CFLAGS@
171 186
@@ -191,6 +206,8 @@ tests/eo/mixin/mixin_simple.h
191tests_eo_test_mixin_CPPFLAGS = \ 206tests_eo_test_mixin_CPPFLAGS = \
192-I$(top_srcdir)/src/lib/eina \ 207-I$(top_srcdir)/src/lib/eina \
193-I$(top_srcdir)/src/lib/eo \ 208-I$(top_srcdir)/src/lib/eo \
209-I$(top_builddir)/src/lib/eina \
210-I$(top_builddir)/src/lib/eo \
194@CHECK_CFLAGS@ \ 211@CHECK_CFLAGS@ \
195@EO_CFLAGS@ 212@EO_CFLAGS@
196 213
@@ -206,6 +223,8 @@ tests/eo/signals/signals_simple.h
206tests_eo_test_signals_CPPFLAGS = \ 223tests_eo_test_signals_CPPFLAGS = \
207-I$(top_srcdir)/src/lib/eina \ 224-I$(top_srcdir)/src/lib/eina \
208-I$(top_srcdir)/src/lib/eo \ 225-I$(top_srcdir)/src/lib/eo \
226-I$(top_builddir)/src/lib/eina \
227-I$(top_builddir)/src/lib/eo \
209@CHECK_CFLAGS@ \ 228@CHECK_CFLAGS@ \
210@EO_CFLAGS@ 229@EO_CFLAGS@
211 230
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index 4b8ffb2..d237d18 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -19,6 +19,7 @@ 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
23lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ 24lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
24lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@ 25lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 83a6578..8774ae1 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -190,14 +190,23 @@ lib/evas/common/evas_font_ot.h
190 190
191lib_evas_libevas_la_CPPFLAGS = \ 191lib_evas_libevas_la_CPPFLAGS = \
192-I$(top_srcdir)/src/lib/evas \ 192-I$(top_srcdir)/src/lib/evas \
193-I$(top_builddir)/src/lib/evas \
193-I$(top_srcdir)/src/lib/evas/include \ 194-I$(top_srcdir)/src/lib/evas/include \
195-I$(top_builddir)/src/lib/evas/include \
194-I$(top_srcdir)/src/lib/evas/cserve2 \ 196-I$(top_srcdir)/src/lib/evas/cserve2 \
197-I$(top_builddir)/src/lib/evas/cserve2 \
195-I$(top_srcdir)/src/lib/evas/file \ 198-I$(top_srcdir)/src/lib/evas/file \
199-I$(top_builddir)/src/lib/evas/file \
196-I$(top_srcdir)/src/static_libs/liblinebreak \ 200-I$(top_srcdir)/src/static_libs/liblinebreak \
201-I$(top_builddir)/src/static_libs/liblinebreak \
197-I$(top_srcdir)/src/lib/evas/common \ 202-I$(top_srcdir)/src/lib/evas/common \
203-I$(top_builddir)/src/lib/evas/common \
198-I$(top_srcdir)/src/lib/eina \ 204-I$(top_srcdir)/src/lib/eina \
205-I$(top_builddir)/src/lib/eina \
199-I$(top_srcdir)/src/lib/eo \ 206-I$(top_srcdir)/src/lib/eo \
207-I$(top_builddir)/src/lib/eo \
200-I$(top_srcdir)/src/lib/eet \ 208-I$(top_srcdir)/src/lib/eet \
209-I$(top_builddir)/src/lib/eet \
201-DEFL_EVAS_BUILD \ 210-DEFL_EVAS_BUILD \
202-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 211-DPACKAGE_BIN_DIR=\"$(bindir)\" \
203-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 212-DPACKAGE_LIB_DIR=\"$(libdir)\" \
@@ -223,6 +232,7 @@ lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@
223if HAVE_WINDOWS 232if HAVE_WINDOWS
224lib_evas_libevas_la_CPPFLAGS += \ 233lib_evas_libevas_la_CPPFLAGS += \
225-I$(top_srcdir)/src/lib/evil \ 234-I$(top_srcdir)/src/lib/evil \
235-I$(top_builddir)/src/lib/evil
226endif 236endif
227 237
228lib_evas_libevas_la_CXXFLAGS = 238lib_evas_libevas_la_CXXFLAGS =
@@ -373,10 +383,15 @@ enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/mod
373modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c 383modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c
374modules_evas_engines_software_generic_module_la_CPPFLAGS = \ 384modules_evas_engines_software_generic_module_la_CPPFLAGS = \
375-I$(top_srcdir)/src/lib/eina \ 385-I$(top_srcdir)/src/lib/eina \
386-I$(top_builddir)/src/lib/eina \
376-I$(top_srcdir)/src/lib/eo \ 387-I$(top_srcdir)/src/lib/eo \
388-I$(top_builddir)/src/lib/eo \
377-I$(top_srcdir)/src/lib/evas \ 389-I$(top_srcdir)/src/lib/evas \
390-I$(top_builddir)/src/lib/evas \
378-I$(top_srcdir)/src/lib/evas/include \ 391-I$(top_srcdir)/src/lib/evas/include \
392-I$(top_builddir)/src/lib/evas/include \
379-I$(top_srcdir)/src/lib/evas/cserve2 \ 393-I$(top_srcdir)/src/lib/evas/cserve2 \
394-I$(top_builddir)/src/lib/evas/cserve2 \
380-DEFL_EVAS_BUILD \ 395-DEFL_EVAS_BUILD \
381@EFL_CFLAGS@ \ 396@EFL_CFLAGS@ \
382@EVAS_CFLAGS@ 397@EVAS_CFLAGS@
@@ -399,16 +414,22 @@ enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
399modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES) 414modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
400modules_evas_engines_buffer_module_la_CPPFLAGS = \ 415modules_evas_engines_buffer_module_la_CPPFLAGS = \
401-I$(top_srcdir)/src/lib/eina \ 416-I$(top_srcdir)/src/lib/eina \
417-I$(top_builddir)/src/lib/eina \
402-I$(top_srcdir)/src/lib/eo \ 418-I$(top_srcdir)/src/lib/eo \
419-I$(top_builddir)/src/lib/eo \
403-I$(top_srcdir)/src/lib/evas \ 420-I$(top_srcdir)/src/lib/evas \
421-I$(top_builddir)/src/lib/evas \
404-I$(top_srcdir)/src/lib/evas/include \ 422-I$(top_srcdir)/src/lib/evas/include \
423-I$(top_builddir)/src/lib/evas/include \
405-I$(top_srcdir)/src/lib/evas/cserve2 \ 424-I$(top_srcdir)/src/lib/evas/cserve2 \
425-I$(top_builddir)/src/lib/evas/cserve2 \
406-DEFL_EVAS_BUILD \ 426-DEFL_EVAS_BUILD \
407@EFL_CFLAGS@ \ 427@EFL_CFLAGS@ \
408@EVAS_CFLAGS@ 428@EVAS_CFLAGS@
409if HAVE_WINDOWS 429if HAVE_WINDOWS
410modules_evas_engines_buffer_module_la_CPPFLAGS += \ 430modules_evas_engines_buffer_module_la_CPPFLAGS += \
411-I$(top_srcdir)/src/lib/evil 431-I$(top_srcdir)/src/lib/evil \
432-I$(top_builddir)/src/lib/evil
412endif 433endif
413modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ 434modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@
414modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version 435modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
@@ -434,10 +455,15 @@ enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la
434modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES) 455modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES)
435modules_evas_engines_fb_module_la_CPPFLAGS = \ 456modules_evas_engines_fb_module_la_CPPFLAGS = \
436-I$(top_srcdir)/src/lib/eina \ 457-I$(top_srcdir)/src/lib/eina \
458-I$(top_builddir)/src/lib/eina \
437-I$(top_srcdir)/src/lib/eo \ 459-I$(top_srcdir)/src/lib/eo \
460-I$(top_builddir)/src/lib/eo \
438-I$(top_srcdir)/src/lib/evas \ 461-I$(top_srcdir)/src/lib/evas \
462-I$(top_builddir)/src/lib/evas \
439-I$(top_srcdir)/src/lib/evas/include \ 463-I$(top_srcdir)/src/lib/evas/include \
464-I$(top_builddir)/src/lib/evas/include \
440-I$(top_srcdir)/src/lib/evas/cserve2 \ 465-I$(top_srcdir)/src/lib/evas/cserve2 \
466-I$(top_builddir)/src/lib/evas/cserve2 \
441@evas_engine_fb_cflags@ \ 467@evas_engine_fb_cflags@ \
442@EFL_CFLAGS@ \ 468@EFL_CFLAGS@ \
443@EVAS_CFLAGS@ 469@EVAS_CFLAGS@
@@ -549,11 +575,17 @@ noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
549modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) 575modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
550modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ 576modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
551-I$(top_srcdir)/src/lib/eina \ 577-I$(top_srcdir)/src/lib/eina \
578-I$(top_builddir)/src/lib/eina \
552-I$(top_srcdir)/src/lib/eo \ 579-I$(top_srcdir)/src/lib/eo \
580-I$(top_builddir)/src/lib/eo \
553-I$(top_srcdir)/src/lib/eet \ 581-I$(top_srcdir)/src/lib/eet \
582-I$(top_builddir)/src/lib/eet \
554-I$(top_srcdir)/src/lib/evas \ 583-I$(top_srcdir)/src/lib/evas \
584-I$(top_builddir)/src/lib/evas \
555-I$(top_srcdir)/src/lib/evas/include \ 585-I$(top_srcdir)/src/lib/evas/include \
586-I$(top_builddir)/src/lib/evas/include \
556-I$(top_srcdir)/src/lib/evas/cserve2 \ 587-I$(top_srcdir)/src/lib/evas/cserve2 \
588-I$(top_builddir)/src/lib/evas/cserve2 \
557-DEFL_EVAS_BUILD \ 589-DEFL_EVAS_BUILD \
558@EFL_CFLAGS@ \ 590@EFL_CFLAGS@ \
559@EVAS_CFLAGS@ 591@EVAS_CFLAGS@
@@ -585,12 +617,19 @@ engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
585modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES) 617modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES)
586modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \ 618modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
587-I$(top_srcdir)/src/lib/eina \ 619-I$(top_srcdir)/src/lib/eina \
620-I$(top_builddir)/src/lib/eina \
588-I$(top_srcdir)/src/lib/eo \ 621-I$(top_srcdir)/src/lib/eo \
622-I$(top_builddir)/src/lib/eo \
589-I$(top_srcdir)/src/lib/eet \ 623-I$(top_srcdir)/src/lib/eet \
624-I$(top_builddir)/src/lib/eet \
590-I$(top_srcdir)/src/lib/evas \ 625-I$(top_srcdir)/src/lib/evas \
626-I$(top_builddir)/src/lib/evas \
591-I$(top_srcdir)/src/lib/evas/include \ 627-I$(top_srcdir)/src/lib/evas/include \
628-I$(top_builddir)/src/lib/evas/include \
592-I$(top_srcdir)/src/lib/evas/cserve2 \ 629-I$(top_srcdir)/src/lib/evas/cserve2 \
630-I$(top_builddir)/src/lib/evas/cserve2 \
593-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 631-I$(top_srcdir)/src/modules/evas/engines/gl_common \
632-I$(top_builddir)/src/modules/evas/engines/gl_common \
594@evas_engine_gl_cocoa_cflags@ \ 633@evas_engine_gl_cocoa_cflags@ \
595@EFL_CFLAGS@ \ 634@EFL_CFLAGS@ \
596@EVAS_CFLAGS@ 635@EVAS_CFLAGS@
@@ -627,12 +666,19 @@ engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la
627modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES) 666modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
628modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \ 667modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
629-I$(top_srcdir)/src/lib/eina \ 668-I$(top_srcdir)/src/lib/eina \
669-I$(top_builddir)/src/lib/eina \
630-I$(top_srcdir)/src/lib/eo \ 670-I$(top_srcdir)/src/lib/eo \
671-I$(top_builddir)/src/lib/eo \
631-I$(top_srcdir)/src/lib/eet \ 672-I$(top_srcdir)/src/lib/eet \
673-I$(top_builddir)/src/lib/eet \
632-I$(top_srcdir)/src/lib/evas \ 674-I$(top_srcdir)/src/lib/evas \
675-I$(top_builddir)/src/lib/evas \
633-I$(top_srcdir)/src/lib/evas/include \ 676-I$(top_srcdir)/src/lib/evas/include \
677-I$(top_builddir)/src/lib/evas/include \
634-I$(top_srcdir)/src/lib/evas/cserve2 \ 678-I$(top_srcdir)/src/lib/evas/cserve2 \
679-I$(top_builddir)/src/lib/evas/cserve2 \
635-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 680-I$(top_srcdir)/src/modules/evas/engines/gl_common \
681-I$(top_builddir)/src/modules/evas/engines/gl_common \
636@evas_engine_gl_sdl_cflags@ \ 682@evas_engine_gl_sdl_cflags@ \
637@EFL_CFLAGS@ \ 683@EFL_CFLAGS@ \
638@EVAS_CFLAGS@ 684@EVAS_CFLAGS@
@@ -669,12 +715,19 @@ engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
669modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES) 715modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
670modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ 716modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
671-I$(top_srcdir)/src/lib/eina \ 717-I$(top_srcdir)/src/lib/eina \
718-I$(top_builddir)/src/lib/eina \
672-I$(top_srcdir)/src/lib/eo \ 719-I$(top_srcdir)/src/lib/eo \
720-I$(top_builddir)/src/lib/eo \
673-I$(top_srcdir)/src/lib/eet \ 721-I$(top_srcdir)/src/lib/eet \
722-I$(top_builddir)/src/lib/eet \
674-I$(top_srcdir)/src/lib/evas \ 723-I$(top_srcdir)/src/lib/evas \
724-I$(top_builddir)/src/lib/evas \
675-I$(top_srcdir)/src/lib/evas/include \ 725-I$(top_srcdir)/src/lib/evas/include \
726-I$(top_builddir)/src/lib/evas/include \
676-I$(top_srcdir)/src/lib/evas/cserve2 \ 727-I$(top_srcdir)/src/lib/evas/cserve2 \
728-I$(top_builddir)/src/lib/evas/cserve2 \
677-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 729-I$(top_srcdir)/src/modules/evas/engines/gl_common \
730-I$(top_builddir)/src/modules/evas/engines/gl_common \
678@evas_engine_gl_xlib_cflags@ \ 731@evas_engine_gl_xlib_cflags@ \
679@EFL_CFLAGS@ \ 732@EFL_CFLAGS@ \
680@EVAS_CFLAGS@ 733@EVAS_CFLAGS@
@@ -710,10 +763,15 @@ enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la
710modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES) 763modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES)
711modules_evas_engines_psl1ght_module_la_CPPFLAGS = \ 764modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
712-I$(top_srcdir)/src/lib/eina \ 765-I$(top_srcdir)/src/lib/eina \
766-I$(top_builddir)/src/lib/eina \
713-I$(top_srcdir)/src/lib/eo \ 767-I$(top_srcdir)/src/lib/eo \
768-I$(top_builddir)/src/lib/eo \
714-I$(top_srcdir)/src/lib/evas \ 769-I$(top_srcdir)/src/lib/evas \
770-I$(top_builddir)/src/lib/evas \
715-I$(top_srcdir)/src/lib/evas/include \ 771-I$(top_srcdir)/src/lib/evas/include \
772-I$(top_builddir)/src/lib/evas/include \
716-I$(top_srcdir)/src/lib/evas/cserve2 \ 773-I$(top_srcdir)/src/lib/evas/cserve2 \
774-I$(top_builddir)/src/lib/evas/cserve2 \
717@evas_engine_psl1ght_cflags@ \ 775@evas_engine_psl1ght_cflags@ \
718@EFL_CFLAGS@ \ 776@EFL_CFLAGS@ \
719@EVAS_CFLAGS@ 777@EVAS_CFLAGS@
@@ -745,17 +803,23 @@ enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.
745modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES) 803modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
746modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \ 804modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
747-I$(top_srcdir)/src/lib/eina \ 805-I$(top_srcdir)/src/lib/eina \
806-I$(top_builddir)/src/lib/eina \
748-I$(top_srcdir)/src/lib/eo \ 807-I$(top_srcdir)/src/lib/eo \
808-I$(top_builddir)/src/lib/eo \
749-I$(top_srcdir)/src/lib/evas \ 809-I$(top_srcdir)/src/lib/evas \
810-I$(top_builddir)/src/lib/evas \
750-I$(top_srcdir)/src/lib/evas/include \ 811-I$(top_srcdir)/src/lib/evas/include \
812-I$(top_builddir)/src/lib/evas/include \
751-I$(top_srcdir)/src/lib/evas/cserve2 \ 813-I$(top_srcdir)/src/lib/evas/cserve2 \
814-I$(top_builddir)/src/lib/evas/cserve2 \
752-DEFL_EVAS_BUILD \ 815-DEFL_EVAS_BUILD \
753@evas_engine_software_ddraw_cflags@ \ 816@evas_engine_software_ddraw_cflags@ \
754@EFL_CFLAGS@ \ 817@EFL_CFLAGS@ \
755@EVAS_CFLAGS@ 818@EVAS_CFLAGS@
756if HAVE_WINDOWS 819if HAVE_WINDOWS
757modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \ 820modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \
758-I$(top_srcdir)/src/lib/evil 821-I$(top_srcdir)/src/lib/evil \
822-I$(top_builddir)/src/lib/evil
759endif 823endif
760modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions 824modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
761modules_evas_engines_software_ddraw_module_la_LIBADD = \ 825modules_evas_engines_software_ddraw_module_la_LIBADD = \
@@ -785,17 +849,23 @@ enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la
785modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES) 849modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
786modules_evas_engines_software_gdi_module_la_CPPFLAGS = \ 850modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
787-I$(top_srcdir)/src/lib/eina \ 851-I$(top_srcdir)/src/lib/eina \
852-I$(top_builddir)/src/lib/eina \
788-I$(top_srcdir)/src/lib/eo \ 853-I$(top_srcdir)/src/lib/eo \
854-I$(top_builddir)/src/lib/eo \
789-I$(top_srcdir)/src/lib/evas \ 855-I$(top_srcdir)/src/lib/evas \
856-I$(top_builddir)/src/lib/evas \
790-I$(top_srcdir)/src/lib/evas/include \ 857-I$(top_srcdir)/src/lib/evas/include \
858-I$(top_builddir)/src/lib/evas/include \
791-I$(top_srcdir)/src/lib/evas/cserve2 \ 859-I$(top_srcdir)/src/lib/evas/cserve2 \
860-I$(top_builddir)/src/lib/evas/cserve2 \
792-DEFL_EVAS_BUILD \ 861-DEFL_EVAS_BUILD \
793@evas_engine_software_gdi_cflags@ \ 862@evas_engine_software_gdi_cflags@ \
794@EFL_CFLAGS@ \ 863@EFL_CFLAGS@ \
795@EVAS_CFLAGS@ 864@EVAS_CFLAGS@
796if HAVE_WINDOWS 865if HAVE_WINDOWS
797modules_evas_engines_software_gdi_module_la_CPPFLAGS += \ 866modules_evas_engines_software_gdi_module_la_CPPFLAGS += \
798-I$(top_srcdir)/src/lib/evil 867-I$(top_srcdir)/src/lib/evil \
868-I$(top_builddir)/src/lib/evil
799endif 869endif
800modules_evas_engines_software_gdi_module_la_LIBADD = \ 870modules_evas_engines_software_gdi_module_la_LIBADD = \
801lib/evas/libevas.la \ 871lib/evas/libevas.la \
@@ -815,10 +885,15 @@ modules/evas/engines/software_x11/evas_x_egl.c \
815modules/evas/engines/software_x11/evas_x_egl.h 885modules/evas/engines/software_x11/evas_x_egl.h
816SOFTWARE_X11_CPPFLAGS = \ 886SOFTWARE_X11_CPPFLAGS = \
817-I$(top_srcdir)/src/lib/eina \ 887-I$(top_srcdir)/src/lib/eina \
888-I$(top_builddir)/src/lib/eina \
818-I$(top_srcdir)/src/lib/eo \ 889-I$(top_srcdir)/src/lib/eo \
890-I$(top_builddir)/src/lib/eo \
819-I$(top_srcdir)/src/lib/evas \ 891-I$(top_srcdir)/src/lib/evas \
892-I$(top_builddir)/src/lib/evas \
820-I$(top_srcdir)/src/lib/evas/include \ 893-I$(top_srcdir)/src/lib/evas/include \
894-I$(top_builddir)/src/lib/evas/include \
821-I$(top_srcdir)/src/lib/evas/cserve2 \ 895-I$(top_srcdir)/src/lib/evas/cserve2 \
896-I$(top_builddir)/src/lib/evas/cserve2 \
822@EFL_CFLAGS@ \ 897@EFL_CFLAGS@ \
823@EVAS_CFLAGS@ 898@EVAS_CFLAGS@
824SOFTWARE_X11_LIBADD = 899SOFTWARE_X11_LIBADD =
@@ -885,12 +960,19 @@ enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
885modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES) 960modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
886modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \ 961modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
887-I$(top_srcdir)/src/lib/eina \ 962-I$(top_srcdir)/src/lib/eina \
963-I$(top_builddir)/src/lib/eina \
888-I$(top_srcdir)/src/lib/eo \ 964-I$(top_srcdir)/src/lib/eo \
965-I$(top_builddir)/src/lib/eo \
889-I$(top_srcdir)/src/lib/eet \ 966-I$(top_srcdir)/src/lib/eet \
967-I$(top_builddir)/src/lib/eet \
890-I$(top_srcdir)/src/lib/evas \ 968-I$(top_srcdir)/src/lib/evas \
969-I$(top_builddir)/src/lib/evas \
891-I$(top_srcdir)/src/lib/evas/include \ 970-I$(top_srcdir)/src/lib/evas/include \
971-I$(top_builddir)/src/lib/evas/include \
892-I$(top_srcdir)/src/lib/evas/cserve2 \ 972-I$(top_srcdir)/src/lib/evas/cserve2 \
973-I$(top_builddir)/src/lib/evas/cserve2 \
893-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 974-I$(top_srcdir)/src/modules/evas/engines/gl_common \
975-I$(top_builddir)/src/modules/evas/engines/gl_common \
894@evas_engine_wayland_egl_cflags@ \ 976@evas_engine_wayland_egl_cflags@ \
895@EFL_CFLAGS@ \ 977@EFL_CFLAGS@ \
896@EVAS_CFLAGS@ 978@EVAS_CFLAGS@
@@ -921,10 +1003,15 @@ enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
921modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES) 1003modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
922modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \ 1004modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
923-I$(top_srcdir)/src/lib/eina \ 1005-I$(top_srcdir)/src/lib/eina \
1006-I$(top_builddir)/src/lib/eina \
924-I$(top_srcdir)/src/lib/eo \ 1007-I$(top_srcdir)/src/lib/eo \
1008-I$(top_builddir)/src/lib/eo \
925-I$(top_srcdir)/src/lib/evas \ 1009-I$(top_srcdir)/src/lib/evas \
1010-I$(top_builddir)/src/lib/evas \
926-I$(top_srcdir)/src/lib/evas/include \ 1011-I$(top_srcdir)/src/lib/evas/include \
1012-I$(top_builddir)/src/lib/evas/include \
927-I$(top_srcdir)/src/lib/evas/cserve2 \ 1013-I$(top_srcdir)/src/lib/evas/cserve2 \
1014-I$(top_builddir)/src/lib/evas/cserve2 \
928@evas_engine_wayland_shm_cflags@ \ 1015@evas_engine_wayland_shm_cflags@ \
929@EFL_CFLAGS@ \ 1016@EFL_CFLAGS@ \
930@EVAS_CFLAGS@ 1017@EVAS_CFLAGS@
@@ -950,9 +1037,13 @@ loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
950modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c 1037modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c
951modules_evas_loaders_bmp_module_la_CPPFLAGS = \ 1038modules_evas_loaders_bmp_module_la_CPPFLAGS = \
952-I$(top_srcdir)/src/lib/eina \ 1039-I$(top_srcdir)/src/lib/eina \
1040-I$(top_builddir)/src/lib/eina \
953-I$(top_srcdir)/src/lib/eo \ 1041-I$(top_srcdir)/src/lib/eo \
1042-I$(top_builddir)/src/lib/eo \
954-I$(top_srcdir)/src/lib/evas \ 1043-I$(top_srcdir)/src/lib/evas \
1044-I$(top_builddir)/src/lib/evas \
955-I$(top_srcdir)/src/lib/evas/include \ 1045-I$(top_srcdir)/src/lib/evas/include \
1046-I$(top_builddir)/src/lib/evas/include \
956-DEFL_EVAS_BUILD \ 1047-DEFL_EVAS_BUILD \
957@evas_image_loader_bmp_cflags@ \ 1048@evas_image_loader_bmp_cflags@ \
958@EFL_CFLAGS@ \ 1049@EFL_CFLAGS@ \
@@ -978,10 +1069,15 @@ loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la
978modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c 1069modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c
979modules_evas_loaders_eet_module_la_CPPFLAGS = \ 1070modules_evas_loaders_eet_module_la_CPPFLAGS = \
980-I$(top_srcdir)/src/lib/eina \ 1071-I$(top_srcdir)/src/lib/eina \
1072-I$(top_builddir)/src/lib/eina \
981-I$(top_srcdir)/src/lib/eo \ 1073-I$(top_srcdir)/src/lib/eo \
1074-I$(top_builddir)/src/lib/eo \
982-I$(top_srcdir)/src/lib/eet \ 1075-I$(top_srcdir)/src/lib/eet \
1076-I$(top_builddir)/src/lib/eet \
983-I$(top_srcdir)/src/lib/evas \ 1077-I$(top_srcdir)/src/lib/evas \
1078-I$(top_builddir)/src/lib/evas \
984-I$(top_srcdir)/src/lib/evas/include \ 1079-I$(top_srcdir)/src/lib/evas/include \
1080-I$(top_builddir)/src/lib/evas/include \
985-DEFL_EVAS_BUILD \ 1081-DEFL_EVAS_BUILD \
986@evas_image_loader_eet_cflags@ \ 1082@evas_image_loader_eet_cflags@ \
987@EFL_CFLAGS@ \ 1083@EFL_CFLAGS@ \
@@ -1006,9 +1102,13 @@ loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la
1006modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c 1102modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c
1007modules_evas_loaders_generic_module_la_CPPFLAGS = \ 1103modules_evas_loaders_generic_module_la_CPPFLAGS = \
1008-I$(top_srcdir)/src/lib/eina \ 1104-I$(top_srcdir)/src/lib/eina \
1105-I$(top_builddir)/src/lib/eina \
1009-I$(top_srcdir)/src/lib/eo \ 1106-I$(top_srcdir)/src/lib/eo \
1107-I$(top_builddir)/src/lib/eo \
1010-I$(top_srcdir)/src/lib/evas \ 1108-I$(top_srcdir)/src/lib/evas \
1109-I$(top_builddir)/src/lib/evas \
1011-I$(top_srcdir)/src/lib/evas/include \ 1110-I$(top_srcdir)/src/lib/evas/include \
1111-I$(top_builddir)/src/lib/evas/include \
1012-DEFL_EVAS_BUILD \ 1112-DEFL_EVAS_BUILD \
1013@evas_image_loader_generic_cflags@ \ 1113@evas_image_loader_generic_cflags@ \
1014@EFL_CFLAGS@ \ 1114@EFL_CFLAGS@ \
@@ -1033,9 +1133,13 @@ loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la
1033modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c 1133modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c
1034modules_evas_loaders_gif_module_la_CPPFLAGS = \ 1134modules_evas_loaders_gif_module_la_CPPFLAGS = \
1035-I$(top_srcdir)/src/lib/eina \ 1135-I$(top_srcdir)/src/lib/eina \
1136-I$(top_builddir)/src/lib/eina \
1036-I$(top_srcdir)/src/lib/eo \ 1137-I$(top_srcdir)/src/lib/eo \
1138-I$(top_builddir)/src/lib/eo \
1037-I$(top_srcdir)/src/lib/evas \ 1139-I$(top_srcdir)/src/lib/evas \
1140-I$(top_builddir)/src/lib/evas \
1038-I$(top_srcdir)/src/lib/evas/include \ 1141-I$(top_srcdir)/src/lib/evas/include \
1142-I$(top_builddir)/src/lib/evas/include \
1039-DEFL_EVAS_BUILD \ 1143-DEFL_EVAS_BUILD \
1040@evas_image_loader_gif_cflags@ \ 1144@evas_image_loader_gif_cflags@ \
1041@EFL_CFLAGS@ \ 1145@EFL_CFLAGS@ \
@@ -1060,9 +1164,13 @@ loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la
1060modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c 1164modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c
1061modules_evas_loaders_ico_module_la_CPPFLAGS = \ 1165modules_evas_loaders_ico_module_la_CPPFLAGS = \
1062-I$(top_srcdir)/src/lib/eina \ 1166-I$(top_srcdir)/src/lib/eina \
1167-I$(top_builddir)/src/lib/eina \
1063-I$(top_srcdir)/src/lib/eo \ 1168-I$(top_srcdir)/src/lib/eo \
1169-I$(top_builddir)/src/lib/eo \
1064-I$(top_srcdir)/src/lib/evas \ 1170-I$(top_srcdir)/src/lib/evas \
1171-I$(top_builddir)/src/lib/evas \
1065-I$(top_srcdir)/src/lib/evas/include \ 1172-I$(top_srcdir)/src/lib/evas/include \
1173-I$(top_builddir)/src/lib/evas/include \
1066-DEFL_EVAS_BUILD \ 1174-DEFL_EVAS_BUILD \
1067@evas_image_loader_ico_cflags@ \ 1175@evas_image_loader_ico_cflags@ \
1068@EFL_CFLAGS@ \ 1176@EFL_CFLAGS@ \
@@ -1090,9 +1198,13 @@ loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la
1090modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c 1198modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c
1091modules_evas_loaders_jpeg_module_la_CPPFLAGS = \ 1199modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
1092-I$(top_srcdir)/src/lib/eina \ 1200-I$(top_srcdir)/src/lib/eina \
1201-I$(top_builddir)/src/lib/eina \
1093-I$(top_srcdir)/src/lib/eo \ 1202-I$(top_srcdir)/src/lib/eo \
1203-I$(top_builddir)/src/lib/eo \
1094-I$(top_srcdir)/src/lib/evas \ 1204-I$(top_srcdir)/src/lib/evas \
1205-I$(top_builddir)/src/lib/evas \
1095-I$(top_srcdir)/src/lib/evas/include \ 1206-I$(top_srcdir)/src/lib/evas/include \
1207-I$(top_builddir)/src/lib/evas/include \
1096-DEFL_EVAS_BUILD \ 1208-DEFL_EVAS_BUILD \
1097@evas_image_loader_jpeg_cflags@ \ 1209@evas_image_loader_jpeg_cflags@ \
1098@EFL_CFLAGS@ \ 1210@EFL_CFLAGS@ \
@@ -1109,9 +1221,13 @@ saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la
1109modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c 1221modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c
1110modules_evas_savers_jpeg_module_la_CPPFLAGS = \ 1222modules_evas_savers_jpeg_module_la_CPPFLAGS = \
1111-I$(top_srcdir)/src/lib/eina \ 1223-I$(top_srcdir)/src/lib/eina \
1224-I$(top_builddir)/src/lib/eina \
1112-I$(top_srcdir)/src/lib/eo \ 1225-I$(top_srcdir)/src/lib/eo \
1226-I$(top_builddir)/src/lib/eo \
1113-I$(top_srcdir)/src/lib/evas \ 1227-I$(top_srcdir)/src/lib/evas \
1228-I$(top_builddir)/src/lib/evas \
1114-I$(top_srcdir)/src/lib/evas/include \ 1229-I$(top_srcdir)/src/lib/evas/include \
1230-I$(top_builddir)/src/lib/evas/include \
1115@evas_image_loader_jpeg_cflags@ \ 1231@evas_image_loader_jpeg_cflags@ \
1116@EFL_CFLAGS@ \ 1232@EFL_CFLAGS@ \
1117@EVAS_CFLAGS@ 1233@EVAS_CFLAGS@
@@ -1136,9 +1252,13 @@ loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la
1136modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c 1252modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c
1137modules_evas_loaders_pmaps_module_la_CPPFLAGS = \ 1253modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
1138-I$(top_srcdir)/src/lib/eina \ 1254-I$(top_srcdir)/src/lib/eina \
1255-I$(top_builddir)/src/lib/eina \
1139-I$(top_srcdir)/src/lib/eo \ 1256-I$(top_srcdir)/src/lib/eo \
1257-I$(top_builddir)/src/lib/eo \
1140-I$(top_srcdir)/src/lib/evas \ 1258-I$(top_srcdir)/src/lib/evas \
1259-I$(top_builddir)/src/lib/evas \
1141-I$(top_srcdir)/src/lib/evas/include \ 1260-I$(top_srcdir)/src/lib/evas/include \
1261-I$(top_builddir)/src/lib/evas/include \
1142-DEFL_EVAS_BUILD \ 1262-DEFL_EVAS_BUILD \
1143@evas_image_loader_pmaps_cflags@ \ 1263@evas_image_loader_pmaps_cflags@ \
1144@EFL_CFLAGS@ \ 1264@EFL_CFLAGS@ \
@@ -1163,9 +1283,13 @@ loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la
1163modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c 1283modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c
1164modules_evas_loaders_png_module_la_CPPFLAGS = \ 1284modules_evas_loaders_png_module_la_CPPFLAGS = \
1165-I$(top_srcdir)/src/lib/eina \ 1285-I$(top_srcdir)/src/lib/eina \
1286-I$(top_builddir)/src/lib/eina \
1166-I$(top_srcdir)/src/lib/eo \ 1287-I$(top_srcdir)/src/lib/eo \
1288-I$(top_builddir)/src/lib/eo \
1167-I$(top_srcdir)/src/lib/evas \ 1289-I$(top_srcdir)/src/lib/evas \
1290-I$(top_builddir)/src/lib/evas \
1168-I$(top_srcdir)/src/lib/evas/include \ 1291-I$(top_srcdir)/src/lib/evas/include \
1292-I$(top_builddir)/src/lib/evas/include \
1169-DEFL_EVAS_BUILD \ 1293-DEFL_EVAS_BUILD \
1170@evas_image_loader_png_cflags@ \ 1294@evas_image_loader_png_cflags@ \
1171@EFL_CFLAGS@ \ 1295@EFL_CFLAGS@ \
@@ -1182,9 +1306,13 @@ saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la
1182modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c 1306modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c
1183modules_evas_savers_png_module_la_CPPFLAGS = \ 1307modules_evas_savers_png_module_la_CPPFLAGS = \
1184-I$(top_srcdir)/src/lib/eina \ 1308-I$(top_srcdir)/src/lib/eina \
1309-I$(top_builddir)/src/lib/eina \
1185-I$(top_srcdir)/src/lib/eo \ 1310-I$(top_srcdir)/src/lib/eo \
1311-I$(top_builddir)/src/lib/eo \
1186-I$(top_srcdir)/src/lib/evas \ 1312-I$(top_srcdir)/src/lib/evas \
1313-I$(top_builddir)/src/lib/evas \
1187-I$(top_srcdir)/src/lib/evas/include \ 1314-I$(top_srcdir)/src/lib/evas/include \
1315-I$(top_builddir)/src/lib/evas/include \
1188-DEFL_EVAS_BUILD \ 1316-DEFL_EVAS_BUILD \
1189@evas_image_loader_png_cflags@ \ 1317@evas_image_loader_png_cflags@ \
1190@EFL_CFLAGS@ \ 1318@EFL_CFLAGS@ \
@@ -1209,9 +1337,13 @@ loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la
1209modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c 1337modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c
1210modules_evas_loaders_psd_module_la_CPPFLAGS = \ 1338modules_evas_loaders_psd_module_la_CPPFLAGS = \
1211-I$(top_srcdir)/src/lib/eina \ 1339-I$(top_srcdir)/src/lib/eina \
1340-I$(top_builddir)/src/lib/eina \
1212-I$(top_srcdir)/src/lib/eo \ 1341-I$(top_srcdir)/src/lib/eo \
1342-I$(top_builddir)/src/lib/eo \
1213-I$(top_srcdir)/src/lib/evas \ 1343-I$(top_srcdir)/src/lib/evas \
1344-I$(top_builddir)/src/lib/evas \
1214-I$(top_srcdir)/src/lib/evas/include \ 1345-I$(top_srcdir)/src/lib/evas/include \
1346-I$(top_builddir)/src/lib/evas/include \
1215-DEFL_EVAS_BUILD \ 1347-DEFL_EVAS_BUILD \
1216@evas_image_loader_psd_cflags@ \ 1348@evas_image_loader_psd_cflags@ \
1217@EFL_CFLAGS@ \ 1349@EFL_CFLAGS@ \
@@ -1236,9 +1368,13 @@ loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la
1236modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c 1368modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c
1237modules_evas_loaders_svg_module_la_CPPFLAGS = \ 1369modules_evas_loaders_svg_module_la_CPPFLAGS = \
1238-I$(top_srcdir)/src/lib/eina \ 1370-I$(top_srcdir)/src/lib/eina \
1371-I$(top_builddir)/src/lib/eina \
1239-I$(top_srcdir)/src/lib/eo \ 1372-I$(top_srcdir)/src/lib/eo \
1373-I$(top_builddir)/src/lib/eo \
1240-I$(top_srcdir)/src/lib/evas \ 1374-I$(top_srcdir)/src/lib/evas \
1375-I$(top_builddir)/src/lib/evas \
1241-I$(top_srcdir)/src/lib/evas/include \ 1376-I$(top_srcdir)/src/lib/evas/include \
1377-I$(top_builddir)/src/lib/evas/include \
1242-DEFL_EVAS_BUILD \ 1378-DEFL_EVAS_BUILD \
1243@evas_image_loader_svg_cflags@ \ 1379@evas_image_loader_svg_cflags@ \
1244@EFL_CFLAGS@ \ 1380@EFL_CFLAGS@ \
@@ -1263,9 +1399,13 @@ loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la
1263modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c 1399modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c
1264modules_evas_loaders_tga_module_la_CPPFLAGS = \ 1400modules_evas_loaders_tga_module_la_CPPFLAGS = \
1265-I$(top_srcdir)/src/lib/eina \ 1401-I$(top_srcdir)/src/lib/eina \
1402-I$(top_builddir)/src/lib/eina \
1266-I$(top_srcdir)/src/lib/eo \ 1403-I$(top_srcdir)/src/lib/eo \
1404-I$(top_builddir)/src/lib/eo \
1267-I$(top_srcdir)/src/lib/evas \ 1405-I$(top_srcdir)/src/lib/evas \
1406-I$(top_builddir)/src/lib/evas \
1268-I$(top_srcdir)/src/lib/evas/include \ 1407-I$(top_srcdir)/src/lib/evas/include \
1408-I$(top_builddir)/src/lib/evas/include \
1269-DEFL_EVAS_BUILD \ 1409-DEFL_EVAS_BUILD \
1270@evas_image_loader_tga_cflags@ \ 1410@evas_image_loader_tga_cflags@ \
1271@EFL_CFLAGS@ \ 1411@EFL_CFLAGS@ \
@@ -1290,16 +1430,21 @@ loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la
1290modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c 1430modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c
1291modules_evas_loaders_tiff_module_la_CPPFLAGS = \ 1431modules_evas_loaders_tiff_module_la_CPPFLAGS = \
1292-I$(top_srcdir)/src/lib/eina \ 1432-I$(top_srcdir)/src/lib/eina \
1433-I$(top_builddir)/src/lib/eina \
1293-I$(top_srcdir)/src/lib/eo \ 1434-I$(top_srcdir)/src/lib/eo \
1435-I$(top_builddir)/src/lib/eo \
1294-I$(top_srcdir)/src/lib/evas \ 1436-I$(top_srcdir)/src/lib/evas \
1437-I$(top_builddir)/src/lib/evas \
1295-I$(top_srcdir)/src/lib/evas/include \ 1438-I$(top_srcdir)/src/lib/evas/include \
1439-I$(top_builddir)/src/lib/evas/include \
1296-DEFL_EVAS_BUILD \ 1440-DEFL_EVAS_BUILD \
1297@evas_image_loader_tiff_cflags@ \ 1441@evas_image_loader_tiff_cflags@ \
1298@EFL_CFLAGS@ \ 1442@EFL_CFLAGS@ \
1299@EVAS_CFLAGS@ 1443@EVAS_CFLAGS@
1300if HAVE_WINDOWS 1444if HAVE_WINDOWS
1301modules_evas_loaders_tiff_module_la_CPPFLAGS += \ 1445modules_evas_loaders_tiff_module_la_CPPFLAGS += \
1302-I$(top_srcdir)/src/lib/evil 1446-I$(top_srcdir)/src/lib/evil \
1447-I$(top_builddir)/src/lib/evil
1303endif 1448endif
1304modules_evas_loaders_tiff_module_la_LIBADD = \ 1449modules_evas_loaders_tiff_module_la_LIBADD = \
1305lib/evas/libevas.la \ 1450lib/evas/libevas.la \
@@ -1313,16 +1458,21 @@ savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la
1313modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c 1458modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c
1314modules_evas_savers_tiff_module_la_CPPFLAGS = \ 1459modules_evas_savers_tiff_module_la_CPPFLAGS = \
1315-I$(top_srcdir)/src/lib/eina \ 1460-I$(top_srcdir)/src/lib/eina \
1461-I$(top_builddir)/src/lib/eina \
1316-I$(top_srcdir)/src/lib/eo \ 1462-I$(top_srcdir)/src/lib/eo \
1463-I$(top_builddir)/src/lib/eo \
1317-I$(top_srcdir)/src/lib/evas \ 1464-I$(top_srcdir)/src/lib/evas \
1465-I$(top_builddir)/src/lib/evas \
1318-I$(top_srcdir)/src/lib/evas/include \ 1466-I$(top_srcdir)/src/lib/evas/include \
1467-I$(top_builddir)/src/lib/evas/include \
1319-DEFL_EVAS_BUILD \ 1468-DEFL_EVAS_BUILD \
1320@evas_image_loader_tiff_cflags@ \ 1469@evas_image_loader_tiff_cflags@ \
1321@EFL_CFLAGS@ \ 1470@EFL_CFLAGS@ \
1322@EVAS_CFLAGS@ 1471@EVAS_CFLAGS@
1323if HAVE_WINDOWS 1472if HAVE_WINDOWS
1324modules_evas_savers_tiff_module_la_CPPFLAGS += \ 1473modules_evas_savers_tiff_module_la_CPPFLAGS += \
1325-I$(top_srcdir)/src/lib/evil 1474-I$(top_srcdir)/src/lib/evil \
1475-I$(top_builddir)/src/lib/evil
1326endif 1476endif
1327modules_evas_savers_tiff_module_la_LIBADD = \ 1477modules_evas_savers_tiff_module_la_LIBADD = \
1328lib/evas/libevas.la \ 1478lib/evas/libevas.la \
@@ -1344,9 +1494,13 @@ loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la
1344modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c 1494modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c
1345modules_evas_loaders_wbmp_module_la_CPPFLAGS = \ 1495modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
1346-I$(top_srcdir)/src/lib/eina \ 1496-I$(top_srcdir)/src/lib/eina \
1497-I$(top_builddir)/src/lib/eina \
1347-I$(top_srcdir)/src/lib/eo \ 1498-I$(top_srcdir)/src/lib/eo \
1499-I$(top_builddir)/src/lib/eo \
1348-I$(top_srcdir)/src/lib/evas \ 1500-I$(top_srcdir)/src/lib/evas \
1501-I$(top_builddir)/src/lib/evas \
1349-I$(top_srcdir)/src/lib/evas/include \ 1502-I$(top_srcdir)/src/lib/evas/include \
1503-I$(top_builddir)/src/lib/evas/include \
1350-DEFL_EVAS_BUILD \ 1504-DEFL_EVAS_BUILD \
1351@evas_image_loader_wbmp_cflags@ \ 1505@evas_image_loader_wbmp_cflags@ \
1352@EFL_CFLAGS@ \ 1506@EFL_CFLAGS@ \
@@ -1371,9 +1525,13 @@ loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la
1371modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c 1525modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c
1372modules_evas_loaders_webp_module_la_CPPFLAGS = \ 1526modules_evas_loaders_webp_module_la_CPPFLAGS = \
1373-I$(top_srcdir)/src/lib/eina \ 1527-I$(top_srcdir)/src/lib/eina \
1528-I$(top_builddir)/src/lib/eina \
1374-I$(top_srcdir)/src/lib/eo \ 1529-I$(top_srcdir)/src/lib/eo \
1530-I$(top_builddir)/src/lib/eo \
1375-I$(top_srcdir)/src/lib/evas \ 1531-I$(top_srcdir)/src/lib/evas \
1532-I$(top_builddir)/src/lib/evas \
1376-I$(top_srcdir)/src/lib/evas/include \ 1533-I$(top_srcdir)/src/lib/evas/include \
1534-I$(top_builddir)/src/lib/evas/include \
1377-DEFL_EVAS_BUILD \ 1535-DEFL_EVAS_BUILD \
1378@evas_image_loader_webp_cflags@ \ 1536@evas_image_loader_webp_cflags@ \
1379@EFL_CFLAGS@ \ 1537@EFL_CFLAGS@ \
@@ -1398,9 +1556,13 @@ loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la
1398modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c 1556modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c
1399modules_evas_loaders_xpm_module_la_CPPFLAGS = \ 1557modules_evas_loaders_xpm_module_la_CPPFLAGS = \
1400-I$(top_srcdir)/src/lib/eina \ 1558-I$(top_srcdir)/src/lib/eina \
1559-I$(top_builddir)/src/lib/eina \
1401-I$(top_srcdir)/src/lib/eo \ 1560-I$(top_srcdir)/src/lib/eo \
1561-I$(top_builddir)/src/lib/eo \
1402-I$(top_srcdir)/src/lib/evas \ 1562-I$(top_srcdir)/src/lib/evas \
1563-I$(top_builddir)/src/lib/evas \
1403-I$(top_srcdir)/src/lib/evas/include \ 1564-I$(top_srcdir)/src/lib/evas/include \
1565-I$(top_builddir)/src/lib/evas/include \
1404-DEFL_EVAS_BUILD \ 1566-DEFL_EVAS_BUILD \
1405@evas_image_loader_xpm_cflags@ \ 1567@evas_image_loader_xpm_cflags@ \
1406@EFL_CFLAGS@ \ 1568@EFL_CFLAGS@ \
@@ -1445,11 +1607,22 @@ lib/evas/cserve2/evas_cs2_utils.c
1445 1607
1446bin_evas_evas_cserve2_CPPFLAGS = \ 1608bin_evas_evas_cserve2_CPPFLAGS = \
1447-I$(top_srcdir)/src/lib/eina \ 1609-I$(top_srcdir)/src/lib/eina \
1610-I$(top_builddir)/src/lib/eina \
1448-I$(top_srcdir)/src/lib/eo \ 1611-I$(top_srcdir)/src/lib/eo \
1612-I$(top_builddir)/src/lib/eo \
1449-I$(top_srcdir)/src/lib/evas \ 1613-I$(top_srcdir)/src/lib/evas \
1614-I$(top_builddir)/src/lib/evas \
1450-I$(top_srcdir)/src/lib/evas/include \ 1615-I$(top_srcdir)/src/lib/evas/include \
1616-I$(top_builddir)/src/lib/evas/include \
1451-I$(top_srcdir)/src/lib/evas/cserve2 \ 1617-I$(top_srcdir)/src/lib/evas/cserve2 \
1618-I$(top_builddir)/src/lib/evas/cserve2 \
1452-I$(top_srcdir)/src/lib/eet \ 1619-I$(top_srcdir)/src/lib/eet \
1620-I$(top_builddir)/src/lib/eina \
1621-I$(top_builddir)/src/lib/eo \
1622-I$(top_builddir)/src/lib/evas \
1623-I$(top_builddir)/src/lib/evas/include \
1624-I$(top_builddir)/src/lib/evas/cserve2 \
1625-I$(top_builddir)/src/lib/eet \
1453-DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \ 1626-DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \
1454@EVAS_CFLAGS@ \ 1627@EVAS_CFLAGS@ \
1455@EFL_CFLAGS@ 1628@EFL_CFLAGS@
@@ -1466,10 +1639,15 @@ bin/evas/evas_cserve2_client.c
1466 1639
1467bin_evas_evas_cserve2_client_CPPFLAGS = \ 1640bin_evas_evas_cserve2_client_CPPFLAGS = \
1468-I$(top_srcdir)/src/lib/eina \ 1641-I$(top_srcdir)/src/lib/eina \
1642-I$(top_builddir)/src/lib/eina \
1469-I$(top_srcdir)/src/lib/eo \ 1643-I$(top_srcdir)/src/lib/eo \
1644-I$(top_builddir)/src/lib/eo \
1470-I$(top_srcdir)/src/lib/evas \ 1645-I$(top_srcdir)/src/lib/evas \
1646-I$(top_builddir)/src/lib/evas \
1471-I$(top_srcdir)/src/lib/evas/include \ 1647-I$(top_srcdir)/src/lib/evas/include \
1648-I$(top_builddir)/src/lib/evas/include \
1472-I$(top_srcdir)/src/lib/evas/cserve2 \ 1649-I$(top_srcdir)/src/lib/evas/cserve2 \
1650-I$(top_builddir)/src/lib/evas/cserve2 \
1473@EVAS_CFLAGS@ \ 1651@EVAS_CFLAGS@ \
1474@EFL_CFLAGS@ 1652@EFL_CFLAGS@
1475 1653
@@ -1478,10 +1656,15 @@ bin/evas/evas_cserve2_usage.c
1478 1656
1479bin_evas_evas_cserve2_usage_CPPFLAGS = \ 1657bin_evas_evas_cserve2_usage_CPPFLAGS = \
1480-I$(top_srcdir)/src/lib/eina \ 1658-I$(top_srcdir)/src/lib/eina \
1659-I$(top_builddir)/src/lib/eina \
1481-I$(top_srcdir)/src/lib/eo \ 1660-I$(top_srcdir)/src/lib/eo \
1661-I$(top_builddir)/src/lib/eo \
1482-I$(top_srcdir)/src/lib/evas \ 1662-I$(top_srcdir)/src/lib/evas \
1663-I$(top_builddir)/src/lib/evas \
1483-I$(top_srcdir)/src/lib/evas/include \ 1664-I$(top_srcdir)/src/lib/evas/include \
1665-I$(top_builddir)/src/lib/evas/include \
1484-I$(top_srcdir)/src/lib/evas/cserve2 \ 1666-I$(top_srcdir)/src/lib/evas/cserve2 \
1667-I$(top_builddir)/src/lib/evas/cserve2 \
1485@EVAS_CFLAGS@ \ 1668@EVAS_CFLAGS@ \
1486@EFL_CFLAGS@ 1669@EFL_CFLAGS@
1487 1670
@@ -1495,10 +1678,15 @@ bin/evas/evas_cserve2_debug.c
1495 1678
1496bin_evas_evas_cserve2_debug_CPPFLAGS = \ 1679bin_evas_evas_cserve2_debug_CPPFLAGS = \
1497-I$(top_srcdir)/src/lib/eina \ 1680-I$(top_srcdir)/src/lib/eina \
1681-I$(top_builddir)/src/lib/eina \
1498-I$(top_srcdir)/src/lib/eo \ 1682-I$(top_srcdir)/src/lib/eo \
1683-I$(top_builddir)/src/lib/eo \
1499-I$(top_srcdir)/src/lib/evas \ 1684-I$(top_srcdir)/src/lib/evas \
1685-I$(top_builddir)/src/lib/evas \
1500-I$(top_srcdir)/src/lib/evas/include \ 1686-I$(top_srcdir)/src/lib/evas/include \
1687-I$(top_builddir)/src/lib/evas/include \
1501-I$(top_srcdir)/src/lib/evas/cserve2 \ 1688-I$(top_srcdir)/src/lib/evas/cserve2 \
1689-I$(top_builddir)/src/lib/evas/cserve2 \
1502@EVAS_CFLAGS@ \ 1690@EVAS_CFLAGS@ \
1503@EFL_CFLAGS@ 1691@EFL_CFLAGS@
1504 1692
@@ -1513,10 +1701,15 @@ bin/evas/evas_cserve2_utils.c
1513 1701
1514bin_evas_evas_cserve2_slave_CPPFLAGS = \ 1702bin_evas_evas_cserve2_slave_CPPFLAGS = \
1515-I$(top_srcdir)/src/lib/eina \ 1703-I$(top_srcdir)/src/lib/eina \
1704-I$(top_builddir)/src/lib/eina \
1516-I$(top_srcdir)/src/lib/eo \ 1705-I$(top_srcdir)/src/lib/eo \
1706-I$(top_builddir)/src/lib/eo \
1517-I$(top_srcdir)/src/lib/evas \ 1707-I$(top_srcdir)/src/lib/evas \
1708-I$(top_builddir)/src/lib/evas \
1518-I$(top_srcdir)/src/lib/evas/include \ 1709-I$(top_srcdir)/src/lib/evas/include \
1710-I$(top_builddir)/src/lib/evas/include \
1519-I$(top_srcdir)/src/lib/evas/cserve2 \ 1711-I$(top_srcdir)/src/lib/evas/cserve2 \
1712-I$(top_builddir)/src/lib/evas/cserve2 \
1520-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 1713-DPACKAGE_LIB_DIR=\"$(libdir)\" \
1521@EVAS_CFLAGS@ \ 1714@EVAS_CFLAGS@ \
1522@EFL_CFLAGS@ 1715@EFL_CFLAGS@
@@ -1533,10 +1726,15 @@ bin/evas/dummy_slave.c
1533 1726
1534bin_evas_dummy_slave_CPPFLAGS = \ 1727bin_evas_dummy_slave_CPPFLAGS = \
1535-I$(top_srcdir)/src/lib/eina \ 1728-I$(top_srcdir)/src/lib/eina \
1729-I$(top_builddir)/src/lib/eina \
1536-I$(top_srcdir)/src/lib/eo \ 1730-I$(top_srcdir)/src/lib/eo \
1731-I$(top_builddir)/src/lib/eo \
1537-I$(top_srcdir)/src/lib/evas \ 1732-I$(top_srcdir)/src/lib/evas \
1733-I$(top_builddir)/src/lib/evas \
1538-I$(top_srcdir)/src/lib/evas/include \ 1734-I$(top_srcdir)/src/lib/evas/include \
1735-I$(top_builddir)/src/lib/evas/include \
1539-I$(top_srcdir)/src/lib/evas/cserve2 \ 1736-I$(top_srcdir)/src/lib/evas/cserve2 \
1737-I$(top_builddir)/src/lib/evas/cserve2 \
1540@EVAS_CFLAGS@ \ 1738@EVAS_CFLAGS@ \
1541@EFL_CFLAGS@ 1739@EFL_CFLAGS@
1542 1740
@@ -1552,11 +1750,17 @@ cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la
1552bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c 1750bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c
1553bin_evas_loaders_bmp_module_la_CPPFLAGS = \ 1751bin_evas_loaders_bmp_module_la_CPPFLAGS = \
1554-I$(top_srcdir)/src/lib/eina \ 1752-I$(top_srcdir)/src/lib/eina \
1753-I$(top_builddir)/src/lib/eina \
1555-I$(top_srcdir)/src/lib/eo \ 1754-I$(top_srcdir)/src/lib/eo \
1755-I$(top_builddir)/src/lib/eo \
1556-I$(top_srcdir)/src/lib/evas \ 1756-I$(top_srcdir)/src/lib/evas \
1757-I$(top_builddir)/src/lib/evas \
1557-I$(top_srcdir)/src/lib/evas/include \ 1758-I$(top_srcdir)/src/lib/evas/include \
1759-I$(top_builddir)/src/lib/evas/include \
1558-I$(top_srcdir)/src/lib/evas/cserve2 \ 1760-I$(top_srcdir)/src/lib/evas/cserve2 \
1761-I$(top_builddir)/src/lib/evas/cserve2 \
1559-I$(top_srcdir)/src/bin/evas \ 1762-I$(top_srcdir)/src/bin/evas \
1763-I$(top_builddir)/src/bin/evas \
1560@EFL_CFLAGS@ \ 1764@EFL_CFLAGS@ \
1561@EVAS_CFLAGS@ 1765@EVAS_CFLAGS@
1562bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm 1766bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm
@@ -1570,12 +1774,19 @@ cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la
1570bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c 1774bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c
1571bin_evas_loaders_eet_module_la_CPPFLAGS = \ 1775bin_evas_loaders_eet_module_la_CPPFLAGS = \
1572-I$(top_srcdir)/src/lib/eina \ 1776-I$(top_srcdir)/src/lib/eina \
1777-I$(top_builddir)/src/lib/eina \
1573-I$(top_srcdir)/src/lib/eo \ 1778-I$(top_srcdir)/src/lib/eo \
1779-I$(top_builddir)/src/lib/eo \
1574-I$(top_srcdir)/src/lib/eet \ 1780-I$(top_srcdir)/src/lib/eet \
1781-I$(top_builddir)/src/lib/eet \
1575-I$(top_srcdir)/src/lib/evas \ 1782-I$(top_srcdir)/src/lib/evas \
1783-I$(top_builddir)/src/lib/evas \
1576-I$(top_srcdir)/src/lib/evas/include \ 1784-I$(top_srcdir)/src/lib/evas/include \
1785-I$(top_builddir)/src/lib/evas/include \
1577-I$(top_srcdir)/src/lib/evas/cserve2 \ 1786-I$(top_srcdir)/src/lib/evas/cserve2 \
1787-I$(top_builddir)/src/lib/evas/cserve2 \
1578-I$(top_srcdir)/src/bin/evas \ 1788-I$(top_srcdir)/src/bin/evas \
1789-I$(top_builddir)/src/bin/evas \
1579@evas_image_loader_eet_cflags@ \ 1790@evas_image_loader_eet_cflags@ \
1580@EFL_CFLAGS@ \ 1791@EFL_CFLAGS@ \
1581@EVAS_CFLAGS@ 1792@EVAS_CFLAGS@
@@ -1592,11 +1803,17 @@ cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la
1592bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c 1803bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c
1593bin_evas_loaders_ico_module_la_CPPFLAGS = \ 1804bin_evas_loaders_ico_module_la_CPPFLAGS = \
1594-I$(top_srcdir)/src/lib/eina \ 1805-I$(top_srcdir)/src/lib/eina \
1806-I$(top_builddir)/src/lib/eina \
1595-I$(top_srcdir)/src/lib/eo \ 1807-I$(top_srcdir)/src/lib/eo \
1808-I$(top_builddir)/src/lib/eo \
1596-I$(top_srcdir)/src/lib/evas \ 1809-I$(top_srcdir)/src/lib/evas \
1810-I$(top_builddir)/src/lib/evas \
1597-I$(top_srcdir)/src/lib/evas/include \ 1811-I$(top_srcdir)/src/lib/evas/include \
1812-I$(top_builddir)/src/lib/evas/include \
1598-I$(top_srcdir)/src/lib/evas/cserve2 \ 1813-I$(top_srcdir)/src/lib/evas/cserve2 \
1814-I$(top_builddir)/src/lib/evas/cserve2 \
1599-I$(top_srcdir)/src/bin/evas \ 1815-I$(top_srcdir)/src/bin/evas \
1816-I$(top_builddir)/src/bin/evas \
1600@evas_image_loader_ico_cflags@ \ 1817@evas_image_loader_ico_cflags@ \
1601@EFL_CFLAGS@ \ 1818@EFL_CFLAGS@ \
1602@EVAS_CFLAGS@ 1819@EVAS_CFLAGS@
@@ -1611,11 +1828,17 @@ cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la
1611bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c 1828bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c
1612bin_evas_loaders_jpeg_module_la_CPPFLAGS = \ 1829bin_evas_loaders_jpeg_module_la_CPPFLAGS = \
1613-I$(top_srcdir)/src/lib/eina \ 1830-I$(top_srcdir)/src/lib/eina \
1831-I$(top_builddir)/src/lib/eina \
1614-I$(top_srcdir)/src/lib/eo \ 1832-I$(top_srcdir)/src/lib/eo \
1833-I$(top_builddir)/src/lib/eo \
1615-I$(top_srcdir)/src/lib/evas \ 1834-I$(top_srcdir)/src/lib/evas \
1835-I$(top_builddir)/src/lib/evas \
1616-I$(top_srcdir)/src/lib/evas/include \ 1836-I$(top_srcdir)/src/lib/evas/include \
1837-I$(top_builddir)/src/lib/evas/include \
1617-I$(top_srcdir)/src/lib/evas/cserve2 \ 1838-I$(top_srcdir)/src/lib/evas/cserve2 \
1839-I$(top_builddir)/src/lib/evas/cserve2 \
1618-I$(top_srcdir)/src/bin/evas \ 1840-I$(top_srcdir)/src/bin/evas \
1841-I$(top_builddir)/src/bin/evas \
1619@evas_image_loader_jpeg_cflags@ \ 1842@evas_image_loader_jpeg_cflags@ \
1620@EFL_CFLAGS@ \ 1843@EFL_CFLAGS@ \
1621@EVAS_CFLAGS@ 1844@EVAS_CFLAGS@
@@ -1630,11 +1853,17 @@ cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la
1630bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c 1853bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c
1631bin_evas_loaders_pmaps_module_la_CPPFLAGS = \ 1854bin_evas_loaders_pmaps_module_la_CPPFLAGS = \
1632-I$(top_srcdir)/src/lib/eina \ 1855-I$(top_srcdir)/src/lib/eina \
1856-I$(top_builddir)/src/lib/eina \
1633-I$(top_srcdir)/src/lib/eo \ 1857-I$(top_srcdir)/src/lib/eo \
1858-I$(top_builddir)/src/lib/eo \
1634-I$(top_srcdir)/src/lib/evas \ 1859-I$(top_srcdir)/src/lib/evas \
1860-I$(top_builddir)/src/lib/evas \
1635-I$(top_srcdir)/src/lib/evas/include \ 1861-I$(top_srcdir)/src/lib/evas/include \
1862-I$(top_builddir)/src/lib/evas/include \
1636-I$(top_srcdir)/src/lib/evas/cserve2 \ 1863-I$(top_srcdir)/src/lib/evas/cserve2 \
1864-I$(top_builddir)/src/lib/evas/cserve2 \
1637-I$(top_srcdir)/src/bin/evas \ 1865-I$(top_srcdir)/src/bin/evas \
1866-I$(top_builddir)/src/bin/evas \
1638@evas_image_loader_pmaps_cflags@ \ 1867@evas_image_loader_pmaps_cflags@ \
1639@EFL_CFLAGS@ \ 1868@EFL_CFLAGS@ \
1640@EVAS_CFLAGS@ 1869@EVAS_CFLAGS@
@@ -1649,11 +1878,17 @@ cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la
1649bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c 1878bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c
1650bin_evas_loaders_png_module_la_CPPFLAGS = \ 1879bin_evas_loaders_png_module_la_CPPFLAGS = \
1651-I$(top_srcdir)/src/lib/eina \ 1880-I$(top_srcdir)/src/lib/eina \
1881-I$(top_builddir)/src/lib/eina \
1652-I$(top_srcdir)/src/lib/eo \ 1882-I$(top_srcdir)/src/lib/eo \
1883-I$(top_builddir)/src/lib/eo \
1653-I$(top_srcdir)/src/lib/evas \ 1884-I$(top_srcdir)/src/lib/evas \
1885-I$(top_builddir)/src/lib/evas \
1654-I$(top_srcdir)/src/lib/evas/include \ 1886-I$(top_srcdir)/src/lib/evas/include \
1887-I$(top_builddir)/src/lib/evas/include \
1655-I$(top_srcdir)/src/lib/evas/cserve2 \ 1888-I$(top_srcdir)/src/lib/evas/cserve2 \
1889-I$(top_builddir)/src/lib/evas/cserve2 \
1656-I$(top_srcdir)/src/bin/evas \ 1890-I$(top_srcdir)/src/bin/evas \
1891-I$(top_builddir)/src/bin/evas \
1657@evas_image_loader_png_cflags@ \ 1892@evas_image_loader_png_cflags@ \
1658@EFL_CFLAGS@ \ 1893@EFL_CFLAGS@ \
1659@EVAS_CFLAGS@ 1894@EVAS_CFLAGS@
@@ -1668,11 +1903,17 @@ cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la
1668bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c 1903bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c
1669bin_evas_loaders_psd_module_la_CPPFLAGS = \ 1904bin_evas_loaders_psd_module_la_CPPFLAGS = \
1670-I$(top_srcdir)/src/lib/eina \ 1905-I$(top_srcdir)/src/lib/eina \
1906-I$(top_builddir)/src/lib/eina \
1671-I$(top_srcdir)/src/lib/eo \ 1907-I$(top_srcdir)/src/lib/eo \
1908-I$(top_builddir)/src/lib/eo \
1672-I$(top_srcdir)/src/lib/evas \ 1909-I$(top_srcdir)/src/lib/evas \
1910-I$(top_builddir)/src/lib/evas \
1673-I$(top_srcdir)/src/lib/evas/include \ 1911-I$(top_srcdir)/src/lib/evas/include \
1912-I$(top_builddir)/src/lib/evas/include \
1674-I$(top_srcdir)/src/lib/evas/cserve2 \ 1913-I$(top_srcdir)/src/lib/evas/cserve2 \
1914-I$(top_builddir)/src/lib/evas/cserve2 \
1675-I$(top_srcdir)/src/bin/evas \ 1915-I$(top_srcdir)/src/bin/evas \
1916-I$(top_builddir)/src/bin/evas \
1676@evas_image_loader_psd_cflags@ \ 1917@evas_image_loader_psd_cflags@ \
1677@EFL_CFLAGS@ \ 1918@EFL_CFLAGS@ \
1678@EVAS_CFLAGS@ 1919@EVAS_CFLAGS@
@@ -1687,11 +1928,17 @@ cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la
1687bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c 1928bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c
1688bin_evas_loaders_tga_module_la_CPPFLAGS = \ 1929bin_evas_loaders_tga_module_la_CPPFLAGS = \
1689-I$(top_srcdir)/src/lib/eina \ 1930-I$(top_srcdir)/src/lib/eina \
1931-I$(top_builddir)/src/lib/eina \
1690-I$(top_srcdir)/src/lib/eo \ 1932-I$(top_srcdir)/src/lib/eo \
1933-I$(top_builddir)/src/lib/eo \
1691-I$(top_srcdir)/src/lib/evas \ 1934-I$(top_srcdir)/src/lib/evas \
1935-I$(top_builddir)/src/lib/evas \
1692-I$(top_srcdir)/src/lib/evas/include \ 1936-I$(top_srcdir)/src/lib/evas/include \
1937-I$(top_builddir)/src/lib/evas/include \
1693-I$(top_srcdir)/src/lib/evas/cserve2 \ 1938-I$(top_srcdir)/src/lib/evas/cserve2 \
1939-I$(top_builddir)/src/lib/evas/cserve2 \
1694-I$(top_srcdir)/src/bin/evas \ 1940-I$(top_srcdir)/src/bin/evas \
1941-I$(top_builddir)/src/bin/evas \
1695@evas_image_loader_tga_cflags@ \ 1942@evas_image_loader_tga_cflags@ \
1696@EFL_CFLAGS@ \ 1943@EFL_CFLAGS@ \
1697@EVAS_CFLAGS@ 1944@EVAS_CFLAGS@
@@ -1706,11 +1953,17 @@ cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la
1706bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c 1953bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c
1707bin_evas_loaders_tiff_module_la_CPPFLAGS = \ 1954bin_evas_loaders_tiff_module_la_CPPFLAGS = \
1708-I$(top_srcdir)/src/lib/eina \ 1955-I$(top_srcdir)/src/lib/eina \
1956-I$(top_builddir)/src/lib/eina \
1709-I$(top_srcdir)/src/lib/eo \ 1957-I$(top_srcdir)/src/lib/eo \
1958-I$(top_builddir)/src/lib/eo \
1710-I$(top_srcdir)/src/lib/evas \ 1959-I$(top_srcdir)/src/lib/evas \
1960-I$(top_builddir)/src/lib/evas \
1711-I$(top_srcdir)/src/lib/evas/include \ 1961-I$(top_srcdir)/src/lib/evas/include \
1962-I$(top_builddir)/src/lib/evas/include \
1712-I$(top_srcdir)/src/lib/evas/cserve2 \ 1963-I$(top_srcdir)/src/lib/evas/cserve2 \
1964-I$(top_builddir)/src/lib/evas/cserve2 \
1713-I$(top_srcdir)/src/bin/evas \ 1965-I$(top_srcdir)/src/bin/evas \
1966-I$(top_builddir)/src/bin/evas \
1714@evas_image_loader_tiff_cflags@ \ 1967@evas_image_loader_tiff_cflags@ \
1715@EFL_CFLAGS@ \ 1968@EFL_CFLAGS@ \
1716@EVAS_CFLAGS@ 1969@EVAS_CFLAGS@
@@ -1725,11 +1978,17 @@ cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la
1725bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c 1978bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c
1726bin_evas_loaders_wbmp_module_la_CPPFLAGS = \ 1979bin_evas_loaders_wbmp_module_la_CPPFLAGS = \
1727-I$(top_srcdir)/src/lib/eina \ 1980-I$(top_srcdir)/src/lib/eina \
1981-I$(top_builddir)/src/lib/eina \
1728-I$(top_srcdir)/src/lib/eo \ 1982-I$(top_srcdir)/src/lib/eo \
1983-I$(top_builddir)/src/lib/eo \
1729-I$(top_srcdir)/src/lib/evas \ 1984-I$(top_srcdir)/src/lib/evas \
1985-I$(top_builddir)/src/lib/evas \
1730-I$(top_srcdir)/src/lib/evas/include \ 1986-I$(top_srcdir)/src/lib/evas/include \
1987-I$(top_builddir)/src/lib/evas/include \
1731-I$(top_srcdir)/src/lib/evas/cserve2 \ 1988-I$(top_srcdir)/src/lib/evas/cserve2 \
1989-I$(top_builddir)/src/lib/evas/cserve2 \
1732-I$(top_srcdir)/src/bin/evas \ 1990-I$(top_srcdir)/src/bin/evas \
1991-I$(top_builddir)/src/bin/evas \
1733@evas_image_loader_wbmp_cflags@ \ 1992@evas_image_loader_wbmp_cflags@ \
1734@EFL_CFLAGS@ \ 1993@EFL_CFLAGS@ \
1735@EVAS_CFLAGS@ 1994@EVAS_CFLAGS@
@@ -1744,11 +2003,17 @@ cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la
1744bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c 2003bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c
1745bin_evas_loaders_webp_module_la_CPPFLAGS = \ 2004bin_evas_loaders_webp_module_la_CPPFLAGS = \
1746-I$(top_srcdir)/src/lib/eina \ 2005-I$(top_srcdir)/src/lib/eina \
2006-I$(top_builddir)/src/lib/eina \
1747-I$(top_srcdir)/src/lib/eo \ 2007-I$(top_srcdir)/src/lib/eo \
2008-I$(top_builddir)/src/lib/eo \
1748-I$(top_srcdir)/src/lib/evas \ 2009-I$(top_srcdir)/src/lib/evas \
2010-I$(top_builddir)/src/lib/evas \
1749-I$(top_srcdir)/src/lib/evas/include \ 2011-I$(top_srcdir)/src/lib/evas/include \
2012-I$(top_builddir)/src/lib/evas/include \
1750-I$(top_srcdir)/src/lib/evas/cserve2 \ 2013-I$(top_srcdir)/src/lib/evas/cserve2 \
2014-I$(top_builddir)/src/lib/evas/cserve2 \
1751-I$(top_srcdir)/src/bin/evas \ 2015-I$(top_srcdir)/src/bin/evas \
2016-I$(top_builddir)/src/bin/evas \
1752@evas_image_loader_webp_cflags@ \ 2017@evas_image_loader_webp_cflags@ \
1753@EFL_CFLAGS@ \ 2018@EFL_CFLAGS@ \
1754@EVAS_CFLAGS@ 2019@EVAS_CFLAGS@
@@ -1763,11 +2028,17 @@ cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la
1763bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c 2028bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c
1764bin_evas_loaders_xpm_module_la_CPPFLAGS = \ 2029bin_evas_loaders_xpm_module_la_CPPFLAGS = \
1765-I$(top_srcdir)/src/lib/eina \ 2030-I$(top_srcdir)/src/lib/eina \
2031-I$(top_builddir)/src/lib/eina \
1766-I$(top_srcdir)/src/lib/eo \ 2032-I$(top_srcdir)/src/lib/eo \
2033-I$(top_builddir)/src/lib/eo \
1767-I$(top_srcdir)/src/lib/evas \ 2034-I$(top_srcdir)/src/lib/evas \
2035-I$(top_builddir)/src/lib/evas \
1768-I$(top_srcdir)/src/lib/evas/include \ 2036-I$(top_srcdir)/src/lib/evas/include \
2037-I$(top_builddir)/src/lib/evas/include \
1769-I$(top_srcdir)/src/lib/evas/cserve2 \ 2038-I$(top_srcdir)/src/lib/evas/cserve2 \
2039-I$(top_builddir)/src/lib/evas/cserve2 \
1770-I$(top_srcdir)/src/bin/evas \ 2040-I$(top_srcdir)/src/bin/evas \
2041-I$(top_builddir)/src/bin/evas \
1771@evas_image_loader_xpm_cflags@ \ 2042@evas_image_loader_xpm_cflags@ \
1772@EFL_CFLAGS@ \ 2043@EFL_CFLAGS@ \
1773@EVAS_CFLAGS@ 2044@EVAS_CFLAGS@
@@ -1797,6 +2068,9 @@ tests_evas_evas_suite_CPPFLAGS = \
1797-I$(top_srcdir)/src/lib/eina \ 2068-I$(top_srcdir)/src/lib/eina \
1798-I$(top_srcdir)/src/lib/eo \ 2069-I$(top_srcdir)/src/lib/eo \
1799-I$(top_srcdir)/src/lib/evas \ 2070-I$(top_srcdir)/src/lib/evas \
2071-I$(top_builddir)/src/lib/eina \
2072-I$(top_builddir)/src/lib/eo \
2073-I$(top_builddir)/src/lib/evas \
1800@CHECK_CFLAGS@ \ 2074@CHECK_CFLAGS@ \
1801@EVAS_CFLAGS@ 2075@EVAS_CFLAGS@
1802 2076
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 44afbdf..531f5b0 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -96,6 +96,7 @@ 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 \
99@EVIL_CPPFLAGS@ 100@EVIL_CPPFLAGS@
100lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ 101lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@
101lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ 102lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
@@ -112,6 +113,7 @@ lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
112 113
113lib_evil_libdl_la_CPPFLAGS = \ 114lib_evil_libdl_la_CPPFLAGS = \
114-I$(top_srcdir)/src/lib/evil \ 115-I$(top_srcdir)/src/lib/evil \
116-I$(top_builddir)/src/lib/evil \
115@EVIL_DLFCN_CPPFLAGS@ 117@EVIL_DLFCN_CPPFLAGS@
116 118
117lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@ 119lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@