summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-04-24 23:43:33 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-04-24 23:43:33 +0900
commitdaac3fb794ce8ddcaa825066627ee72858b86264 (patch)
treeb004dadec5cbcbd52edb8be046316048d1b4b68d
parenta87fc36b12fd898b3e0fb3802e03f0a6d17449c6 (diff)
add a global Efl_Config.h for everyone.
* ned to replicate changes in other .pc.in files * need to replicate changes in other E*.h installed header files
Diffstat (limited to '')
-rw-r--r--.gitignore3
-rw-r--r--configure.ac1
-rw-r--r--pc/ecore.pc.in2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile_EPhysics.am2
-rw-r--r--src/Makefile_Ecore.am4
-rw-r--r--src/Makefile_Ecore_Audio.am2
-rw-r--r--src/Makefile_Ecore_Cocoa.am2
-rw-r--r--src/Makefile_Ecore_Con.am2
-rw-r--r--src/Makefile_Ecore_Evas.am18
-rw-r--r--src/Makefile_Ecore_FB.am2
-rw-r--r--src/Makefile_Ecore_File.am2
-rw-r--r--src/Makefile_Ecore_IMF.am8
-rw-r--r--src/Makefile_Ecore_IMF_Evas.am2
-rw-r--r--src/Makefile_Ecore_Input.am2
-rw-r--r--src/Makefile_Ecore_Input_Evas.am2
-rw-r--r--src/Makefile_Ecore_Ipc.am2
-rw-r--r--src/Makefile_Ecore_Psl1ght.am2
-rw-r--r--src/Makefile_Ecore_SDL.am2
-rw-r--r--src/Makefile_Ecore_Wayland.am2
-rw-r--r--src/Makefile_Ecore_Win32.am2
-rw-r--r--src/Makefile_Ecore_WinCE.am2
-rw-r--r--src/Makefile_Ecore_X.am2
-rw-r--r--src/Makefile_Edje.am28
-rw-r--r--src/Makefile_Eet.am6
-rw-r--r--src/Makefile_Eeze.am22
-rw-r--r--src/Makefile_Efl.am3
-rw-r--r--src/Makefile_Efreet.am30
-rw-r--r--src/Makefile_Eina.am8
-rw-r--r--src/Makefile_Eio.am2
-rw-r--r--src/Makefile_Eldbus.am6
-rw-r--r--src/Makefile_Embryo.am4
-rw-r--r--src/Makefile_Emotion.am12
-rw-r--r--src/Makefile_Eo.am18
-rw-r--r--src/Makefile_Escape.am2
-rw-r--r--src/Makefile_Ethumb.am6
-rw-r--r--src/Makefile_Ethumb_Client.am8
-rw-r--r--src/Makefile_Evas.am108
-rw-r--r--src/Makefile_Evil.am4
-rw-r--r--src/lib/ecore/Ecore.h2
-rw-r--r--src/lib/efl/Efl_Config.h.in6
41 files changed, 180 insertions, 165 deletions
diff --git a/.gitignore b/.gitignore
index d24538e..483b916 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ tags
72/src/bin/evas/evas_cserve2_usage 72/src/bin/evas/evas_cserve2_usage
73/src/lib/eina/eina_config.h 73/src/lib/eina/eina_config.h
74/src/lib/ecore_x/ecore_x_version.h 74/src/lib/ecore_x/ecore_x_version.h
75/src/lib/efl/Efl_Config.h
75/src/bin/eldbus/eldbus-codegen 76/src/bin/eldbus/eldbus-codegen
76/src/bin/efreet/efreet_desktop_cache_create 77/src/bin/efreet/efreet_desktop_cache_create
77/src/bin/efreet/efreet_icon_cache_create 78/src/bin/efreet/efreet_icon_cache_create
@@ -332,4 +333,4 @@ tags
332/src/tests/evas/check-results.xml 333/src/tests/evas/check-results.xml
333/coverage 334/coverage
334/data/eo/libeo-gdb.py 335/data/eo/libeo-gdb.py
335/data/libeo.so.*-gdb.py \ No newline at end of file 336/data/libeo.so.*-gdb.py
diff --git a/configure.ac b/configure.ac
index a64251a..f8d1d9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3669,6 +3669,7 @@ src/examples/emotion/Makefile
3669src/examples/ethumb_client/Makefile 3669src/examples/ethumb_client/Makefile
3670src/lib/eina/eina_config.h 3670src/lib/eina/eina_config.h
3671src/lib/ecore_x/ecore_x_version.h 3671src/lib/ecore_x/ecore_x_version.h
3672src/lib/efl/Efl_Config.h
3672spec/efl.spec 3673spec/efl.spec
3673pkgbuild/PKGBUILD 3674pkgbuild/PKGBUILD
3674pc/evil.pc 3675pc/evil.pc
diff --git a/pc/ecore.pc.in b/pc/ecore.pc.in
index 0fbe8f7..2f0de2a 100644
--- a/pc/ecore.pc.in
+++ b/pc/ecore.pc.in
@@ -9,4 +9,4 @@ Requires.private: @requirements_pc_ecore@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lecore 10Libs: -L${libdir} -lecore
11Libs.private: @requirements_libs_ecore@ 11Libs.private: @requirements_libs_ecore@
12Cflags: -I${includedir}/ecore-@VMAJ@ 12Cflags: -I${includedir}/ecore-@VMAJ@ -I${includedir}/efl-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index 4821ebf..7021ff3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,8 @@ check_PROGRAMS =
15TESTS = 15TESTS =
16EXTRA_DIST = 16EXTRA_DIST =
17 17
18include Makefile_Efl.am
19
18include Makefile_Evil.am 20include Makefile_Evil.am
19include Makefile_Escape.am 21include Makefile_Escape.am
20 22
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
index 33748ef..708248a 100644
--- a/src/Makefile_EPhysics.am
+++ b/src/Makefile_EPhysics.am
@@ -21,7 +21,7 @@ lib/ephysics/ephysics_quaternion.cpp \
21lib/ephysics/ephysics_shape.cpp \ 21lib/ephysics/ephysics_shape.cpp \
22lib/ephysics/ephysics_world.cpp 22lib/ephysics/ephysics_world.cpp
23 23
24lib_ephysics_libephysics_la_CPPFLAGS = @EPHYSICS_CFLAGS@ 24lib_ephysics_libephysics_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EPHYSICS_CFLAGS@
25lib_ephysics_libephysics_la_LIBADD = @EPHYSICS_LIBS@ 25lib_ephysics_libephysics_la_LIBADD = @EPHYSICS_LIBS@
26lib_ephysics_libephysics_la_DEPENDENCIES = @EPHYSICS_INTERNAL_LIBS@ 26lib_ephysics_libephysics_la_DEPENDENCIES = @EPHYSICS_INTERNAL_LIBS@
27lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 27lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index d5c0b1c..c3728ba 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -52,7 +52,7 @@ lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_signal.c lib/ecore/ecore_exe.c
52endif 52endif
53endif 53endif
54 54
55lib_ecore_libecore_la_CPPFLAGS = @ECORE_CFLAGS@ 55lib_ecore_libecore_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_CFLAGS@
56lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@ 56lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
57lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@ 57lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
58lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 58lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -75,7 +75,7 @@ tests/ecore/ecore_test_timer.c \
75tests/ecore/ecore_test_ecore_evas.c \ 75tests/ecore/ecore_test_ecore_evas.c \
76tests/ecore/ecore_suite.h 76tests/ecore/ecore_suite.h
77 77
78tests_ecore_ecore_suite_CPPFLAGS = \ 78tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
79-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \ 79-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore\" \
80-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \ 80-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore\" \
81@CHECK_CFLAGS@ \ 81@CHECK_CFLAGS@ \
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 06a3e03..b224906 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -22,7 +22,7 @@ lib/ecore_audio/ecore_audio_obj_out.c \
22lib/ecore_audio/ecore_audio_obj_in_tone.c \ 22lib/ecore_audio/ecore_audio_obj_in_tone.c \
23lib/ecore_audio/ecore_audio_private.h 23lib/ecore_audio/ecore_audio_private.h
24 24
25lib_ecore_audio_libecore_audio_la_CPPFLAGS = @ECORE_AUDIO_CFLAGS@ 25lib_ecore_audio_libecore_audio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AUDIO_CFLAGS@
26lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@ 26lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@
27lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@ 27lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
28lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 28lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index 5b11277..56e4549 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -14,7 +14,7 @@ lib/ecore_cocoa/ecore_cocoa.m \
14lib/ecore_cocoa/ecore_cocoa_window.m \ 14lib/ecore_cocoa/ecore_cocoa_window.m \
15lib/ecore_cocoa/ecore_cocoa_private.h 15lib/ecore_cocoa/ecore_cocoa_private.h
16 16
17lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = @ECORE_COCOA_CFLAGS@ 17lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_COCOA_CFLAGS@
18lib_ecore_cocoa_libecore_cocoa_la_LIBADD = @ECORE_COCOA_LIBS@ 18lib_ecore_cocoa_libecore_cocoa_la_LIBADD = @ECORE_COCOA_LIBS@
19lib_ecore_cocoa_libecore_cocoa_la_DEPENDENCIES = @ECORE_COCOA_INTERNAL_LIBS@ 19lib_ecore_cocoa_libecore_cocoa_la_DEPENDENCIES = @ECORE_COCOA_INTERNAL_LIBS@
20lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 20lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index b973fbe..06ea520 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -33,7 +33,7 @@ lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c
33endif 33endif
34endif 34endif
35 35
36lib_ecore_con_libecore_con_la_CPPFLAGS = @ECORE_CON_CFLAGS@ 36lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_CON_CFLAGS@
37lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@ 37lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@
38lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@ 38lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
39lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 39lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index a710643..4f8c34a 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -22,7 +22,7 @@ lib/ecore_evas/ecore_evas_win32.h \
22lib/ecore_evas/ecore_evas_x11.h \ 22lib/ecore_evas/ecore_evas_x11.h \
23lib/ecore_evas/ecore_evas_util.c 23lib/ecore_evas/ecore_evas_util.c
24 24
25lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ 25lib_ecore_evas_libecore_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
26-I$(top_srcdir)/src/modules/evas/engines/buffer \ 26-I$(top_srcdir)/src/modules/evas/engines/buffer \
27-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 27-DPACKAGE_LIB_DIR=\"$(libdir)\" \
28-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 28-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
@@ -41,7 +41,7 @@ modules/ecore_evas/engines/extn/ecore_evas_extn_buf.c
41ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH) 41ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH)
42ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la 42ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la
43modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES) 43modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES)
44modules_ecore_evas_engines_extn_module_la_CPPFLAGS = \ 44modules_ecore_evas_engines_extn_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
45@ECORE_EVAS_CFLAGS@ \ 45@ECORE_EVAS_CFLAGS@ \
46@ECORE_IPC_CFLAGS@ \ 46@ECORE_IPC_CFLAGS@ \
47-I$(top_srcdir)/src/modules/evas/engines/buffer \ 47-I$(top_srcdir)/src/modules/evas/engines/buffer \
@@ -62,7 +62,7 @@ XSOURCES = modules/ecore_evas/engines/x/ecore_evas_x.c
62ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH) 62ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH)
63ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la 63ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la
64modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES) 64modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES)
65modules_ecore_evas_engines_x_module_la_CPPFLAGS = \ 65modules_ecore_evas_engines_x_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
66@ECORE_EVAS_CFLAGS@ \ 66@ECORE_EVAS_CFLAGS@ \
67@ECORE_X_CFLAGS@ \ 67@ECORE_X_CFLAGS@ \
68-I$(top_srcdir)/src/modules/evas/engines/software_x11 \ 68-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
@@ -82,7 +82,7 @@ COCOASOURCES = modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
82ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH) 82ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH)
83ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la 83ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la
84modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES) 84modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES)
85modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \ 85modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
86@ECORE_EVAS_CFLAGS@ \ 86@ECORE_EVAS_CFLAGS@ \
87@ECORE_COCOA_CFLAGS@ \ 87@ECORE_COCOA_CFLAGS@ \
88-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa 88-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa
@@ -101,7 +101,7 @@ FBSOURCES = modules/ecore_evas/engines/fb/ecore_evas_fb.c
101ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH) 101ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH)
102ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la 102ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la
103modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES) 103modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES)
104modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \ 104modules_ecore_evas_engines_fb_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
105@ECORE_EVAS_CFLAGS@ \ 105@ECORE_EVAS_CFLAGS@ \
106@ECORE_FB_CFLAGS@ \ 106@ECORE_FB_CFLAGS@ \
107-I$(top_srcdir)/src/modules/evas/engines/fb 107-I$(top_srcdir)/src/modules/evas/engines/fb
@@ -120,7 +120,7 @@ PSL1GHTSOURCES = modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
120ecoreevasenginepsl1ghtpkgdir = $(libdir)/ecore_evas/engines/psl1ght/$(MODULE_ARCH) 120ecoreevasenginepsl1ghtpkgdir = $(libdir)/ecore_evas/engines/psl1ght/$(MODULE_ARCH)
121ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la 121ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la
122modules_ecore_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHTSOURCES) 122modules_ecore_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHTSOURCES)
123modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \ 123modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
124@ECORE_EVAS_CFLAGS@ \ 124@ECORE_EVAS_CFLAGS@ \
125@ECORE_PSL1GHT_CFLAGS@ \ 125@ECORE_PSL1GHT_CFLAGS@ \
126-I$(top_srcdir)/src/modules/evas/engines/psl1ght 126-I$(top_srcdir)/src/modules/evas/engines/psl1ght
@@ -143,7 +143,7 @@ modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
143ecoreevasenginewaylandpkgdir = $(libdir)/ecore_evas/engines/wayland/$(MODULE_ARCH) 143ecoreevasenginewaylandpkgdir = $(libdir)/ecore_evas/engines/wayland/$(MODULE_ARCH)
144ecoreevasenginewaylandpkg_LTLIBRARIES = modules/ecore_evas/engines/wayland/module.la 144ecoreevasenginewaylandpkg_LTLIBRARIES = modules/ecore_evas/engines/wayland/module.la
145modules_ecore_evas_engines_wayland_module_la_SOURCES = $(WAYLANDSOURCES) 145modules_ecore_evas_engines_wayland_module_la_SOURCES = $(WAYLANDSOURCES)
146modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = \ 146modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
147@ECORE_EVAS_CFLAGS@ \ 147@ECORE_EVAS_CFLAGS@ \
148@ECORE_WAYLAND_CFLAGS@ \ 148@ECORE_WAYLAND_CFLAGS@ \
149-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \ 149-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
@@ -165,7 +165,7 @@ modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
165ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH) 165ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH)
166ecoreevasenginesdlpkg_LTLIBRARIES = modules/ecore_evas/engines/sdl/module.la 166ecoreevasenginesdlpkg_LTLIBRARIES = modules/ecore_evas/engines/sdl/module.la
167modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES) 167modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES)
168modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \ 168modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
169@ECORE_EVAS_CFLAGS@ \ 169@ECORE_EVAS_CFLAGS@ \
170@ECORE_SDL_CFLAGS@ \ 170@ECORE_SDL_CFLAGS@ \
171-I$(top_srcdir)/src/modules/evas/engines/buffer \ 171-I$(top_srcdir)/src/modules/evas/engines/buffer \
@@ -186,7 +186,7 @@ modules/ecore_evas/engines/win32/ecore_evas_win32.c
186ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH) 186ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH)
187ecoreevasengineswin32pkg_LTLIBRARIES = modules/ecore_evas/engines/win32/module.la 187ecoreevasengineswin32pkg_LTLIBRARIES = modules/ecore_evas/engines/win32/module.la
188modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES) 188modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES)
189modules_ecore_evas_engines_win32_module_la_CPPFLAGS = \ 189modules_ecore_evas_engines_win32_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
190@ECORE_EVAS_CFLAGS@ \ 190@ECORE_EVAS_CFLAGS@ \
191@ECORE_WIN32_CFLAGS@ \ 191@ECORE_WIN32_CFLAGS@ \
192-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ 192-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index 6cae6ec..1035e25 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -16,7 +16,7 @@ lib/ecore_fb/ecore_fb_vt.c \
16lib/ecore_fb/ecore_fb_keytable.h \ 16lib/ecore_fb/ecore_fb_keytable.h \
17lib/ecore_fb/ecore_fb_private.h 17lib/ecore_fb/ecore_fb_private.h
18 18
19lib_ecore_fb_libecore_fb_la_CPPFLAGS = @ECORE_FB_CFLAGS@ 19lib_ecore_fb_libecore_fb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FB_CFLAGS@
20lib_ecore_fb_libecore_fb_la_LIBADD = @ECORE_FB_LIBS@ 20lib_ecore_fb_libecore_fb_la_LIBADD = @ECORE_FB_LIBS@
21lib_ecore_fb_libecore_fb_la_DEPENDENCIES = @ECORE_FB_INTERNAL_LIBS@ 21lib_ecore_fb_libecore_fb_la_DEPENDENCIES = @ECORE_FB_INTERNAL_LIBS@
22lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 22lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index 3ce0a61..a314315 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -27,7 +27,7 @@ lib/ecore_file/ecore_file_monitor_poll.c
27endif 27endif
28endif 28endif
29 29
30lib_ecore_file_libecore_file_la_CPPFLAGS = @ECORE_FILE_CFLAGS@ 30lib_ecore_file_libecore_file_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FILE_CFLAGS@
31lib_ecore_file_libecore_file_la_LIBADD = @ECORE_FILE_LIBS@ 31lib_ecore_file_libecore_file_la_LIBADD = @ECORE_FILE_LIBS@
32lib_ecore_file_libecore_file_la_DEPENDENCIES = @ECORE_FILE_INTERNAL_LIBS@ 32lib_ecore_file_libecore_file_la_DEPENDENCIES = @ECORE_FILE_INTERNAL_LIBS@
33lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 33lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_IMF.am b/src/Makefile_Ecore_IMF.am
index 783181d..cb61769 100644
--- a/src/Makefile_Ecore_IMF.am
+++ b/src/Makefile_Ecore_IMF.am
@@ -14,7 +14,7 @@ lib/ecore_imf/ecore_imf_context.c \
14lib/ecore_imf/ecore_imf_module.c \ 14lib/ecore_imf/ecore_imf_module.c \
15lib/ecore_imf/ecore_imf_private.h 15lib/ecore_imf/ecore_imf_private.h
16 16
17lib_ecore_imf_libecore_imf_la_CPPFLAGS = \ 17lib_ecore_imf_libecore_imf_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
18-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 18-DPACKAGE_BIN_DIR=\"$(bindir)\" \
19-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 19-DPACKAGE_LIB_DIR=\"$(libdir)\" \
20-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \ 20-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \
@@ -35,7 +35,7 @@ modules_ecore_imf_ibus_module_la_SOURCES = \
35modules/ecore_imf/ibus/ibus_module.c \ 35modules/ecore_imf/ibus/ibus_module.c \
36modules/ecore_imf/ibus/ibus_imcontext.c \ 36modules/ecore_imf/ibus/ibus_imcontext.c \
37modules/ecore_imf/ibus/ibus_imcontext.h 37modules/ecore_imf/ibus/ibus_imcontext.h
38modules_ecore_imf_ibus_module_la_CPPFLAGS = \ 38modules_ecore_imf_ibus_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
39@ECORE_IMF_CFLAGS@ \ 39@ECORE_IMF_CFLAGS@ \
40@ECORE_EVAS_CFLAGS@ \ 40@ECORE_EVAS_CFLAGS@ \
41@ECORE_X_CFLAGS@ \ 41@ECORE_X_CFLAGS@ \
@@ -62,7 +62,7 @@ modules_ecore_imf_scim_module_la_SOURCES = \
62modules/ecore_imf/scim/scim_module.cpp \ 62modules/ecore_imf/scim/scim_module.cpp \
63modules/ecore_imf/scim/scim_imcontext.cpp \ 63modules/ecore_imf/scim/scim_imcontext.cpp \
64modules/ecore_imf/scim/scim_imcontext.h 64modules/ecore_imf/scim/scim_imcontext.h
65modules_ecore_imf_scim_module_la_CPPFLAGS = \ 65modules_ecore_imf_scim_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
66@ECORE_IMF_CFLAGS@ \ 66@ECORE_IMF_CFLAGS@ \
67@ECORE_EVAS_CFLAGS@ \ 67@ECORE_EVAS_CFLAGS@ \
68@ECORE_X_CFLAGS@ \ 68@ECORE_X_CFLAGS@ \
@@ -87,7 +87,7 @@ ecoreimfximpkgdir = $(libdir)/ecore_imf/modules/xim/$(MODULE_ARCH)
87ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/module.la 87ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/module.la
88modules_ecore_imf_xim_module_la_SOURCES = \ 88modules_ecore_imf_xim_module_la_SOURCES = \
89modules/ecore_imf/xim/ecore_imf_xim.c 89modules/ecore_imf/xim/ecore_imf_xim.c
90modules_ecore_imf_xim_module_la_CPPFLAGS = \ 90modules_ecore_imf_xim_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
91@ECORE_IMF_CFLAGS@ \ 91@ECORE_IMF_CFLAGS@ \
92@ECORE_X_CFLAGS@ \ 92@ECORE_X_CFLAGS@ \
93@ecore_imf_xim_cflags@ 93@ecore_imf_xim_cflags@
diff --git a/src/Makefile_Ecore_IMF_Evas.am b/src/Makefile_Ecore_IMF_Evas.am
index bd5756b..abb3d57 100644
--- a/src/Makefile_Ecore_IMF_Evas.am
+++ b/src/Makefile_Ecore_IMF_Evas.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES += \
9lib/ecore_imf_evas/libecore_imf_evas.la 9lib/ecore_imf_evas/libecore_imf_evas.la
10 10
11lib_ecore_imf_evas_libecore_imf_evas_la_SOURCES = lib/ecore_imf_evas/ecore_imf_evas.c 11lib_ecore_imf_evas_libecore_imf_evas_la_SOURCES = lib/ecore_imf_evas/ecore_imf_evas.c
12lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@ 12lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IMF_EVAS_CFLAGS@
13lib_ecore_imf_evas_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@ 13lib_ecore_imf_evas_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
14lib_ecore_imf_evas_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@ 14lib_ecore_imf_evas_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
15lib_ecore_imf_evas_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 15lib_ecore_imf_evas_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index 3ce4dd1..2b7aaba 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -14,7 +14,7 @@ lib/ecore_input/ecore_input_compose.c \
14lib/ecore_input/ecore_input_compose.h \ 14lib/ecore_input/ecore_input_compose.h \
15lib/ecore_input/ecore_input_private.h 15lib/ecore_input/ecore_input_private.h
16 16
17lib_ecore_input_libecore_input_la_CPPFLAGS = @ECORE_INPUT_CFLAGS@ 17lib_ecore_input_libecore_input_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_CFLAGS@
18lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@ 18lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@
19lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@ 19lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@
20lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 20lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input_Evas.am b/src/Makefile_Ecore_Input_Evas.am
index 91749bb..b56efc3 100644
--- a/src/Makefile_Ecore_Input_Evas.am
+++ b/src/Makefile_Ecore_Input_Evas.am
@@ -12,7 +12,7 @@ lib_ecore_input_evas_libecore_input_evas_la_SOURCES = \
12lib/ecore_input_evas/ecore_input_evas.c \ 12lib/ecore_input_evas/ecore_input_evas.c \
13lib/ecore_input_evas/ecore_input_evas_private.h 13lib/ecore_input_evas/ecore_input_evas_private.h
14 14
15lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@ 15lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_EVAS_CFLAGS@
16lib_ecore_input_evas_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@ 16lib_ecore_input_evas_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
17lib_ecore_input_evas_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@ 17lib_ecore_input_evas_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
18lib_ecore_input_evas_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 18lib_ecore_input_evas_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 00e57ef..1d41e05 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -11,7 +11,7 @@ lib_ecore_ipc_libecore_ipc_la_SOURCES = \
11lib/ecore_ipc/ecore_ipc.c \ 11lib/ecore_ipc/ecore_ipc.c \
12lib/ecore_ipc/ecore_ipc_private.h 12lib/ecore_ipc/ecore_ipc_private.h
13 13
14lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = @ECORE_IPC_CFLAGS@ 14lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IPC_CFLAGS@
15lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@ 15lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@
16lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@ 16lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@
17lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 17lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index ab87287..8c1f7fd 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -17,7 +17,7 @@ lib/ecore_psl1ght/spursutil.h \
17lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \ 17lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \
18lib/ecore_psl1ght/ecore_psl1ght_private.h 18lib/ecore_psl1ght/ecore_psl1ght_private.h
19 19
20lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = @ECORE_PSL1GHT_CFLAGS@ 20lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_PSL1GHT_CFLAGS@
21lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = @ECORE_PSL1GHT_LIBS@ 21lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = @ECORE_PSL1GHT_LIBS@
22lib_ecore_psl1ght_libecore_psl1ght_la_DEPENDENCIES = @ECORE_PSL1GHT_INTERNAL_LIBS@ 22lib_ecore_psl1ght_libecore_psl1ght_la_DEPENDENCIES = @ECORE_PSL1GHT_INTERNAL_LIBS@
23lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 23lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index 21b54d6..7262c2b 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -13,7 +13,7 @@ lib/ecore_sdl/ecore_sdl.c \
13lib/ecore_sdl/Ecore_Sdl_Keys.h \ 13lib/ecore_sdl/Ecore_Sdl_Keys.h \
14lib/ecore_sdl/ecore_sdl_private.h 14lib/ecore_sdl/ecore_sdl_private.h
15 15
16lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = @ECORE_SDL_CFLAGS@ 16lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_SDL_CFLAGS@
17lib_ecore_sdl_libecore_sdl_la_LIBADD = @ECORE_SDL_LIBS@ 17lib_ecore_sdl_libecore_sdl_la_LIBADD = @ECORE_SDL_LIBS@
18lib_ecore_sdl_libecore_sdl_la_DEPENDENCIES = @ECORE_SDL_INTERNAL_LIBS@ 18lib_ecore_sdl_libecore_sdl_la_DEPENDENCIES = @ECORE_SDL_INTERNAL_LIBS@
19lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 19lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index d601713..aaf08f5 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -16,7 +16,7 @@ lib/ecore_wayland/ecore_wl_output.c \
16lib/ecore_wayland/ecore_wl_window.c \ 16lib/ecore_wayland/ecore_wl_window.c \
17lib/ecore_wayland/ecore_wl_private.h 17lib/ecore_wayland/ecore_wl_private.h
18 18
19lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = @ECORE_WAYLAND_CFLAGS@ 19lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WAYLAND_CFLAGS@
20lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@ 20lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@
21lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@ 21lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@
22lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 22lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index 1b26219..d1944a8 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -24,7 +24,7 @@ lib/ecore_win32/ecore_win32_dnd_data_object.h \
24lib/ecore_win32/ecore_win32_dnd_drop_source.h \ 24lib/ecore_win32/ecore_win32_dnd_drop_source.h \
25lib/ecore_win32/ecore_win32_dnd_drop_target.h 25lib/ecore_win32/ecore_win32_dnd_drop_target.h
26 26
27lib_ecore_win32_libecore_win32_la_CPPFLAGS = @ECORE_WIN32_CFLAGS@ 27lib_ecore_win32_libecore_win32_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WIN32_CFLAGS@
28lib_ecore_win32_libecore_win32_la_LIBADD = @ECORE_WIN32_LIBS@ 28lib_ecore_win32_libecore_win32_la_LIBADD = @ECORE_WIN32_LIBS@
29lib_ecore_win32_libecore_win32_la_DEPENDENCIES = @ECORE_WIN32_INTERNAL_LIBS@ 29lib_ecore_win32_libecore_win32_la_DEPENDENCIES = @ECORE_WIN32_INTERNAL_LIBS@
30lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 30lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 45fb426..1f5cac6 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -14,7 +14,7 @@ lib/ecore_wince/ecore_wince_event.c \
14lib/ecore_wince/ecore_wince_window.c \ 14lib/ecore_wince/ecore_wince_window.c \
15lib/ecore_wince/ecore_wince_private.h 15lib/ecore_wince/ecore_wince_private.h
16 16
17lib_ecore_wince_libecore_wince_la_CPPFLAGS = @ECORE_WINCE_CFLAGS@ 17lib_ecore_wince_libecore_wince_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WINCE_CFLAGS@
18lib_ecore_wince_libecore_wince_la_LIBADD = @ECORE_WINCE_LIBS@ 18lib_ecore_wince_libecore_wince_la_LIBADD = @ECORE_WINCE_LIBS@
19lib_ecore_wince_libecore_wince_la_DEPENDENCIES = @ECORE_WINCE_INTERNAL_LIBS@ 19lib_ecore_wince_libecore_wince_la_DEPENDENCIES = @ECORE_WINCE_INTERNAL_LIBS@
20lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 20lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index 7457a54..31c9f37 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -91,7 +91,7 @@ lib/ecore_x/xlib/ecore_x_gesture.c \
91lib/ecore_x/xlib/ecore_x_private.h 91lib/ecore_x/xlib/ecore_x_private.h
92endif 92endif
93 93
94lib_ecore_x_libecore_x_la_CPPFLAGS = @ECORE_X_CFLAGS@ 94lib_ecore_x_libecore_x_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_X_CFLAGS@
95lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@ 95lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@
96lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@ 96lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@
97lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 97lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 718c710..950a814 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -3,7 +3,7 @@
3 3
4lib_LTLIBRARIES += lib/edje/libedje.la 4lib_LTLIBRARIES += lib/edje/libedje.la
5 5
6EDJE_COMMON_CPPFLAGS = \ 6EDJE_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
7-I$(top_builddir) \ 7-I$(top_builddir) \
8-I$(top_srcdir)/src/lib/edje \ 8-I$(top_srcdir)/src/lib/edje \
9-I$(top_builddir)/src/lib/edje \ 9-I$(top_builddir)/src/lib/edje \
@@ -52,7 +52,7 @@ lib/edje/edje_util.c \
52lib/edje/edje_var.c \ 52lib/edje/edje_var.c \
53lib/edje/edje_signal.c 53lib/edje/edje_signal.c
54 54
55lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 55lib_edje_libedje_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
56lib_edje_libedje_la_LIBADD = @EDJE_LIBS@ 56lib_edje_libedje_la_LIBADD = @EDJE_LIBS@
57lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@ 57lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@
58lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 58lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -62,7 +62,7 @@ if ENABLE_MULTISENSE
62# edjemoduleXXX_LTLIBRARIES = modules/edje/XXX/module.la 62# edjemoduleXXX_LTLIBRARIES = modules/edje/XXX/module.la
63# 63#
64# modules_edje_XXX_module_la_SOURCES = modules/edje/XXX/XXX.c 64# modules_edje_XXX_module_la_SOURCES = modules/edje/XXX/XXX.c
65# modules_edje_XXX_module_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@ 65# modules_edje_XXX_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@
66# modules_edje_XXX_module_la_LIBADD = $(EDJE_COMMON_USER_LIBADD) 66# modules_edje_XXX_module_la_LIBADD = $(EDJE_COMMON_USER_LIBADD)
67# modules_edje_XXX_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 67# modules_edje_XXX_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
68# modules_edje_XXX_module_la_LIBTOOLFLAGS = --tag=disable-static 68# modules_edje_XXX_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -72,7 +72,7 @@ if ENABLE_MULTISENSE
72# 72#
73# modules_edje_multisense_factory_module_la_SOURCES = \ 73# modules_edje_multisense_factory_module_la_SOURCES = \
74# modules/edje/multisense_factory/multisense_factory.c 74# modules/edje/multisense_factory/multisense_factory.c
75# modules_edje_multisense_factory_module_la_CPPFLAGS = \ 75# modules_edje_multisense_factory_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
76# $(EDJE_COMMON_CPPFLAGS) \ 76# $(EDJE_COMMON_CPPFLAGS) \
77# @REMIX_CFLAGS@ 77# @REMIX_CFLAGS@
78# modules_edje_multisense_factory_module_la_LIBADD = \ 78# modules_edje_multisense_factory_module_la_LIBADD = \
@@ -111,7 +111,7 @@ bin/edje/edje_cc_mem.c \
111bin/edje/edje_cc_handlers.c \ 111bin/edje/edje_cc_handlers.c \
112bin/edje/edje_cc_sources.c \ 112bin/edje/edje_cc_sources.c \
113bin/edje/edje_multisense_convert.c 113bin/edje/edje_multisense_convert.c
114bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 114bin_edje_edje_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
115bin_edje_edje_cc_LDADD = $(USE_EDJE_BIN_LIBS) 115bin_edje_edje_cc_LDADD = $(USE_EDJE_BIN_LIBS)
116bin_edje_edje_cc_DEPENDENCIES = \ 116bin_edje_edje_cc_DEPENDENCIES = \
117@USE_EDJE_INTERNAL_LIBS@ \ 117@USE_EDJE_INTERNAL_LIBS@ \
@@ -122,37 +122,37 @@ bin/edje/edje_decc.c \
122bin/edje/edje_decc.h \ 122bin/edje/edje_decc.h \
123bin/edje/edje_cc_mem.c \ 123bin/edje/edje_cc_mem.c \
124bin/edje/edje_cc_sources.c 124bin/edje/edje_cc_sources.c
125bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 125bin_edje_edje_decc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
126bin_edje_edje_decc_LDADD = $(USE_EDJE_BIN_LIBS) 126bin_edje_edje_decc_LDADD = $(USE_EDJE_BIN_LIBS)
127bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 127bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
128 128
129bin_edje_edje_player_SOURCES = bin/edje/edje_player.c 129bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
130bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 130bin_edje_edje_player_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
131bin_edje_edje_player_LDADD = $(USE_EDJE_BIN_LIBS) 131bin_edje_edje_player_LDADD = $(USE_EDJE_BIN_LIBS)
132bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 132bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
133 133
134bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c 134bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
135bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 135bin_edje_edje_inspector_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
136bin_edje_edje_inspector_LDADD = $(USE_EDJE_BIN_LIBS) 136bin_edje_edje_inspector_LDADD = $(USE_EDJE_BIN_LIBS)
137bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 137bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
138 138
139bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c 139bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
140bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 140bin_edje_edje_external_inspector_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
141bin_edje_edje_external_inspector_LDADD = $(USE_EDJE_BIN_LIBS) 141bin_edje_edje_external_inspector_LDADD = $(USE_EDJE_BIN_LIBS)
142bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 142bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
143 143
144bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c 144bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
145bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 145bin_edje_edje_codegen_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
146bin_edje_edje_codegen_LDADD = $(USE_EDJE_BIN_LIBS) 146bin_edje_edje_codegen_LDADD = $(USE_EDJE_BIN_LIBS)
147bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 147bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
148 148
149bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c 149bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
150bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 150bin_edje_edje_pick_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
151bin_edje_edje_pick_LDADD = $(USE_EDJE_BIN_LIBS) 151bin_edje_edje_pick_LDADD = $(USE_EDJE_BIN_LIBS)
152bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 152bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
153 153
154bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c 154bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
155bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 155bin_edje_edje_watch_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
156bin_edje_edje_watch_LDADD = $(USE_EDJE_BIN_LIBS) 156bin_edje_edje_watch_LDADD = $(USE_EDJE_BIN_LIBS)
157bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 157bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
158 158
@@ -170,7 +170,7 @@ bin/edje/epp/cpplib.c \
170bin/edje/epp/cppmain.c 170bin/edje/epp/cppmain.c
171 171
172# Note: eina is included only because of EINA_UNUSED 172# Note: eina is included only because of EINA_UNUSED
173bin_edje_epp_epp_CPPFLAGS = \ 173bin_edje_epp_epp_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
174-I$(top_builddir) \ 174-I$(top_builddir) \
175-I$(top_srcdir)/src/lib/eina \ 175-I$(top_srcdir)/src/lib/eina \
176-I$(top_builddir)/src/lib/eina \ 176-I$(top_builddir)/src/lib/eina \
@@ -226,7 +226,7 @@ tests/edje/edje_suite.c \
226tests/edje/edje_test_edje.c \ 226tests/edje/edje_test_edje.c \
227tests/edje/edje_suite.h 227tests/edje/edje_suite.h
228 228
229tests_edje_edje_suite_CPPFLAGS = \ 229tests_edje_edje_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
230$(EDJE_COMMON_CPPFLAGS) \ 230$(EDJE_COMMON_CPPFLAGS) \
231-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \ 231-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \
232@CHECK_CFLAGS@ 232@CHECK_CFLAGS@
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 1640299..05e9acb 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -22,7 +22,7 @@ static_libs/lz4/lz4.h \
22static_libs/lz4/lz4hc.c \ 22static_libs/lz4/lz4hc.c \
23static_libs/lz4/lz4hc.h 23static_libs/lz4/lz4hc.h
24 24
25lib_eet_libeet_la_CPPFLAGS = \ 25lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
26-I$(top_srcdir)/src/static_libs/lz4 \ 26-I$(top_srcdir)/src/static_libs/lz4 \
27-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 27-DPACKAGE_BIN_DIR=\"$(bindir)\" \
28-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 28-DPACKAGE_LIB_DIR=\"$(libdir)\" \
@@ -40,7 +40,7 @@ bin_PROGRAMS += bin/eet/eet
40 40
41bin_eet_eet_SOURCES = bin/eet/eet_main.c 41bin_eet_eet_SOURCES = bin/eet/eet_main.c
42 42
43bin_eet_eet_CPPFLAGS = \ 43bin_eet_eet_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
44-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 44-DPACKAGE_BIN_DIR=\"$(bindir)\" \
45-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 45-DPACKAGE_LIB_DIR=\"$(libdir)\" \
46-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 46-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@@ -65,7 +65,7 @@ tests/eet/eet_suite.c \
65tests/eet/eet_data_suite.c \ 65tests/eet/eet_data_suite.c \
66tests/eet/eet_suite.h 66tests/eet/eet_suite.h
67 67
68tests_eet_eet_suite_CPPFLAGS = \ 68tests_eet_eet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
69-DTESTS_WD=\"`pwd`\" \ 69-DTESTS_WD=\"`pwd`\" \
70-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \ 70-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
71-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet\" \ 71-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet\" \
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 938925d..81c1734 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -45,7 +45,7 @@ else
45lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_dummy.c 45lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_dummy.c
46endif 46endif
47 47
48lib_eeze_libeeze_la_CPPFLAGS = \ 48lib_eeze_libeeze_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
49-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 49-DPACKAGE_BIN_DIR=\"$(bindir)\" \
50-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 50-DPACKAGE_LIB_DIR=\"$(libdir)\" \
51-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \ 51-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \
@@ -60,7 +60,7 @@ eezemodulesensortizendir = $(libdir)/eeze/modules/sensor/tizen/$(MODULE_ARCH)
60eezemodulesensortizen_LTLIBRARIES = modules/eeze/sensor/tizen/module.la 60eezemodulesensortizen_LTLIBRARIES = modules/eeze/sensor/tizen/module.la
61modules_eeze_sensor_tizen_module_la_SOURCES = \ 61modules_eeze_sensor_tizen_module_la_SOURCES = \
62modules/eeze/sensor/tizen/tizen.c 62modules/eeze/sensor/tizen/tizen.c
63modules_eeze_sensor_tizen_module_la_CPPFLAGS = \ 63modules_eeze_sensor_tizen_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
64@EEZE_CFLAGS@ \ 64@EEZE_CFLAGS@ \
65@TIZEN_SENSOR_CFLAGS@ 65@TIZEN_SENSOR_CFLAGS@
66modules_eeze_sensor_tizen_module_la_LIBADD = \ 66modules_eeze_sensor_tizen_module_la_LIBADD = \
@@ -73,7 +73,7 @@ else
73eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH) 73eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH)
74eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la 74eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la
75modules_eeze_sensor_fake_module_la_SOURCES = modules/eeze/sensor/fake/fake.c 75modules_eeze_sensor_fake_module_la_SOURCES = modules/eeze/sensor/fake/fake.c
76modules_eeze_sensor_fake_module_la_CPPFLAGS = @EEZE_CFLAGS@ 76modules_eeze_sensor_fake_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
77modules_eeze_sensor_fake_module_la_LIBADD = @USE_EEZE_LIBS@ 77modules_eeze_sensor_fake_module_la_LIBADD = @USE_EEZE_LIBS@
78modules_eeze_sensor_fake_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 78modules_eeze_sensor_fake_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
79modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 79modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
@@ -82,7 +82,7 @@ endif
82eezemodulesensorudevdir = $(libdir)/eeze/modules/sensor/udev/$(MODULE_ARCH) 82eezemodulesensorudevdir = $(libdir)/eeze/modules/sensor/udev/$(MODULE_ARCH)
83eezemodulesensorudev_LTLIBRARIES = modules/eeze/sensor/udev/module.la 83eezemodulesensorudev_LTLIBRARIES = modules/eeze/sensor/udev/module.la
84modules_eeze_sensor_udev_module_la_SOURCES = modules/eeze/sensor/udev/udev.c 84modules_eeze_sensor_udev_module_la_SOURCES = modules/eeze/sensor/udev/udev.c
85modules_eeze_sensor_udev_module_la_CPPFLAGS = @EEZE_CFLAGS@ 85modules_eeze_sensor_udev_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
86modules_eeze_sensor_udev_module_la_LIBADD = @USE_EEZE_LIBS@ 86modules_eeze_sensor_udev_module_la_LIBADD = @USE_EEZE_LIBS@
87modules_eeze_sensor_udev_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 87modules_eeze_sensor_udev_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
88modules_eeze_sensor_udev_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 88modules_eeze_sensor_udev_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
@@ -95,12 +95,12 @@ bin/eeze/eeze_udev_test \
95bin/eeze/eeze_sensor_test 95bin/eeze/eeze_sensor_test
96 96
97bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c 97bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c
98bin_eeze_eeze_udev_test_CPPFLAGS = @EEZE_CFLAGS@ 98bin_eeze_eeze_udev_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
99bin_eeze_eeze_udev_test_LDADD = @USE_EEZE_LIBS@ 99bin_eeze_eeze_udev_test_LDADD = @USE_EEZE_LIBS@
100bin_eeze_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 100bin_eeze_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
101 101
102bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c 102bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c
103bin_eeze_eeze_sensor_test_CPPFLAGS = @EEZE_CFLAGS@ 103bin_eeze_eeze_sensor_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
104bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@ 104bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
105bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 105bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
106 106
@@ -111,24 +111,24 @@ bin/eeze/eeze_disk_ls \
111bin/eeze/eeze_scanner 111bin/eeze/eeze_scanner
112 112
113bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c 113bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c
114bin_eeze_eeze_mount_CPPFLAGS = @EEZE_CFLAGS@ 114bin_eeze_eeze_mount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
115bin_eeze_eeze_mount_LDADD = @USE_EEZE_LIBS@ 115bin_eeze_eeze_mount_LDADD = @USE_EEZE_LIBS@
116bin_eeze_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 116bin_eeze_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
117 117
118bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c 118bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c
119bin_eeze_eeze_umount_CPPFLAGS = @EEZE_CFLAGS@ 119bin_eeze_eeze_umount_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
120bin_eeze_eeze_umount_LDADD = @USE_EEZE_LIBS@ 120bin_eeze_eeze_umount_LDADD = @USE_EEZE_LIBS@
121bin_eeze_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 121bin_eeze_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
122 122
123bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c 123bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c
124bin_eeze_eeze_disk_ls_CPPFLAGS = @EEZE_CFLAGS@ 124bin_eeze_eeze_disk_ls_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
125bin_eeze_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@ 125bin_eeze_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@
126bin_eeze_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 126bin_eeze_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
127 127
128bin_eeze_eeze_scanner_SOURCES = \ 128bin_eeze_eeze_scanner_SOURCES = \
129bin/eeze/eeze_scanner.c \ 129bin/eeze/eeze_scanner.c \
130bin/eeze/eeze_scanner.h 130bin/eeze/eeze_scanner.h
131bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@ 131bin_eeze_eeze_scanner_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EEZE_CFLAGS@
132bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@ 132bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
133bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ 133bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
134 134
@@ -145,7 +145,7 @@ check_PROGRAMS += tests/eeze/eeze_suite
145TESTS += tests/eeze/eeze_suite 145TESTS += tests/eeze/eeze_suite
146 146
147tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c 147tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c
148tests_eeze_eeze_suite_CPPFLAGS = \ 148tests_eeze_eeze_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
149@EEZE_CFLAGS@ \ 149@EEZE_CFLAGS@ \
150-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \ 150-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \
151-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eeze\" \ 151-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eeze\" \
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
new file mode 100644
index 0000000..c5fe87f
--- /dev/null
+++ b/src/Makefile_Efl.am
@@ -0,0 +1,3 @@
1installed_eflheadersdir = $(includedir)/efl-@VMAJ@
2dist_installed_eflheaders_DATA = \
3lib/efl/Efl_Config.h
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index e608a46..725760a 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -6,7 +6,7 @@ lib/efreet/libefreet.la \
6lib/efreet/libefreet_mime.la \ 6lib/efreet/libefreet_mime.la \
7lib/efreet/libefreet_trash.la 7lib/efreet/libefreet_trash.la
8 8
9EFREET_COMMON_CPPFLAGS = \ 9EFREET_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \ 12-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
@@ -45,21 +45,21 @@ lib/efreet/efreet_private.h \
45lib/efreet/efreet_xml.h \ 45lib/efreet/efreet_xml.h \
46lib/efreet/efreet_cache_private.h 46lib/efreet/efreet_cache_private.h
47 47
48lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 48lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
49lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@ 49lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
50lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@ 50lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
51lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 51lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
52 52
53# libefreet_mime.la 53# libefreet_mime.la
54lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c 54lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
55lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 55lib_efreet_libefreet_mime_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
56lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@ 56lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
57lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 57lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
58lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 58lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
59 59
60# libefreet_trash.la 60# libefreet_trash.la
61lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c 61lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
62lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 62lib_efreet_libefreet_trash_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
63lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@ 63lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
64lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 64lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
65lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 65lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -83,7 +83,7 @@ bin/efreet/efreetd_dbus.c \
83bin/efreet/efreetd_cache.h \ 83bin/efreet/efreetd_cache.h \
84bin/efreet/efreetd_cache.c 84bin/efreet/efreetd_cache.c
85 85
86bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 86bin_efreet_efreetd_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
87bin_efreet_efreetd_LDADD = $(USE_EFREET_BIN_LIBS) 87bin_efreet_efreetd_LDADD = $(USE_EFREET_BIN_LIBS)
88bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 88bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
89 89
@@ -92,12 +92,12 @@ efreetinternal_bin_PROGRAMS = \
92bin/efreet/efreet_desktop_cache_create \ 92bin/efreet/efreet_desktop_cache_create \
93bin/efreet/efreet_icon_cache_create 93bin/efreet/efreet_icon_cache_create
94 94
95bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 95bin_efreet_efreet_desktop_cache_create_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
96bin_efreet_efreet_desktop_cache_create_LDADD = $(USE_EFREET_BIN_LIBS) 96bin_efreet_efreet_desktop_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
97bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 97bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
98bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c 98bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
99 99
100bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 100bin_efreet_efreet_icon_cache_create_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
101bin_efreet_efreet_icon_cache_create_LDADD = $(USE_EFREET_BIN_LIBS) 101bin_efreet_efreet_icon_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
102bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 102bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
103bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c 103bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
@@ -117,7 +117,7 @@ tests/efreet/compare/efreet_menu_alloc
117 117
118 118
119# efreet_test 119# efreet_test
120tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 120tests_efreet_efreet_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
121tests_efreet_efreet_test_LDADD = \ 121tests_efreet_efreet_test_LDADD = \
122@USE_EFREET_LIBS@ \ 122@USE_EFREET_LIBS@ \
123lib/efreet/libefreet_mime.la 123lib/efreet/libefreet_mime.la
@@ -138,31 +138,31 @@ tests/efreet/ef_utils.c \
138tests/efreet/main.c 138tests/efreet/main.c
139 139
140# efreet_spec_test 140# efreet_spec_test
141tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 141tests_efreet_efreet_spec_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
142tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@ 142tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@
143tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 143tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
144tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c 144tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c
145 145
146# efreet_cache_test 146# efreet_cache_test
147tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 147tests_efreet_efreet_cache_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
148tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@ 148tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@
149tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 149tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
150tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c 150tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c
151 151
152# efreet_icon_cache_dump 152# efreet_icon_cache_dump
153tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 153tests_efreet_efreet_icon_cache_dump_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
154tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@ 154tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@
155tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 155tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
156tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c 156tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c
157 157
158# efreet_user_dir 158# efreet_user_dir
159tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 159tests_efreet_efreet_user_dir_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
160tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@ 160tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@
161tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 161tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
162tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c 162tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c
163 163
164# efreet_alloc 164# efreet_alloc
165tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 165tests_efreet_compare_efreet_alloc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
166tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@ 166tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@
167tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 167tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
168tests_efreet_compare_efreet_alloc_SOURCES = \ 168tests_efreet_compare_efreet_alloc_SOURCES = \
@@ -170,7 +170,7 @@ tests/efreet/compare/efreet_alloc.c \
170tests/efreet/compare/comp.h 170tests/efreet/compare/comp.h
171 171
172# efreet_menu_alloc 172# efreet_menu_alloc
173tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 173tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
174tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@ 174tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@
175tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 175tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
176tests_efreet_compare_efreet_menu_alloc_SOURCES = \ 176tests_efreet_compare_efreet_menu_alloc_SOURCES = \
@@ -204,7 +204,7 @@ tests/efreet/efreet_suite.h \
204tests/efreet/efreet_test_efreet.c \ 204tests/efreet/efreet_test_efreet.c \
205tests/efreet/efreet_test_efreet_cache.c 205tests/efreet/efreet_test_efreet_cache.c
206 206
207tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \ 207tests_efreet_efreet_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ \
208-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efreet\" 208-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/efreet\"
209tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@ 209tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
210tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 210tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 1080b58..7e40749 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -205,7 +205,7 @@ modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable
205modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c 205modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c
206endif 206endif
207 207
208lib_eina_libeina_la_CPPFLAGS = \ 208lib_eina_libeina_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
209@EINA_CFLAGS@ \ 209@EINA_CFLAGS@ \
210-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 210-DPACKAGE_BIN_DIR=\"$(bindir)\" \
211-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 211-DPACKAGE_LIB_DIR=\"$(libdir)\" \
@@ -270,7 +270,7 @@ tests/eina/eina_test_barrier.c \
270tests/eina/eina_test_tmpstr.c 270tests/eina/eina_test_tmpstr.c
271# tests/eina/eina_test_model.c 271# tests/eina/eina_test_model.c
272 272
273tests_eina_eina_suite_CPPFLAGS = \ 273tests_eina_eina_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
274-DTESTS_WD=\"`pwd`\" \ 274-DTESTS_WD=\"`pwd`\" \
275-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina\" \ 275-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina\" \
276-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \ 276-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \
@@ -281,14 +281,14 @@ tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
281tests_eina_eina_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ 281tests_eina_eina_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
282 282
283tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx 283tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
284tests_eina_cxx_compile_test_CPPFLAGS = @EINA_CFLAGS@ 284tests_eina_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EINA_CFLAGS@
285tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@ 285tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@
286tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ 286tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
287 287
288check_LTLIBRARIES = tests/eina/module_dummy.la 288check_LTLIBRARIES = tests/eina/module_dummy.la
289 289
290tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c 290tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
291tests_eina_module_dummy_la_CPPFLAGS = \ 291tests_eina_module_dummy_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
292-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \ 292-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \
293@CHECK_CFLAGS@ \ 293@CHECK_CFLAGS@ \
294@EINA_CFLAGS@ 294@EINA_CFLAGS@
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 8d4738a..ff0f442 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -26,7 +26,7 @@ lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_win32.c
26endif 26endif
27endif 27endif
28 28
29lib_eio_libeio_la_CPPFLAGS = @EIO_CFLAGS@ 29lib_eio_libeio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EIO_CFLAGS@
30lib_eio_libeio_la_LIBADD = @EIO_LIBS@ 30lib_eio_libeio_la_LIBADD = @EIO_LIBS@
31lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@ 31lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@
32lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 32lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index b736e99..66ca2bf 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -32,7 +32,7 @@ lib/eldbus/eldbus_message_helper.c \
32lib/eldbus/eldbus_message_to_eina_value.c \ 32lib/eldbus/eldbus_message_to_eina_value.c \
33lib/eldbus/eldbus_message_from_eina_value.c 33lib/eldbus/eldbus_message_from_eina_value.c
34 34
35lib_eldbus_libeldbus_la_CPPFLAGS = \ 35lib_eldbus_libeldbus_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
36-include $(top_builddir)/config.h \ 36-include $(top_builddir)/config.h \
37@ELDBUS_CFLAGS@ 37@ELDBUS_CFLAGS@
38lib_eldbus_libeldbus_la_LIBADD = @ELDBUS_LIBS@ 38lib_eldbus_libeldbus_la_LIBADD = @ELDBUS_LIBS@
@@ -51,7 +51,7 @@ bin/eldbus/dbus.c \
51bin/eldbus/source_client.c \ 51bin/eldbus/source_client.c \
52bin/eldbus/client.c 52bin/eldbus/client.c
53 53
54bin_eldbus_eldbus_codegen_CPPFLAGS = \ 54bin_eldbus_eldbus_codegen_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
55-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 55-DPACKAGE_BIN_DIR=\"$(bindir)\" \
56-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 56-DPACKAGE_LIB_DIR=\"$(libdir)\" \
57-DPACKAGE_DATA_DIR=\"$(datadir)/eldbus\" \ 57-DPACKAGE_DATA_DIR=\"$(datadir)/eldbus\" \
@@ -76,7 +76,7 @@ tests/eldbus/eldbus_suite.c \
76tests/eldbus/eldbus_test_eldbus_init.c \ 76tests/eldbus/eldbus_test_eldbus_init.c \
77tests/eldbus/eldbus_suite.h 77tests/eldbus/eldbus_suite.h
78 78
79tests_eldbus_eldbus_suite_CPPFLAGS = @CHECK_CFLAGS@ @ELDBUS_CFLAGS@ \ 79tests_eldbus_eldbus_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @CHECK_CFLAGS@ @ELDBUS_CFLAGS@ \
80-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" 80-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\"
81 81
82tests_eldbus_eldbus_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@ 82tests_eldbus_eldbus_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 907f328..54ca3b9 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -16,7 +16,7 @@ lib/embryo/embryo_str.c \
16lib/embryo/embryo_time.c \ 16lib/embryo/embryo_time.c \
17lib/embryo/embryo_private.h 17lib/embryo/embryo_private.h
18 18
19lib_embryo_libembryo_la_CPPFLAGS = \ 19lib_embryo_libembryo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
20-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 20-DPACKAGE_BIN_DIR=\"$(bindir)\" \
21-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 21-DPACKAGE_LIB_DIR=\"$(libdir)\" \
22-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 22-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@@ -46,7 +46,7 @@ bin/embryo/embryo_cc_scvars.c \
46bin/embryo/embryo_cc_prefix.c \ 46bin/embryo/embryo_cc_prefix.c \
47bin/embryo/embryo_cc_prefix.h 47bin/embryo/embryo_cc_prefix.h
48 48
49bin_embryo_embryo_cc_CPPFLAGS = \ 49bin_embryo_embryo_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
50-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 50-DPACKAGE_BIN_DIR=\"$(bindir)\" \
51-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 51-DPACKAGE_LIB_DIR=\"$(libdir)\" \
52-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 52-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index ca94a56..2323fb6 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -15,7 +15,7 @@ lib/emotion/emotion_webcam.c \
15lib/emotion/emotion_modules.c \ 15lib/emotion/emotion_modules.c \
16lib/emotion/emotion_main.c 16lib/emotion/emotion_main.c
17 17
18lib_emotion_libemotion_la_CPPFLAGS = \ 18lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
19-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 19-DPACKAGE_BIN_DIR=\"$(bindir)\" \
20-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 20-DPACKAGE_LIB_DIR=\"$(libdir)\" \
21-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ 21-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
@@ -40,7 +40,7 @@ if EMOTION_BUILD_XINE
40emotionmodulexinedir = $(libdir)/emotion/modules/xine/$(MODULE_ARCH) 40emotionmodulexinedir = $(libdir)/emotion/modules/xine/$(MODULE_ARCH)
41emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la 41emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la
42modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES) 42modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
43modules_emotion_xine_module_la_CPPFLAGS = \ 43modules_emotion_xine_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
44@EMOTION_CFLAGS@ \ 44@EMOTION_CFLAGS@ \
45@EMOTION_MODULE_XINE_CFLAGS@ 45@EMOTION_MODULE_XINE_CFLAGS@
46modules_emotion_xine_module_la_LIBADD = \ 46modules_emotion_xine_module_la_LIBADD = \
@@ -68,7 +68,7 @@ if EMOTION_BUILD_GSTREAMER
68emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH) 68emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH)
69emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la 69emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la
70modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES) 70modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
71modules_emotion_gstreamer_module_la_CPPFLAGS = \ 71modules_emotion_gstreamer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
72@EMOTION_CFLAGS@ \ 72@EMOTION_CFLAGS@ \
73@EMOTION_MODULE_GSTREAMER_CFLAGS@ 73@EMOTION_MODULE_GSTREAMER_CFLAGS@
74modules_emotion_gstreamer_module_la_LIBADD = \ 74modules_emotion_gstreamer_module_la_LIBADD = \
@@ -97,7 +97,7 @@ if EMOTION_BUILD_GENERIC
97emotionmodulegenericdir = $(libdir)/emotion/modules/generic/$(MODULE_ARCH) 97emotionmodulegenericdir = $(libdir)/emotion/modules/generic/$(MODULE_ARCH)
98emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la 98emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la
99modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES) 99modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
100modules_emotion_generic_module_la_CPPFLAGS = \ 100modules_emotion_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
101@EMOTION_CFLAGS@ \ 101@EMOTION_CFLAGS@ \
102@EMOTION_MODULE_GENERIC_CFLAGS@ \ 102@EMOTION_MODULE_GENERIC_CFLAGS@ \
103-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 103-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -124,7 +124,7 @@ emotionedjeexternal_LTLIBRARIES = edje_external/emotion/module.la
124 124
125edje_external_emotion_module_la_SOURCES = \ 125edje_external_emotion_module_la_SOURCES = \
126edje_external/emotion/emotion.c 126edje_external/emotion/emotion.c
127edje_external_emotion_module_la_CPPFLAGS = \ 127edje_external_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
128@EDJE_CFLAGS@ \ 128@EDJE_CFLAGS@ \
129@EMOTION_CFLAGS@ \ 129@EMOTION_CFLAGS@ \
130-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" 130-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
@@ -148,7 +148,7 @@ bin_PROGRAMS += tests/emotion/emotion_test
148tests_emotion_emotion_test_SOURCES = \ 148tests_emotion_emotion_test_SOURCES = \
149tests/emotion/emotion_test_main.c 149tests/emotion/emotion_test_main.c
150 150
151tests_emotion_emotion_test_CPPFLAGS = \ 151tests_emotion_emotion_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
152-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 152-DPACKAGE_BIN_DIR=\"$(bindir)\" \
153-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 153-DPACKAGE_LIB_DIR=\"$(libdir)\" \
154-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ 154-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 2b69aab..1e200f3 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -13,7 +13,7 @@ lib/eo/eo_ptr_indirection.h \
13lib/eo/eo_base_class.c \ 13lib/eo/eo_base_class.c \
14lib/eo/eo_private.h 14lib/eo/eo_private.h
15 15
16lib_eo_libeo_la_CPPFLAGS = @EO_CFLAGS@ 16lib_eo_libeo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
17lib_eo_libeo_la_LIBADD = @EO_LIBS@ 17lib_eo_libeo_la_LIBADD = @EO_LIBS@
18lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@ 18lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
19lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 19lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -38,7 +38,7 @@ tests/eo/access/access_main.c \
38tests/eo/access/access_simple.c \ 38tests/eo/access/access_simple.c \
39tests/eo/access/access_simple.h \ 39tests/eo/access/access_simple.h \
40tests/eo/access/access_simple_protected.h 40tests/eo/access/access_simple_protected.h
41tests_eo_test_access_CPPFLAGS = @EO_CFLAGS@ 41tests_eo_test_access_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
42tests_eo_test_access_LDADD = @USE_EO_LIBS@ 42tests_eo_test_access_LDADD = @USE_EO_LIBS@
43tests_eo_test_access_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ 43tests_eo_test_access_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
44TESTS += tests/eo/test_access 44TESTS += tests/eo/test_access
@@ -49,7 +49,7 @@ tests/eo/composite_objects/composite_objects_comp.h \
49tests/eo/composite_objects/composite_objects_main.c \ 49tests/eo/composite_objects/composite_objects_main.c \
50tests/eo/composite_objects/composite_objects_simple.c \ 50tests/eo/composite_objects/composite_objects_simple.c \
51tests/eo/composite_objects/composite_objects_simple.h 51tests/eo/composite_objects/composite_objects_simple.h
52tests_eo_test_composite_objects_CPPFLAGS = @EO_CFLAGS@ 52tests_eo_test_composite_objects_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
53tests_eo_test_composite_objects_LDADD = @USE_EO_LIBS@ 53tests_eo_test_composite_objects_LDADD = @USE_EO_LIBS@
54tests_eo_test_composite_objects_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ 54tests_eo_test_composite_objects_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
55TESTS += tests/eo/test_composite_objects 55TESTS += tests/eo/test_composite_objects
@@ -72,7 +72,7 @@ tests/eo/constructors/constructors_simple6.c \
72tests/eo/constructors/constructors_simple6.h \ 72tests/eo/constructors/constructors_simple6.h \
73tests/eo/constructors/constructors_simple7.c \ 73tests/eo/constructors/constructors_simple7.c \
74tests/eo/constructors/constructors_simple7.h 74tests/eo/constructors/constructors_simple7.h
75tests_eo_test_constructors_CPPFLAGS = @EO_CFLAGS@ 75tests_eo_test_constructors_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
76tests_eo_test_constructors_LDADD = @USE_EO_LIBS@ 76tests_eo_test_constructors_LDADD = @USE_EO_LIBS@
77tests_eo_test_constructors_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ 77tests_eo_test_constructors_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
78TESTS += tests/eo/test_constructors 78TESTS += tests/eo/test_constructors
@@ -85,7 +85,7 @@ tests/eo/suite/eo_suite.h \
85tests/eo/suite/eo_test_class_errors.c \ 85tests/eo/suite/eo_test_class_errors.c \
86tests/eo/suite/eo_test_general.c \ 86tests/eo/suite/eo_test_general.c \
87tests/eo/suite/eo_test_init.c 87tests/eo/suite/eo_test_init.c
88tests_eo_eo_suite_CPPFLAGS = \ 88tests_eo_eo_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
89-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo\" \ 89-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo\" \
90@CHECK_CFLAGS@ \ 90@CHECK_CFLAGS@ \
91@EO_CFLAGS@ 91@EO_CFLAGS@
@@ -104,7 +104,7 @@ tests/eo/function_overrides/function_overrides_inherit3.h \
104tests/eo/function_overrides/function_overrides_main.c \ 104tests/eo/function_overrides/function_overrides_main.c \
105tests/eo/function_overrides/function_overrides_simple.c \ 105tests/eo/function_overrides/function_overrides_simple.c \
106tests/eo/function_overrides/function_overrides_simple.h 106tests/eo/function_overrides/function_overrides_simple.h
107tests_eo_test_function_overrides_CPPFLAGS = @EO_CFLAGS@ 107tests_eo_test_function_overrides_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
108tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@ 108tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@
109tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ 109tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
110TESTS += tests/eo/test_function_overrides 110TESTS += tests/eo/test_function_overrides
@@ -117,7 +117,7 @@ tests/eo/interface/interface_interface2.h \
117tests/eo/interface/interface_main.c \ 117tests/eo/interface/interface_main.c \
118tests/eo/interface/interface_simple.c \ 118tests/eo/interface/interface_simple.c \
119tests/eo/interface/interface_simple.h 119tests/eo/interface/interface_simple.h
120tests_eo_test_interface_CPPFLAGS = @EO_CFLAGS@ 120tests_eo_test_interface_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
121tests_eo_test_interface_LDADD = @USE_EO_LIBS@ 121tests_eo_test_interface_LDADD = @USE_EO_LIBS@
122tests_eo_test_interface_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ 122tests_eo_test_interface_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
123TESTS += tests/eo/test_interface 123TESTS += tests/eo/test_interface
@@ -136,7 +136,7 @@ tests/eo/mixin/mixin_mixin4.c \
136tests/eo/mixin/mixin_mixin4.h \ 136tests/eo/mixin/mixin_mixin4.h \
137tests/eo/mixin/mixin_simple.c \ 137tests/eo/mixin/mixin_simple.c \
138tests/eo/mixin/mixin_simple.h 138tests/eo/mixin/mixin_simple.h
139tests_eo_test_mixin_CPPFLAGS = @EO_CFLAGS@ 139tests_eo_test_mixin_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
140tests_eo_test_mixin_LDADD = @USE_EO_LIBS@ 140tests_eo_test_mixin_LDADD = @USE_EO_LIBS@
141tests_eo_test_mixin_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ 141tests_eo_test_mixin_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
142TESTS += tests/eo/test_mixin 142TESTS += tests/eo/test_mixin
@@ -145,7 +145,7 @@ tests_eo_test_signals_SOURCES = \
145tests/eo/signals/signals_main.c \ 145tests/eo/signals/signals_main.c \
146tests/eo/signals/signals_simple.c \ 146tests/eo/signals/signals_simple.c \
147tests/eo/signals/signals_simple.h 147tests/eo/signals/signals_simple.h
148tests_eo_test_signals_CPPFLAGS = @EO_CFLAGS@ 148tests_eo_test_signals_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
149tests_eo_test_signals_LDADD = @USE_EO_LIBS@ 149tests_eo_test_signals_LDADD = @USE_EO_LIBS@
150tests_eo_test_signals_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@ 150tests_eo_test_signals_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
151TESTS += tests/eo/test_signals 151TESTS += tests/eo/test_signals
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index c9399c9..6a2062b 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -19,7 +19,7 @@ lib/escape/escape_libgen.c \
19lib/escape/escape_mman.c \ 19lib/escape/escape_mman.c \
20lib/escape/escape_unistd.c 20lib/escape/escape_unistd.c
21 21
22lib_escape_libescape_la_CPPFLAGS = @ESCAPE_CFLAGS@ 22lib_escape_libescape_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ESCAPE_CFLAGS@
23lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ 23lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
24lib_escape_libescape_la_DEPENDENCIES = @ESCAPE_INTERNAL_LIBS@ 24lib_escape_libescape_la_DEPENDENCIES = @ESCAPE_INTERNAL_LIBS@
25lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 25lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 6dd1406..50f873c 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -14,7 +14,7 @@ lib/ethumb/md5.h \
14lib/ethumb/ethumb.c \ 14lib/ethumb/ethumb.c \
15lib/ethumb/md5.c 15lib/ethumb/md5.c
16 16
17lib_ethumb_libethumb_la_CPPFLAGS = \ 17lib_ethumb_libethumb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
18-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 18-DPACKAGE_BIN_DIR=\"$(bindir)\" \
19-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 19-DPACKAGE_LIB_DIR=\"$(libdir)\" \
20-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 20-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
@@ -31,7 +31,7 @@ ethumbmoduleemotiondir = $(libdir)/ethumb/modules/emotion/$(MODULE_ARCH)
31ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la 31ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la
32modules_ethumb_emotion_module_la_SOURCES = \ 32modules_ethumb_emotion_module_la_SOURCES = \
33modules/ethumb/emotion/emotion.c 33modules/ethumb/emotion/emotion.c
34modules_ethumb_emotion_module_la_CPPFLAGS = \ 34modules_ethumb_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
35-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 35-DPACKAGE_BIN_DIR=\"$(bindir)\" \
36-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 36-DPACKAGE_LIB_DIR=\"$(libdir)\" \
37-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 37-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
@@ -65,7 +65,7 @@ bin_PROGRAMS += \
65bin/ethumb/ethumb 65bin/ethumb/ethumb
66 66
67bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c 67bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
68bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@ 68bin_ethumb_ethumb_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CFLAGS@
69if HAVE_WIN32 69if HAVE_WIN32
70bin_ethumb_ethumb_LDADD = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_LIBS@ 70bin_ethumb_ethumb_LDADD = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_LIBS@
71else 71else
diff --git a/src/Makefile_Ethumb_Client.am b/src/Makefile_Ethumb_Client.am
index b0e2088..851b35f 100644
--- a/src/Makefile_Ethumb_Client.am
+++ b/src/Makefile_Ethumb_Client.am
@@ -9,7 +9,7 @@ lib/ethumb_client/Ethumb_Client.h
9 9
10# libethumb_client.la 10# libethumb_client.la
11lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb_client/ethumb_client.c 11lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb_client/ethumb_client.c
12lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@ 12lib_ethumb_client_libethumb_client_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@
13lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@ 13lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
14lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@ 14lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
15lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 15lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -34,7 +34,7 @@ bin/ethumb_client/ethumbd_slave
34bin_ethumb_client_ethumbd_SOURCES = \ 34bin_ethumb_client_ethumbd_SOURCES = \
35bin/ethumb_client/ethumbd_private.h \ 35bin/ethumb_client/ethumbd_private.h \
36bin/ethumb_client/ethumbd.c 36bin/ethumb_client/ethumbd.c
37bin_ethumb_client_ethumbd_CPPFLAGS = \ 37bin_ethumb_client_ethumbd_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
38-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 38-DPACKAGE_BIN_DIR=\"$(bindir)\" \
39-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 39-DPACKAGE_LIB_DIR=\"$(libdir)\" \
40-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \ 40-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
@@ -44,7 +44,7 @@ bin_ethumb_client_ethumbd_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
44bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ 44bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
45 45
46bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c 46bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c
47bin_ethumb_client_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@ 47bin_ethumb_client_ethumbd_client_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@
48bin_ethumb_client_ethumbd_client_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS) 48bin_ethumb_client_ethumbd_client_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
49bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ 49bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
50 50
@@ -52,6 +52,6 @@ bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS
52bin_ethumb_client_ethumbd_slave_SOURCES = \ 52bin_ethumb_client_ethumbd_slave_SOURCES = \
53bin/ethumb_client/ethumbd_private.h \ 53bin/ethumb_client/ethumbd_private.h \
54bin/ethumb_client/ethumbd_slave.c 54bin/ethumb_client/ethumbd_slave.c
55bin_ethumb_client_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@ 55bin_ethumb_client_ethumbd_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CFLAGS@
56bin_ethumb_client_ethumbd_slave_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS) 56bin_ethumb_client_ethumbd_slave_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
57bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ @USE_ETHUMB_INTERNAL_LIBS@ 57bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ @USE_ETHUMB_INTERNAL_LIBS@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index ae87ce7..6b791ae 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -190,7 +190,7 @@ lib/evas/common/language/evas_script_table.h \
190lib/evas/common/evas_text_utils.h \ 190lib/evas/common/evas_text_utils.h \
191lib/evas/common/evas_font_ot.h 191lib/evas/common/evas_font_ot.h
192 192
193lib_evas_libevas_la_CPPFLAGS = \ 193lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
194-I$(top_srcdir)/src/lib/evas/common \ 194-I$(top_srcdir)/src/lib/evas/common \
195-I$(top_srcdir)/src/lib/evas/cserve2 \ 195-I$(top_srcdir)/src/lib/evas/cserve2 \
196-I$(top_srcdir)/src/lib/evas/file \ 196-I$(top_srcdir)/src/lib/evas/file \
@@ -210,7 +210,7 @@ noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
210lib_evas_common_libevas_op_blend_sse3_la_SOURCES = \ 210lib_evas_common_libevas_op_blend_sse3_la_SOURCES = \
211lib/evas/common/evas_op_blend/op_blend_master_sse3.c 211lib/evas/common/evas_op_blend/op_blend_master_sse3.c
212 212
213lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = \ 213lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
214$(lib_evas_libevas_la_CPPFLAGS) \ 214$(lib_evas_libevas_la_CPPFLAGS) \
215@SSE3_CFLAGS@ 215@SSE3_CFLAGS@
216 216
@@ -360,7 +360,7 @@ else
360enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) 360enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
361enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la 361enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la
362modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c 362modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c
363modules_evas_engines_software_generic_module_la_CPPFLAGS = \ 363modules_evas_engines_software_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
364-I$(top_srcdir)/src/lib/evas/include \ 364-I$(top_srcdir)/src/lib/evas/include \
365-I$(top_srcdir)/src/lib/evas/cserve2 \ 365-I$(top_srcdir)/src/lib/evas/cserve2 \
366@EVAS_CFLAGS@ 366@EVAS_CFLAGS@
@@ -382,7 +382,7 @@ else
382enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH) 382enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
383enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la 383enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
384modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES) 384modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
385modules_evas_engines_buffer_module_la_CPPFLAGS = \ 385modules_evas_engines_buffer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
386-I$(top_srcdir)/src/lib/evas/include \ 386-I$(top_srcdir)/src/lib/evas/include \
387-I$(top_srcdir)/src/lib/evas/cserve2 \ 387-I$(top_srcdir)/src/lib/evas/cserve2 \
388@EVAS_CFLAGS@ 388@EVAS_CFLAGS@
@@ -409,7 +409,7 @@ else
409enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH) 409enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
410enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la 410enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la
411modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES) 411modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES)
412modules_evas_engines_fb_module_la_CPPFLAGS = \ 412modules_evas_engines_fb_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
413-I$(top_srcdir)/src/lib/evas/include \ 413-I$(top_srcdir)/src/lib/evas/include \
414-I$(top_srcdir)/src/lib/evas/cserve2 \ 414-I$(top_srcdir)/src/lib/evas/cserve2 \
415@evas_engine_fb_cflags@ \ 415@evas_engine_fb_cflags@ \
@@ -602,7 +602,7 @@ lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
602else 602else
603noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la 603noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
604modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) 604modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
605modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ 605modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
606-I$(top_srcdir)/src/lib/evas/include \ 606-I$(top_srcdir)/src/lib/evas/include \
607-I$(top_srcdir)/src/lib/evas/cserve2 \ 607-I$(top_srcdir)/src/lib/evas/cserve2 \
608@EVAS_CFLAGS@ 608@EVAS_CFLAGS@
@@ -632,7 +632,7 @@ else
632engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH) 632engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
633engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la 633engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
634modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES) 634modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES)
635modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \ 635modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
636-I$(top_srcdir)/src/lib/evas/include \ 636-I$(top_srcdir)/src/lib/evas/include \
637-I$(top_srcdir)/src/lib/evas/cserve2 \ 637-I$(top_srcdir)/src/lib/evas/cserve2 \
638-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 638-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -667,7 +667,7 @@ else
667engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH) 667engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
668engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la 668engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la
669modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES) 669modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
670modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \ 670modules_evas_engines_gl_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
671-I$(top_srcdir)/src/lib/evas/include \ 671-I$(top_srcdir)/src/lib/evas/include \
672-I$(top_srcdir)/src/lib/evas/cserve2 \ 672-I$(top_srcdir)/src/lib/evas/cserve2 \
673-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 673-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -706,7 +706,7 @@ else
706engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) 706engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
707engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la 707engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
708modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES) 708modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
709modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ 709modules_evas_engines_gl_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
710-I$(top_srcdir)/src/lib/evas/include \ 710-I$(top_srcdir)/src/lib/evas/include \
711-I$(top_srcdir)/src/lib/evas/cserve2 \ 711-I$(top_srcdir)/src/lib/evas/cserve2 \
712-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 712-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -745,7 +745,7 @@ else
745enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH) 745enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
746enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la 746enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la
747modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES) 747modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES)
748modules_evas_engines_psl1ght_module_la_CPPFLAGS = \ 748modules_evas_engines_psl1ght_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
749-I$(top_srcdir)/src/lib/evas/include \ 749-I$(top_srcdir)/src/lib/evas/include \
750-I$(top_srcdir)/src/lib/evas/cserve2 \ 750-I$(top_srcdir)/src/lib/evas/cserve2 \
751@EVAS_CFLAGS@ \ 751@EVAS_CFLAGS@ \
@@ -776,7 +776,7 @@ else
776enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH) 776enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
777enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la 777enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la
778modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES) 778modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
779modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \ 779modules_evas_engines_software_ddraw_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
780-I$(top_srcdir)/src/lib/evas/include \ 780-I$(top_srcdir)/src/lib/evas/include \
781-I$(top_srcdir)/src/lib/evas/cserve2 \ 781-I$(top_srcdir)/src/lib/evas/cserve2 \
782@EVAS_CFLAGS@ \ 782@EVAS_CFLAGS@ \
@@ -807,7 +807,7 @@ else
807enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH) 807enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
808enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la 808enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la
809modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES) 809modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
810modules_evas_engines_software_gdi_module_la_CPPFLAGS = \ 810modules_evas_engines_software_gdi_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
811-I$(top_srcdir)/src/lib/evas/include \ 811-I$(top_srcdir)/src/lib/evas/include \
812-I$(top_srcdir)/src/lib/evas/cserve2 \ 812-I$(top_srcdir)/src/lib/evas/cserve2 \
813@EVAS_CFLAGS@ \ 813@EVAS_CFLAGS@ \
@@ -828,7 +828,7 @@ modules/evas/engines/software_x11/evas_engine.c \
828modules/evas/engines/software_x11/evas_engine.h \ 828modules/evas/engines/software_x11/evas_engine.h \
829modules/evas/engines/software_x11/evas_x_egl.c \ 829modules/evas/engines/software_x11/evas_x_egl.c \
830modules/evas/engines/software_x11/evas_x_egl.h 830modules/evas/engines/software_x11/evas_x_egl.h
831SOFTWARE_X11_CPPFLAGS = \ 831SOFTWARE_X11_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
832-I$(top_srcdir)/src/lib/evas/include \ 832-I$(top_srcdir)/src/lib/evas/include \
833-I$(top_srcdir)/src/lib/evas/cserve2 \ 833-I$(top_srcdir)/src/lib/evas/cserve2 \
834@EVAS_CFLAGS@ 834@EVAS_CFLAGS@
@@ -871,7 +871,7 @@ else
871enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH) 871enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
872enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la 872enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
873modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES) 873modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
874modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS) 874modules_evas_engines_software_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(SOFTWARE_X11_CPPFLAGS)
875modules_evas_engines_software_x11_module_la_LIBADD = @USE_EVAS_LIBS@ $(SOFTWARE_X11_LIBADD) 875modules_evas_engines_software_x11_module_la_LIBADD = @USE_EVAS_LIBS@ $(SOFTWARE_X11_LIBADD)
876modules_evas_engines_software_x11_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ 876modules_evas_engines_software_x11_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
877modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 877modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
@@ -895,7 +895,7 @@ else
895enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) 895enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
896enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la 896enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
897modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES) 897modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
898modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \ 898modules_evas_engines_wayland_egl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
899-I$(top_srcdir)/src/lib/evas/include \ 899-I$(top_srcdir)/src/lib/evas/include \
900-I$(top_srcdir)/src/lib/evas/cserve2 \ 900-I$(top_srcdir)/src/lib/evas/cserve2 \
901-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 901-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@@ -931,7 +931,7 @@ else
931enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) 931enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
932enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la 932enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
933modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES) 933modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
934modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \ 934modules_evas_engines_wayland_shm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
935-I$(top_srcdir)/src/lib/evas/include \ 935-I$(top_srcdir)/src/lib/evas/include \
936-I$(top_srcdir)/src/lib/evas/cserve2 \ 936-I$(top_srcdir)/src/lib/evas/cserve2 \
937@EVAS_CFLAGS@ \ 937@EVAS_CFLAGS@ \
@@ -956,7 +956,7 @@ else
956loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH) 956loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
957loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la 957loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
958modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c 958modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c
959modules_evas_loaders_bmp_module_la_CPPFLAGS = \ 959modules_evas_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
960-I$(top_srcdir)/src/lib/evas/include \ 960-I$(top_srcdir)/src/lib/evas/include \
961@EVAS_CFLAGS@ \ 961@EVAS_CFLAGS@ \
962@evas_image_loader_bmp_cflags@ 962@evas_image_loader_bmp_cflags@
@@ -978,7 +978,7 @@ else
978loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) 978loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
979loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la 979loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la
980modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c 980modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c
981modules_evas_loaders_eet_module_la_CPPFLAGS = \ 981modules_evas_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
982-I$(top_srcdir)/src/lib/evas/include \ 982-I$(top_srcdir)/src/lib/evas/include \
983@EVAS_CFLAGS@ \ 983@EVAS_CFLAGS@ \
984@evas_image_loader_eet_cflags@ 984@evas_image_loader_eet_cflags@
@@ -1000,7 +1000,7 @@ else
1000loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) 1000loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
1001loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la 1001loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la
1002modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c 1002modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c
1003modules_evas_loaders_generic_module_la_CPPFLAGS = \ 1003modules_evas_loaders_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1004-I$(top_srcdir)/src/lib/evas/include \ 1004-I$(top_srcdir)/src/lib/evas/include \
1005@EVAS_CFLAGS@ \ 1005@EVAS_CFLAGS@ \
1006@evas_image_loader_generic_cflags@ 1006@evas_image_loader_generic_cflags@
@@ -1022,7 +1022,7 @@ else
1022loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) 1022loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
1023loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la 1023loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la
1024modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c 1024modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c
1025modules_evas_loaders_gif_module_la_CPPFLAGS = \ 1025modules_evas_loaders_gif_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1026-I$(top_srcdir)/src/lib/evas/include \ 1026-I$(top_srcdir)/src/lib/evas/include \
1027@EVAS_CFLAGS@ \ 1027@EVAS_CFLAGS@ \
1028@evas_image_loader_gif_cflags@ 1028@evas_image_loader_gif_cflags@
@@ -1044,7 +1044,7 @@ else
1044loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH) 1044loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH)
1045loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la 1045loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la
1046modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c 1046modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c
1047modules_evas_loaders_ico_module_la_CPPFLAGS = \ 1047modules_evas_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1048-I$(top_srcdir)/src/lib/evas/include \ 1048-I$(top_srcdir)/src/lib/evas/include \
1049@EVAS_CFLAGS@ \ 1049@EVAS_CFLAGS@ \
1050@evas_image_loader_ico_cflags@ 1050@evas_image_loader_ico_cflags@
@@ -1069,7 +1069,7 @@ else
1069loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) 1069loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
1070loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la 1070loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la
1071modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c 1071modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c
1072modules_evas_loaders_jpeg_module_la_CPPFLAGS = \ 1072modules_evas_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1073-I$(top_srcdir)/src/lib/evas/include \ 1073-I$(top_srcdir)/src/lib/evas/include \
1074@EVAS_CFLAGS@ \ 1074@EVAS_CFLAGS@ \
1075@evas_image_loader_jpeg_cflags@ 1075@evas_image_loader_jpeg_cflags@
@@ -1083,7 +1083,7 @@ if BUILD_SAVER_JPEG
1083saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) 1083saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
1084saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la 1084saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la
1085modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c 1085modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c
1086modules_evas_savers_jpeg_module_la_CPPFLAGS = \ 1086modules_evas_savers_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1087-I$(top_srcdir)/src/lib/evas/include \ 1087-I$(top_srcdir)/src/lib/evas/include \
1088@EVAS_CFLAGS@ \ 1088@EVAS_CFLAGS@ \
1089@evas_image_loader_jpeg_cflags@ 1089@evas_image_loader_jpeg_cflags@
@@ -1106,7 +1106,7 @@ else
1106loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) 1106loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
1107loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la 1107loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la
1108modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c 1108modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c
1109modules_evas_loaders_pmaps_module_la_CPPFLAGS = \ 1109modules_evas_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1110-I$(top_srcdir)/src/lib/evas/include \ 1110-I$(top_srcdir)/src/lib/evas/include \
1111@EVAS_CFLAGS@ \ 1111@EVAS_CFLAGS@ \
1112@evas_image_loader_pmaps_cflags@ 1112@evas_image_loader_pmaps_cflags@
@@ -1128,7 +1128,7 @@ else
1128loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) 1128loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
1129loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la 1129loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la
1130modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c 1130modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c
1131modules_evas_loaders_png_module_la_CPPFLAGS = \ 1131modules_evas_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1132-I$(top_srcdir)/src/lib/evas/include \ 1132-I$(top_srcdir)/src/lib/evas/include \
1133@EVAS_CFLAGS@ \ 1133@EVAS_CFLAGS@ \
1134@evas_image_loader_png_cflags@ 1134@evas_image_loader_png_cflags@
@@ -1142,7 +1142,7 @@ modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
1142saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) 1142saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH)
1143saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la 1143saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la
1144modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c 1144modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c
1145modules_evas_savers_png_module_la_CPPFLAGS = \ 1145modules_evas_savers_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1146-I$(top_srcdir)/src/lib/evas/include \ 1146-I$(top_srcdir)/src/lib/evas/include \
1147@EVAS_CFLAGS@ \ 1147@EVAS_CFLAGS@ \
1148@evas_image_loader_png_cflags@ 1148@evas_image_loader_png_cflags@
@@ -1164,7 +1164,7 @@ else
1164loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH) 1164loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH)
1165loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la 1165loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la
1166modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c 1166modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c
1167modules_evas_loaders_psd_module_la_CPPFLAGS = \ 1167modules_evas_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1168-I$(top_srcdir)/src/lib/evas/include \ 1168-I$(top_srcdir)/src/lib/evas/include \
1169@EVAS_CFLAGS@ \ 1169@EVAS_CFLAGS@ \
1170@evas_image_loader_psd_cflags@ 1170@evas_image_loader_psd_cflags@
@@ -1186,7 +1186,7 @@ else
1186loadersvgpkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH) 1186loadersvgpkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
1187loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la 1187loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la
1188modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c 1188modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c
1189modules_evas_loaders_svg_module_la_CPPFLAGS = \ 1189modules_evas_loaders_svg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1190-I$(top_srcdir)/src/lib/evas/include \ 1190-I$(top_srcdir)/src/lib/evas/include \
1191@EVAS_CFLAGS@ \ 1191@EVAS_CFLAGS@ \
1192@evas_image_loader_svg_cflags@ 1192@evas_image_loader_svg_cflags@
@@ -1208,7 +1208,7 @@ else
1208loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH) 1208loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH)
1209loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la 1209loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la
1210modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c 1210modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c
1211modules_evas_loaders_tga_module_la_CPPFLAGS = \ 1211modules_evas_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1212-I$(top_srcdir)/src/lib/evas/include \ 1212-I$(top_srcdir)/src/lib/evas/include \
1213@EVAS_CFLAGS@ \ 1213@EVAS_CFLAGS@ \
1214@evas_image_loader_tga_cflags@ 1214@evas_image_loader_tga_cflags@
@@ -1230,7 +1230,7 @@ else
1230loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) 1230loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
1231loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la 1231loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la
1232modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c 1232modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c
1233modules_evas_loaders_tiff_module_la_CPPFLAGS = \ 1233modules_evas_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1234-I$(top_srcdir)/src/lib/evas/include \ 1234-I$(top_srcdir)/src/lib/evas/include \
1235@EVAS_CFLAGS@ \ 1235@EVAS_CFLAGS@ \
1236@evas_image_loader_tiff_cflags@ 1236@evas_image_loader_tiff_cflags@
@@ -1244,7 +1244,7 @@ modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
1244savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) 1244savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH)
1245savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la 1245savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la
1246modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c 1246modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c
1247modules_evas_savers_tiff_module_la_CPPFLAGS = \ 1247modules_evas_savers_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1248-I$(top_srcdir)/src/lib/evas/include \ 1248-I$(top_srcdir)/src/lib/evas/include \
1249@EVAS_CFLAGS@ \ 1249@EVAS_CFLAGS@ \
1250@evas_image_loader_tiff_cflags@ 1250@evas_image_loader_tiff_cflags@
@@ -1266,7 +1266,7 @@ else
1266loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH) 1266loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH)
1267loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la 1267loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la
1268modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c 1268modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c
1269modules_evas_loaders_wbmp_module_la_CPPFLAGS = \ 1269modules_evas_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1270-I$(top_srcdir)/src/lib/evas/include \ 1270-I$(top_srcdir)/src/lib/evas/include \
1271@EVAS_CFLAGS@ \ 1271@EVAS_CFLAGS@ \
1272@evas_image_loader_wbmp_cflags@ 1272@evas_image_loader_wbmp_cflags@
@@ -1288,7 +1288,7 @@ else
1288loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH) 1288loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH)
1289loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la 1289loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la
1290modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c 1290modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c
1291modules_evas_loaders_webp_module_la_CPPFLAGS = \ 1291modules_evas_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1292-I$(top_srcdir)/src/lib/evas/include \ 1292-I$(top_srcdir)/src/lib/evas/include \
1293@EVAS_CFLAGS@ \ 1293@EVAS_CFLAGS@ \
1294@evas_image_loader_webp_cflags@ 1294@evas_image_loader_webp_cflags@
@@ -1302,7 +1302,7 @@ modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
1302saverwebppkgdir = $(libdir)/evas/modules/savers/webp/$(MODULE_ARCH) 1302saverwebppkgdir = $(libdir)/evas/modules/savers/webp/$(MODULE_ARCH)
1303saverwebppkg_LTLIBRARIES = modules/evas/savers/webp/module.la 1303saverwebppkg_LTLIBRARIES = modules/evas/savers/webp/module.la
1304modules_evas_savers_webp_module_la_SOURCES = modules/evas/savers/webp/evas_image_save_webp.c 1304modules_evas_savers_webp_module_la_SOURCES = modules/evas/savers/webp/evas_image_save_webp.c
1305modules_evas_savers_webp_module_la_CPPFLAGS = \ 1305modules_evas_savers_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1306-I$(top_srcdir)/src/lib/evas/include \ 1306-I$(top_srcdir)/src/lib/evas/include \
1307@EVAS_CFLAGS@ \ 1307@EVAS_CFLAGS@ \
1308@evas_image_loader_webp_cflags@ 1308@evas_image_loader_webp_cflags@
@@ -1324,7 +1324,7 @@ else
1324loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) 1324loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
1325loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la 1325loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la
1326modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c 1326modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c
1327modules_evas_loaders_xpm_module_la_CPPFLAGS = \ 1327modules_evas_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1328-I$(top_srcdir)/src/lib/evas/include \ 1328-I$(top_srcdir)/src/lib/evas/include \
1329@EVAS_CFLAGS@ \ 1329@EVAS_CFLAGS@ \
1330@evas_image_loader_xpm_cflags@ 1330@evas_image_loader_xpm_cflags@
@@ -1369,7 +1369,7 @@ bin/evas/evas_cserve2_main_loop_linux.c \
1369lib/evas/cserve2/evas_cs2_utils.h \ 1369lib/evas/cserve2/evas_cs2_utils.h \
1370lib/evas/cserve2/evas_cs2_utils.c 1370lib/evas/cserve2/evas_cs2_utils.c
1371 1371
1372bin_evas_evas_cserve2_CPPFLAGS = \ 1372bin_evas_evas_cserve2_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1373-I$(top_srcdir)/src/lib/evas/include \ 1373-I$(top_srcdir)/src/lib/evas/include \
1374-I$(top_srcdir)/src/lib/evas/cserve2 \ 1374-I$(top_srcdir)/src/lib/evas/cserve2 \
1375-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 1375-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -1382,7 +1382,7 @@ bin_evas_evas_cserve2_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
1382 1382
1383bin_evas_evas_cserve2_client_SOURCES = \ 1383bin_evas_evas_cserve2_client_SOURCES = \
1384bin/evas/evas_cserve2_client.c 1384bin/evas/evas_cserve2_client.c
1385bin_evas_evas_cserve2_client_CPPFLAGS = \ 1385bin_evas_evas_cserve2_client_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1386-I$(top_srcdir)/src/lib/evas/cserve2 \ 1386-I$(top_srcdir)/src/lib/evas/cserve2 \
1387@EINA_CFLAGS@ 1387@EINA_CFLAGS@
1388bin_evas_evas_cserve2_client_LDADD = @USE_EINA_LIBS@ 1388bin_evas_evas_cserve2_client_LDADD = @USE_EINA_LIBS@
@@ -1390,7 +1390,7 @@ bin_evas_evas_cserve2_client_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
1390 1390
1391bin_evas_evas_cserve2_usage_SOURCES = \ 1391bin_evas_evas_cserve2_usage_SOURCES = \
1392bin/evas/evas_cserve2_usage.c 1392bin/evas/evas_cserve2_usage.c
1393bin_evas_evas_cserve2_usage_CPPFLAGS = \ 1393bin_evas_evas_cserve2_usage_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1394-I$(top_srcdir)/src/lib/evas/cserve2 \ 1394-I$(top_srcdir)/src/lib/evas/cserve2 \
1395@EINA_CFLAGS@ 1395@EINA_CFLAGS@
1396bin_evas_evas_cserve2_usage_LDADD = @USE_EINA_LIBS@ 1396bin_evas_evas_cserve2_usage_LDADD = @USE_EINA_LIBS@
@@ -1398,7 +1398,7 @@ bin_evas_evas_cserve2_usage_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
1398 1398
1399bin_evas_evas_cserve2_debug_SOURCES = \ 1399bin_evas_evas_cserve2_debug_SOURCES = \
1400bin/evas/evas_cserve2_debug.c 1400bin/evas/evas_cserve2_debug.c
1401bin_evas_evas_cserve2_debug_CPPFLAGS = \ 1401bin_evas_evas_cserve2_debug_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1402-I$(top_srcdir)/src/lib/evas/cserve2 \ 1402-I$(top_srcdir)/src/lib/evas/cserve2 \
1403@EINA_CFLAGS@ 1403@EINA_CFLAGS@
1404bin_evas_evas_cserve2_debug_LDADD = @USE_EINA_LIBS@ 1404bin_evas_evas_cserve2_debug_LDADD = @USE_EINA_LIBS@
@@ -1408,7 +1408,7 @@ bin_evas_evas_cserve2_slave_SOURCES = \
1408bin/evas/evas_cserve2_slave.c \ 1408bin/evas/evas_cserve2_slave.c \
1409bin/evas/evas_cserve2_utils.c 1409bin/evas/evas_cserve2_utils.c
1410 1410
1411bin_evas_evas_cserve2_slave_CPPFLAGS = \ 1411bin_evas_evas_cserve2_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1412-I$(top_srcdir)/src/lib/evas/include \ 1412-I$(top_srcdir)/src/lib/evas/include \
1413-I$(top_srcdir)/src/lib/evas/cserve2 \ 1413-I$(top_srcdir)/src/lib/evas/cserve2 \
1414-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 1414-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -1423,7 +1423,7 @@ bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic
1423bin_evas_dummy_slave_SOURCES = \ 1423bin_evas_dummy_slave_SOURCES = \
1424bin/evas/dummy_slave.c 1424bin/evas/dummy_slave.c
1425 1425
1426bin_evas_dummy_slave_CPPFLAGS = \ 1426bin_evas_dummy_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1427-I$(top_srcdir)/src/lib/evas/include \ 1427-I$(top_srcdir)/src/lib/evas/include \
1428-I$(top_srcdir)/src/lib/evas/cserve2 \ 1428-I$(top_srcdir)/src/lib/evas/cserve2 \
1429@EVAS_CFLAGS@ 1429@EVAS_CFLAGS@
@@ -1438,7 +1438,7 @@ if BUILD_LOADER_BMP
1438cserve2bmppkgdir = $(libdir)/evas/cserve2/loaders/bmp/$(MODULE_ARCH) 1438cserve2bmppkgdir = $(libdir)/evas/cserve2/loaders/bmp/$(MODULE_ARCH)
1439cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la 1439cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la
1440bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c 1440bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c
1441bin_evas_loaders_bmp_module_la_CPPFLAGS = \ 1441bin_evas_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1442-I$(top_srcdir)/src/lib/evas/include \ 1442-I$(top_srcdir)/src/lib/evas/include \
1443-I$(top_srcdir)/src/lib/evas/cserve2 \ 1443-I$(top_srcdir)/src/lib/evas/cserve2 \
1444-I$(top_srcdir)/src/bin/evas \ 1444-I$(top_srcdir)/src/bin/evas \
@@ -1454,7 +1454,7 @@ if BUILD_LOADER_EET
1454cserve2eetpkgdir = $(libdir)/evas/cserve2/loaders/eet/$(MODULE_ARCH) 1454cserve2eetpkgdir = $(libdir)/evas/cserve2/loaders/eet/$(MODULE_ARCH)
1455cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la 1455cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la
1456bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c 1456bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c
1457bin_evas_loaders_eet_module_la_CPPFLAGS = \ 1457bin_evas_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1458-I$(top_srcdir)/src/lib/evas/include \ 1458-I$(top_srcdir)/src/lib/evas/include \
1459-I$(top_srcdir)/src/lib/evas/cserve2 \ 1459-I$(top_srcdir)/src/lib/evas/cserve2 \
1460-I$(top_srcdir)/src/bin/evas \ 1460-I$(top_srcdir)/src/bin/evas \
@@ -1475,7 +1475,7 @@ if BUILD_LOADER_ICO
1475cserve2icopkgdir = $(libdir)/evas/cserve2/loaders/ico/$(MODULE_ARCH) 1475cserve2icopkgdir = $(libdir)/evas/cserve2/loaders/ico/$(MODULE_ARCH)
1476cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la 1476cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la
1477bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c 1477bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c
1478bin_evas_loaders_ico_module_la_CPPFLAGS = \ 1478bin_evas_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1479-I$(top_srcdir)/src/lib/evas/include \ 1479-I$(top_srcdir)/src/lib/evas/include \
1480-I$(top_srcdir)/src/lib/evas/cserve2 \ 1480-I$(top_srcdir)/src/lib/evas/cserve2 \
1481-I$(top_srcdir)/src/bin/evas \ 1481-I$(top_srcdir)/src/bin/evas \
@@ -1491,7 +1491,7 @@ if BUILD_LOADER_JPEG
1491cserve2jpegpkgdir = $(libdir)/evas/cserve2/loaders/jpeg/$(MODULE_ARCH) 1491cserve2jpegpkgdir = $(libdir)/evas/cserve2/loaders/jpeg/$(MODULE_ARCH)
1492cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la 1492cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la
1493bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c 1493bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c
1494bin_evas_loaders_jpeg_module_la_CPPFLAGS = \ 1494bin_evas_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1495-I$(top_srcdir)/src/lib/evas/include \ 1495-I$(top_srcdir)/src/lib/evas/include \
1496-I$(top_srcdir)/src/lib/evas/cserve2 \ 1496-I$(top_srcdir)/src/lib/evas/cserve2 \
1497-I$(top_srcdir)/src/bin/evas \ 1497-I$(top_srcdir)/src/bin/evas \
@@ -1507,7 +1507,7 @@ if BUILD_LOADER_PMAPS
1507cserve2pmapspkgdir = $(libdir)/evas/cserve2/loaders/pmaps/$(MODULE_ARCH) 1507cserve2pmapspkgdir = $(libdir)/evas/cserve2/loaders/pmaps/$(MODULE_ARCH)
1508cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la 1508cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la
1509bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c 1509bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c
1510bin_evas_loaders_pmaps_module_la_CPPFLAGS = \ 1510bin_evas_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1511-I$(top_srcdir)/src/bin/evas \ 1511-I$(top_srcdir)/src/bin/evas \
1512-I$(top_srcdir)/src/lib/evas/include \ 1512-I$(top_srcdir)/src/lib/evas/include \
1513-I$(top_srcdir)/src/lib/evas/cserve2 \ 1513-I$(top_srcdir)/src/lib/evas/cserve2 \
@@ -1523,7 +1523,7 @@ if BUILD_LOADER_PNG
1523cserve2pngpkgdir = $(libdir)/evas/cserve2/loaders/png/$(MODULE_ARCH) 1523cserve2pngpkgdir = $(libdir)/evas/cserve2/loaders/png/$(MODULE_ARCH)
1524cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la 1524cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la
1525bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c 1525bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c
1526bin_evas_loaders_png_module_la_CPPFLAGS = \ 1526bin_evas_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1527-I$(top_srcdir)/src/lib/evas/include \ 1527-I$(top_srcdir)/src/lib/evas/include \
1528-I$(top_srcdir)/src/lib/evas/cserve2 \ 1528-I$(top_srcdir)/src/lib/evas/cserve2 \
1529-I$(top_srcdir)/src/bin/evas \ 1529-I$(top_srcdir)/src/bin/evas \
@@ -1539,7 +1539,7 @@ if BUILD_LOADER_PSD
1539cserve2psdpkgdir = $(libdir)/evas/cserve2/loaders/psd/$(MODULE_ARCH) 1539cserve2psdpkgdir = $(libdir)/evas/cserve2/loaders/psd/$(MODULE_ARCH)
1540cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la 1540cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la
1541bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c 1541bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c
1542bin_evas_loaders_psd_module_la_CPPFLAGS = \ 1542bin_evas_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1543-I$(top_srcdir)/src/lib/evas/include \ 1543-I$(top_srcdir)/src/lib/evas/include \
1544-I$(top_srcdir)/src/lib/evas/cserve2 \ 1544-I$(top_srcdir)/src/lib/evas/cserve2 \
1545-I$(top_srcdir)/src/bin/evas \ 1545-I$(top_srcdir)/src/bin/evas \
@@ -1555,7 +1555,7 @@ if BUILD_LOADER_TGA
1555cserve2tgapkgdir = $(libdir)/evas/cserve2/loaders/tga/$(MODULE_ARCH) 1555cserve2tgapkgdir = $(libdir)/evas/cserve2/loaders/tga/$(MODULE_ARCH)
1556cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la 1556cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la
1557bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c 1557bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c
1558bin_evas_loaders_tga_module_la_CPPFLAGS = \ 1558bin_evas_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1559-I$(top_srcdir)/src/lib/evas/include \ 1559-I$(top_srcdir)/src/lib/evas/include \
1560-I$(top_srcdir)/src/lib/evas/cserve2 \ 1560-I$(top_srcdir)/src/lib/evas/cserve2 \
1561-I$(top_srcdir)/src/bin/evas \ 1561-I$(top_srcdir)/src/bin/evas \
@@ -1571,7 +1571,7 @@ if BUILD_LOADER_TIFF
1571cserve2tiffpkgdir = $(libdir)/evas/cserve2/loaders/tiff/$(MODULE_ARCH) 1571cserve2tiffpkgdir = $(libdir)/evas/cserve2/loaders/tiff/$(MODULE_ARCH)
1572cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la 1572cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la
1573bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c 1573bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c
1574bin_evas_loaders_tiff_module_la_CPPFLAGS = \ 1574bin_evas_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1575-I$(top_srcdir)/src/lib/evas/include \ 1575-I$(top_srcdir)/src/lib/evas/include \
1576-I$(top_srcdir)/src/lib/evas/cserve2 \ 1576-I$(top_srcdir)/src/lib/evas/cserve2 \
1577-I$(top_srcdir)/src/bin/evas \ 1577-I$(top_srcdir)/src/bin/evas \
@@ -1587,7 +1587,7 @@ if BUILD_LOADER_WBMP
1587cserve2wbmppkgdir = $(libdir)/evas/cserve2/loaders/wbmp/$(MODULE_ARCH) 1587cserve2wbmppkgdir = $(libdir)/evas/cserve2/loaders/wbmp/$(MODULE_ARCH)
1588cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la 1588cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la
1589bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c 1589bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c
1590bin_evas_loaders_wbmp_module_la_CPPFLAGS = \ 1590bin_evas_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1591-I$(top_srcdir)/src/lib/evas/include \ 1591-I$(top_srcdir)/src/lib/evas/include \
1592-I$(top_srcdir)/src/lib/evas/cserve2 \ 1592-I$(top_srcdir)/src/lib/evas/cserve2 \
1593-I$(top_srcdir)/src/bin/evas \ 1593-I$(top_srcdir)/src/bin/evas \
@@ -1603,7 +1603,7 @@ if BUILD_LOADER_WEBP
1603cserve2webppkgdir = $(libdir)/evas/cserve2/loaders/webp/$(MODULE_ARCH) 1603cserve2webppkgdir = $(libdir)/evas/cserve2/loaders/webp/$(MODULE_ARCH)
1604cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la 1604cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la
1605bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c 1605bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c
1606bin_evas_loaders_webp_module_la_CPPFLAGS = \ 1606bin_evas_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1607-I$(top_srcdir)/src/lib/evas/include \ 1607-I$(top_srcdir)/src/lib/evas/include \
1608-I$(top_srcdir)/src/lib/evas/cserve2 \ 1608-I$(top_srcdir)/src/lib/evas/cserve2 \
1609-I$(top_srcdir)/src/bin/evas \ 1609-I$(top_srcdir)/src/bin/evas \
@@ -1619,7 +1619,7 @@ if BUILD_LOADER_XPM
1619cserve2xpmpkgdir = $(libdir)/evas/cserve2/loaders/xpm/$(MODULE_ARCH) 1619cserve2xpmpkgdir = $(libdir)/evas/cserve2/loaders/xpm/$(MODULE_ARCH)
1620cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la 1620cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la
1621bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c 1621bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c
1622bin_evas_loaders_xpm_module_la_CPPFLAGS = \ 1622bin_evas_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1623-I$(top_srcdir)/src/lib/evas/include \ 1623-I$(top_srcdir)/src/lib/evas/include \
1624-I$(top_srcdir)/src/lib/evas/cserve2 \ 1624-I$(top_srcdir)/src/lib/evas/cserve2 \
1625-I$(top_srcdir)/src/bin/evas \ 1625-I$(top_srcdir)/src/bin/evas \
@@ -1650,7 +1650,7 @@ tests/evas/evas_test_render_engines.c \
1650tests/evas/evas_tests_helpers.h \ 1650tests/evas/evas_tests_helpers.h \
1651tests/evas/evas_suite.h 1651tests/evas/evas_suite.h
1652 1652
1653tests_evas_evas_suite_CPPFLAGS = \ 1653tests_evas_evas_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1654-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas\" \ 1654-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas\" \
1655-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas\" \ 1655-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas\" \
1656@CHECK_CFLAGS@ \ 1656@CHECK_CFLAGS@ \
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 8a8944e..af8512b 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -108,7 +108,7 @@ endif
108 108
109lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c 109lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
110 110
111lib_evil_libdl_la_CPPFLAGS = \ 111lib_evil_libdl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
112@EVIL_CFLAGS@ \ 112@EVIL_CFLAGS@ \
113@EVIL_DLFCN_CPPFLAGS@ 113@EVIL_DLFCN_CPPFLAGS@
114lib_evil_libdl_la_LIBADD = \ 114lib_evil_libdl_la_LIBADD = \
@@ -150,7 +150,7 @@ bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S
150#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below! 150#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
151endif 151endif
152 152
153bin_evil_evil_suite_CPPFLAGS = @EVIL_CFLAGS@ 153bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@
154bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm 154bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm
155 155
156bin_evil_test_evil_SOURCES = bin/evil/test_evil.c 156bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index 5f6f8bd..1dad679 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -281,6 +281,8 @@
281#ifndef _ECORE_H 281#ifndef _ECORE_H
282#define _ECORE_H 282#define _ECORE_H
283 283
284#include <Efl_Config.h>
285
284#ifdef _MSC_VER 286#ifdef _MSC_VER
285# include <Evil.h> 287# include <Evil.h>
286#endif 288#endif
diff --git a/src/lib/efl/Efl_Config.h.in b/src/lib/efl/Efl_Config.h.in
new file mode 100644
index 0000000..30c18ae
--- /dev/null
+++ b/src/lib/efl/Efl_Config.h.in
@@ -0,0 +1,6 @@
1#ifndef EFL_CONFIG_H
2#define EFL_CONFIG_H
3
4#define XYXYXY 1
5
6#endif