summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
commitdf1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c (patch)
treee26086071ac285910d3e162c39819f3a2c3affea /src
parent51f8fe26fc4774e69be3547d49ae902c287c8b61 (diff)
efl: refactor CFLAGS, LIBS, LIBADD and LDADD usage.
- remove EFL_LIBS and EFL_CFLAGS, use per-lib values that inherit from EFL (general) - add NAME_LDFLAGS and EFL_LDFLAGS for linker flags. - LDADD (binaries) now use NAME_LDFLAGS instead of NAME_LIBS, as they link to libname.la and that will pull in the libtool dependencies SVN revision: 81915
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_EDBus.am4
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/Makefile_Ecore_Audio.am1
-rw-r--r--src/Makefile_Ecore_Cocoa.am2
-rw-r--r--src/Makefile_Ecore_Con.am1
-rw-r--r--src/Makefile_Ecore_Evas.am18
-rw-r--r--src/Makefile_Ecore_FB.am1
-rw-r--r--src/Makefile_Ecore_File.am2
-rw-r--r--src/Makefile_Ecore_Imf.am13
-rw-r--r--src/Makefile_Ecore_Input.am4
-rw-r--r--src/Makefile_Ecore_Ipc.am1
-rw-r--r--src/Makefile_Ecore_Psl1ght.am2
-rw-r--r--src/Makefile_Ecore_SDL.am1
-rw-r--r--src/Makefile_Ecore_Wayland.am1
-rw-r--r--src/Makefile_Ecore_Win32.am2
-rw-r--r--src/Makefile_Ecore_WinCE.am2
-rw-r--r--src/Makefile_Ecore_X.am1
-rw-r--r--src/Makefile_Eet.am6
-rw-r--r--src/Makefile_Efreet.am35
-rw-r--r--src/Makefile_Eina.am20
-rw-r--r--src/Makefile_Eio.am2
-rw-r--r--src/Makefile_Embryo.am3
-rw-r--r--src/Makefile_Eo.am17
-rw-r--r--src/Makefile_Evas.am146
-rw-r--r--src/Makefile_Evil.am7
-rw-r--r--src/benchmarks/eina/Makefile.am6
-rw-r--r--src/benchmarks/eo/Makefile.am2
-rw-r--r--src/examples/ecore/Makefile.am83
-rw-r--r--src/examples/edbus/Makefile.am4
-rw-r--r--src/examples/eet/Makefile.am14
-rw-r--r--src/examples/eina/Makefile.am13
-rw-r--r--src/examples/eio/Makefile.am3
-rw-r--r--src/examples/eo/Makefile.am6
-rw-r--r--src/examples/evas/Makefile.am4
34 files changed, 188 insertions, 241 deletions
diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am
index 395a3cac0f..89db001b7c 100644
--- a/src/Makefile_EDBus.am
+++ b/src/Makefile_EDBus.am
@@ -40,7 +40,6 @@ lib_edbus_libedbus2_la_CPPFLAGS = \
40-I$(top_srcdir)/src/lib/ecore \ 40-I$(top_srcdir)/src/lib/ecore \
41-I$(top_srcdir)/src/lib/edbus \ 41-I$(top_srcdir)/src/lib/edbus \
42-DEFL_EDBUS_BUILD \ 42-DEFL_EDBUS_BUILD \
43@EFL_CFLAGS@ \
44@EFL_COV_CFLAGS@ \ 43@EFL_COV_CFLAGS@ \
45@EDBUS_CFLAGS@ 44@EDBUS_CFLAGS@
46 45
@@ -74,7 +73,7 @@ bin_edbus_edbus_codegen_CPPFLAGS = \
74-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 73-DPACKAGE_BIN_DIR=\"$(bindir)\" \
75-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 74-DPACKAGE_LIB_DIR=\"$(libdir)\" \
76-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 75-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
77@EFL_CFLAGS@ \ 76@EDBUS_CFLAGS@ \
78@EFL_COV_CFLAGS@ 77@EFL_COV_CFLAGS@
79 78
80bin_edbus_edbus_codegen_LDADD = \ 79bin_edbus_edbus_codegen_LDADD = \
@@ -82,4 +81,5 @@ lib/eina/libeina.la \
82lib/eo/libeo.la \ 81lib/eo/libeo.la \
83lib/ecore/libecore.la \ 82lib/ecore/libecore.la \
84lib/edbus/libedbus2.la \ 83lib/edbus/libedbus2.la \
84@EDBUS_LDFLAGS@ \
85@EFL_COV_LIBS@ 85@EFL_COV_LIBS@
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 365c9fd490..1b0a13d00f 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -53,7 +53,6 @@ lib_ecore_libecore_la_CPPFLAGS = \
53-I$(top_srcdir)/src/lib/eo \ 53-I$(top_srcdir)/src/lib/eo \
54-I$(top_srcdir)/src/lib/ecore \ 54-I$(top_srcdir)/src/lib/ecore \
55-DEFL_ECORE_BUILD \ 55-DEFL_ECORE_BUILD \
56@EFL_CFLAGS@ \
57@EFL_COV_CFLAGS@ \ 56@EFL_COV_CFLAGS@ \
58@ECORE_CFLAGS@ \ 57@ECORE_CFLAGS@ \
59@USE_EVIL_CFLAGS@ \ 58@USE_EVIL_CFLAGS@ \
@@ -100,6 +99,7 @@ lib/ecore_con/libecore_con.la \
100lib/ecore_file/libecore_file.la \ 99lib/ecore_file/libecore_file.la \
101lib/ecore/libecore.la \ 100lib/ecore/libecore.la \
102lib/eina/libeina.la \ 101lib/eina/libeina.la \
102@ECORE_LDFLAGS@ \
103@CHECK_LIBS@ 103@CHECK_LIBS@
104 104
105if HAVE_ECORE_AUDIO 105if HAVE_ECORE_AUDIO
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 67c805432d..dc6140ee92 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -23,7 +23,6 @@ lib_ecore_audio_libecore_audio_la_CPPFLAGS = \
23-I$(top_srcdir)/src/lib/eet \ 23-I$(top_srcdir)/src/lib/eet \
24-I$(top_srcdir)/src/lib/ecore \ 24-I$(top_srcdir)/src/lib/ecore \
25-DEFL_ECORE_AUDIO_BUILD \ 25-DEFL_ECORE_AUDIO_BUILD \
26@EFL_CFLAGS@ \
27@EFL_COV_CFLAGS@ \ 26@EFL_COV_CFLAGS@ \
28@ECORE_AUDIO_CFLAGS@ 27@ECORE_AUDIO_CFLAGS@
29 28
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index ff5e0e8069..d47a8aa8d5 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -20,7 +20,7 @@ lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/ecore \ 20-I$(top_srcdir)/src/lib/ecore \
21-I$(top_srcdir)/src/lib/ecore_input \ 21-I$(top_srcdir)/src/lib/ecore_input \
22-I$(top_srcdir)/src/lib/ecore_cocoa \ 22-I$(top_srcdir)/src/lib/ecore_cocoa \
23@EFL_CFLAGS@ \ 23@ECORE_COCOA_CFLAGS@ \
24@EFL_COV_CFLAGS@ 24@EFL_COV_CFLAGS@
25 25
26lib_ecore_cocoa_libecore_cocoa_la_LIBADD = \ 26lib_ecore_cocoa_libecore_cocoa_la_LIBADD = \
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 584e932afb..dbbfa1dd31 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -41,7 +41,6 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \
41-I$(top_srcdir)/src/lib/ecore \ 41-I$(top_srcdir)/src/lib/ecore \
42-I$(top_srcdir)/src/lib/ecore_con \ 42-I$(top_srcdir)/src/lib/ecore_con \
43-DEFL_ECORE_CON_BUILD \ 43-DEFL_ECORE_CON_BUILD \
44@EFL_CFLAGS@ \
45@EFL_COV_CFLAGS@ \ 44@EFL_COV_CFLAGS@ \
46@ECORE_CON_CFLAGS@ \ 45@ECORE_CON_CFLAGS@ \
47@USE_EVIL_CFLAGS@ 46@USE_EVIL_CFLAGS@
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 658c45e9aa..ab317377a8 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -29,7 +29,7 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
29-I$(top_srcdir)/src/modules/evas/engines/buffer \ 29-I$(top_srcdir)/src/modules/evas/engines/buffer \
30-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 30-DPACKAGE_LIB_DIR=\"$(libdir)\" \
31-DEFL_ECORE_EVAS_BUILD \ 31-DEFL_ECORE_EVAS_BUILD \
32@EFL_CFLAGS@ \ 32@ECORE_EVAS_CFLAGS@ \
33@EFL_COV_CFLAGS@ \ 33@EFL_COV_CFLAGS@ \
34@USE_EVIL_CFLAGS@ 34@USE_EVIL_CFLAGS@
35 35
@@ -58,7 +58,7 @@ ecoreevasenginebufferpkgdir = $(libdir)/ecore_evas/engines/buffer/$(MODULE_ARCH)
58ecoreevasenginebufferpkg_LTLIBRARIES = modules/ecore_evas/engines/buffer/module.la 58ecoreevasenginebufferpkg_LTLIBRARIES = modules/ecore_evas/engines/buffer/module.la
59modules_ecore_evas_engines_buffer_module_la_SOURCES = $(BUFFERSOURCES) 59modules_ecore_evas_engines_buffer_module_la_SOURCES = $(BUFFERSOURCES)
60modules_ecore_evas_engines_buffer_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) 60modules_ecore_evas_engines_buffer_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS)
61modules_ecore_evas_engines_buffer_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la @EFL_LIBS@ 61modules_ecore_evas_engines_buffer_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la
62modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version 62modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
63modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static 63modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
64endif 64endif
@@ -75,7 +75,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
75-I$(top_srcdir)/src/modules/evas/engines/software_x11 \ 75-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
76-I$(top_srcdir)/src/modules/evas/engines/gl_x11 76-I$(top_srcdir)/src/modules/evas/engines/gl_x11
77modules_ecore_evas_engines_x_module_la_LIBADD = \ 77modules_ecore_evas_engines_x_module_la_LIBADD = \
78lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 78lib/ecore_evas/libecore_evas.la \
79lib/ecore_x/libecore_x.la 79lib/ecore_x/libecore_x.la
80modules_ecore_evas_engines_x_module_la_LDFLAGS = -no-undefined -module -avoid-version 80modules_ecore_evas_engines_x_module_la_LDFLAGS = -no-undefined -module -avoid-version
81modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static 81modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -91,7 +91,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
91-I$(top_srcdir)/src/lib/ecore_cocoa \ 91-I$(top_srcdir)/src/lib/ecore_cocoa \
92-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa 92-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa
93modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ 93modules_ecore_evas_engines_cocoa_module_la_LIBADD = \
94lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 94lib/ecore_evas/libecore_evas.la \
95lib/ecore_cocoa/libecore_cocoa.la 95lib/ecore_cocoa/libecore_cocoa.la
96modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version 96modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version
97modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static 97modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -107,7 +107,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
107-I$(top_srcdir)/src/lib/ecore_fb \ 107-I$(top_srcdir)/src/lib/ecore_fb \
108-I$(top_srcdir)/src/modules/evas/engines/fb 108-I$(top_srcdir)/src/modules/evas/engines/fb
109modules_ecore_evas_engines_fb_module_la_LIBADD = \ 109modules_ecore_evas_engines_fb_module_la_LIBADD = \
110lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 110lib/ecore_evas/libecore_evas.la \
111lib/ecore_fb/libecore_fb.la 111lib/ecore_fb/libecore_fb.la
112modules_ecore_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version 112modules_ecore_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version
113modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static 113modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -123,7 +123,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
123-I$(top_srcdir)/src/lib/ecore_psl1ght \ 123-I$(top_srcdir)/src/lib/ecore_psl1ght \
124-I$(top_srcdir)/src/modules/evas/engines/psl1ght 124-I$(top_srcdir)/src/modules/evas/engines/psl1ght
125modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ 125modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \
126lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 126lib/ecore_evas/libecore_evas.la \
127lib/ecore_psl1ght/libecore_psl1ght.la 127lib/ecore_psl1ght/libecore_psl1ght.la
128modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version 128modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version
129modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static 129modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -145,7 +145,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
145-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ 145-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
146@ECORE_WAYLAND_CFLAGS@ 146@ECORE_WAYLAND_CFLAGS@
147modules_ecore_evas_engines_wayland_module_la_LIBADD = \ 147modules_ecore_evas_engines_wayland_module_la_LIBADD = \
148lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 148lib/ecore_evas/libecore_evas.la \
149lib/ecore_wayland/libecore_wayland.la 149lib/ecore_wayland/libecore_wayland.la
150modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -no-undefined -module -avoid-version 150modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -no-undefined -module -avoid-version
151modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static 151modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -162,7 +162,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
162-I$(top_srcdir)/src/lib/ecore_sdl \ 162-I$(top_srcdir)/src/lib/ecore_sdl \
163-I$(top_srcdir)/src/modules/evas/engines/gl_sdl 163-I$(top_srcdir)/src/modules/evas/engines/gl_sdl
164modules_ecore_evas_engines_sdl_module_la_LIBADD = \ 164modules_ecore_evas_engines_sdl_module_la_LIBADD = \
165lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 165lib/ecore_evas/libecore_evas.la \
166lib/ecore_sdl/libecore_sdl.la 166lib/ecore_sdl/libecore_sdl.la
167modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version 167modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version
168modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static 168modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -180,7 +180,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
180-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ 180-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
181-I$(top_srcdir)/src/modules/evas/engines/software_gdi 181-I$(top_srcdir)/src/modules/evas/engines/software_gdi
182modules_ecore_evas_engines_win32_module_la_LIBADD = \ 182modules_ecore_evas_engines_win32_module_la_LIBADD = \
183lib/ecore/libecore_evas.la @EFL_LIBS@ \ 183lib/ecore/libecore_evas.la \
184lib/ecore_win32/libecore_win32.la 184lib/ecore_win32/libecore_win32.la
185modules_ecore_evas_engines_win32_module_la_LDFLAGS = -no-undefined -module -avoid-version 185modules_ecore_evas_engines_win32_module_la_LDFLAGS = -no-undefined -module -avoid-version
186modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static 186modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index 326f97e6b4..f7e9629d87 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -25,7 +25,6 @@ lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
25-I$(top_srcdir)/src/lib/ecore \ 25-I$(top_srcdir)/src/lib/ecore \
26-I$(top_srcdir)/src/lib/ecore_input \ 26-I$(top_srcdir)/src/lib/ecore_input \
27-I$(top_srcdir)/src/lib/ecore_fb \ 27-I$(top_srcdir)/src/lib/ecore_fb \
28@EFL_CFLAGS@ \
29@EFL_COV_CFLAGS@ \ 28@EFL_COV_CFLAGS@ \
30@ECORE_FB_CFLAGS@ 29@ECORE_FB_CFLAGS@
31 30
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index 7c9ffa7fcb..8dfa6f320a 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -35,7 +35,7 @@ lib_ecore_file_libecore_file_la_CPPFLAGS = \
35-I$(top_srcdir)/src/lib/ecore_con \ 35-I$(top_srcdir)/src/lib/ecore_con \
36-I$(top_srcdir)/src/lib/ecore_file \ 36-I$(top_srcdir)/src/lib/ecore_file \
37-DEFL_ECORE_FILE_BUILD \ 37-DEFL_ECORE_FILE_BUILD \
38@EFL_CFLAGS@ \ 38@ECORE_FILE_CFLAGS@ \
39@EFL_COV_CFLAGS@ 39@EFL_COV_CFLAGS@
40 40
41lib_ecore_file_libecore_file_la_LIBADD = \ 41lib_ecore_file_libecore_file_la_LIBADD = \
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index 9aa7529ede..da4d297f9a 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -23,7 +23,7 @@ lib_ecore_imf_libecore_imf_la_CPPFLAGS = \
23-I$(top_srcdir)/src/lib/ecore_imf \ 23-I$(top_srcdir)/src/lib/ecore_imf \
24-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24-DPACKAGE_LIB_DIR=\"$(libdir)\" \
25-DEFL_ECORE_IMF_BUILD \ 25-DEFL_ECORE_IMF_BUILD \
26@EFL_CFLAGS@ \ 26@ECORE_IMF_CFLAGS@ \
27@EFL_COV_CFLAGS@ 27@EFL_COV_CFLAGS@
28 28
29lib_ecore_imf_libecore_imf_la_LIBADD = \ 29lib_ecore_imf_libecore_imf_la_LIBADD = \
@@ -49,7 +49,7 @@ lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \
49-I$(top_srcdir)/src/lib/ecore_imf \ 49-I$(top_srcdir)/src/lib/ecore_imf \
50-I$(top_srcdir)/src/lib/ecore_imf_evas \ 50-I$(top_srcdir)/src/lib/ecore_imf_evas \
51-DEFL_ECORE_IMF_EVAS_BUILD \ 51-DEFL_ECORE_IMF_EVAS_BUILD \
52@EFL_CFLAGS@ \ 52@ECORE_IMF_EVAS_CFLAGS@ \
53@EFL_COV_CFLAGS@ 53@EFL_COV_CFLAGS@
54 54
55lib_ecore_imf_libecore_imf_evas_la_LIBADD = \ 55lib_ecore_imf_libecore_imf_evas_la_LIBADD = \
@@ -84,8 +84,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
84-I$(top_srcdir)/src/lib/ecore_imf \ 84-I$(top_srcdir)/src/lib/ecore_imf \
85-I$(top_srcdir)/src/lib/ecore_evas \ 85-I$(top_srcdir)/src/lib/ecore_evas \
86-I$(top_srcdir)/src/lib/evas \ 86-I$(top_srcdir)/src/lib/evas \
87-DEFL_ECORE_IMF_EVAS_BUILD \ 87@ECORE_IMF_CFLAGS@ \
88@EFL_CFLAGS@ \
89@EFL_COV_CFLAGS@ \ 88@EFL_COV_CFLAGS@ \
90@IBUS_CFLAGS@ 89@IBUS_CFLAGS@
91modules_ecore_immodules_ibus_ibus_la_LIBADD = \ 90modules_ecore_immodules_ibus_ibus_la_LIBADD = \
@@ -120,8 +119,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
120-I$(top_srcdir)/src/lib/ecore_imf \ 119-I$(top_srcdir)/src/lib/ecore_imf \
121-I$(top_srcdir)/src/lib/ecore_evas \ 120-I$(top_srcdir)/src/lib/ecore_evas \
122-I$(top_srcdir)/src/lib/evas \ 121-I$(top_srcdir)/src/lib/evas \
123-DEFL_ECORE_IMF_EVAS_BUILD \ 122@ECORE_IMF_CFLAGS@ \
124@EFL_CFLAGS@ \
125@EFL_COV_CFLAGS@ \ 123@EFL_COV_CFLAGS@ \
126@SCIM_CFLAGS@ 124@SCIM_CFLAGS@
127modules_ecore_immodules_scim_scim_la_LIBADD = \ 125modules_ecore_immodules_scim_scim_la_LIBADD = \
@@ -152,8 +150,7 @@ modules_ecore_immodules_xim_xim_la_CPPFLAGS = \
152-I$(top_srcdir)/src/lib/ecore_x \ 150-I$(top_srcdir)/src/lib/ecore_x \
153-I$(top_builddir)/src/lib/ecore_x \ 151-I$(top_builddir)/src/lib/ecore_x \
154-I$(top_srcdir)/src/lib/ecore_imf \ 152-I$(top_srcdir)/src/lib/ecore_imf \
155-DEFL_ECORE_IMF_EVAS_BUILD \ 153@ECORE_IMF_CFLAGS@ \
156@EFL_CFLAGS@ \
157@EFL_COV_CFLAGS@ 154@EFL_COV_CFLAGS@
158modules_ecore_immodules_xim_xim_la_LIBADD = \ 155modules_ecore_immodules_xim_xim_la_LIBADD = \
159lib/ecore_imf/libecore_imf.la \ 156lib/ecore_imf/libecore_imf.la \
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index 80bbffa79e..765616aa09 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -22,7 +22,7 @@ lib_ecore_input_libecore_input_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/ecore \ 22-I$(top_srcdir)/src/lib/ecore \
23-I$(top_srcdir)/src/lib/ecore_input \ 23-I$(top_srcdir)/src/lib/ecore_input \
24-DEFL_ECORE_INPUT_BUILD \ 24-DEFL_ECORE_INPUT_BUILD \
25@EFL_CFLAGS@ \ 25@ECORE_INPUT_CFLAGS@ \
26@EFL_COV_CFLAGS@ 26@EFL_COV_CFLAGS@
27 27
28lib_ecore_input_libecore_input_la_LIBADD = \ 28lib_ecore_input_libecore_input_la_LIBADD = \
@@ -51,7 +51,7 @@ lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \
51-I$(top_srcdir)/src/lib/ecore_input \ 51-I$(top_srcdir)/src/lib/ecore_input \
52-I$(top_srcdir)/src/lib/ecore_input_evas \ 52-I$(top_srcdir)/src/lib/ecore_input_evas \
53-DEFL_ECORE_INPUT_EVAS_BUILD \ 53-DEFL_ECORE_INPUT_EVAS_BUILD \
54@EFL_CFLAGS@ \ 54@ECORE_INPUT_EVAS_CFLAGS@ \
55@EFL_COV_CFLAGS@ 55@EFL_COV_CFLAGS@
56 56
57lib_ecore_input_libecore_input_evas_la_LIBADD = \ 57lib_ecore_input_libecore_input_evas_la_LIBADD = \
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 8fc822a3ea..13a7efb045 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -19,7 +19,6 @@ lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \
19-I$(top_srcdir)/src/lib/ecore_con \ 19-I$(top_srcdir)/src/lib/ecore_con \
20-I$(top_srcdir)/src/lib/ecore_ipc \ 20-I$(top_srcdir)/src/lib/ecore_ipc \
21-DEFL_ECORE_IPC_BUILD \ 21-DEFL_ECORE_IPC_BUILD \
22@EFL_CFLAGS@ \
23@EFL_COV_CFLAGS@ \ 22@EFL_COV_CFLAGS@ \
24@ECORE_IPC_CFLAGS@ 23@ECORE_IPC_CFLAGS@
25 24
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index f41c4299fd..e22bfa42b3 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -22,7 +22,7 @@ lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/ecore_input \ 22-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_srcdir)/src/lib/ecore_psl1ght \ 23-I$(top_srcdir)/src/lib/ecore_psl1ght \
24-DEFL_ECORE_PSL1GHT_BUILD \ 24-DEFL_ECORE_PSL1GHT_BUILD \
25@EFL_CFLAGS@ \ 25@ECORE_PSL1GHT_CFLAGS@ \
26@EFL_COV_CFLAGS@ 26@EFL_COV_CFLAGS@
27 27
28lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = \ 28lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = \
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index ea10516cfb..1970ea6d10 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -20,7 +20,6 @@ lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/ecore_input \ 20-I$(top_srcdir)/src/lib/ecore_input \
21-I$(top_srcdir)/src/lib/ecore_sdl \ 21-I$(top_srcdir)/src/lib/ecore_sdl \
22-DEFL_ECORE_SDL_BUILD \ 22-DEFL_ECORE_SDL_BUILD \
23@EFL_CFLAGS@ \
24@EFL_COV_CFLAGS@ \ 23@EFL_COV_CFLAGS@ \
25@ECORE_SDL_CFLAGS@ 24@ECORE_SDL_CFLAGS@
26 25
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index 1fc16f2ae5..46e2d8bc5f 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -22,7 +22,6 @@ lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/ecore \ 22-I$(top_srcdir)/src/lib/ecore \
23-I$(top_srcdir)/src/lib/ecore_input \ 23-I$(top_srcdir)/src/lib/ecore_input \
24-I$(top_srcdir)/src/lib/ecore_wayland \ 24-I$(top_srcdir)/src/lib/ecore_wayland \
25@EFL_CFLAGS@ \
26@EFL_COV_CFLAGS@ \ 25@EFL_COV_CFLAGS@ \
27@ECORE_WAYLAND_CFLAGS@ 26@ECORE_WAYLAND_CFLAGS@
28 27
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index 4fc87d76f7..a379ba6c61 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -32,7 +32,7 @@ lib_ecore_win32_libecore_win32_la_CPPFLAGS = \
32-I$(top_srcdir)/src/lib/ecore_input \ 32-I$(top_srcdir)/src/lib/ecore_input \
33-I$(top_srcdir)/src/lib/ecore_win32 \ 33-I$(top_srcdir)/src/lib/ecore_win32 \
34-DEFL_ECORE_WIN32_BUILD \ 34-DEFL_ECORE_WIN32_BUILD \
35@EFL_CFLAGS@ \ 35@ECORE_WIN32_CFLAGS@ \
36@EFL_COV_CFLAGS@ 36@EFL_COV_CFLAGS@
37 37
38lib_ecore_win32_libecore_win32_la_LIBADD = \ 38lib_ecore_win32_libecore_win32_la_LIBADD = \
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 62f5058d67..849273d8d6 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -22,7 +22,7 @@ lib_ecore_wince_libecore_wince_la_CPPFLAGS = \
22-I$(top_srcdir)/src/lib/ecore_input \ 22-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_srcdir)/src/lib/ecore_wince \ 23-I$(top_srcdir)/src/lib/ecore_wince \
24-DEFL_ECORE_WINCE_BUILD \ 24-DEFL_ECORE_WINCE_BUILD \
25@EFL_CFLAGS@ \ 25@ECORE_WINCE_CFLAGS@ \
26@EFL_COV_CFLAGS@ 26@EFL_COV_CFLAGS@
27 27
28lib_ecore_wince_libecore_wince_la_LIBADD = \ 28lib_ecore_wince_libecore_wince_la_LIBADD = \
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index eeb70b1b55..4628f1774e 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -104,7 +104,6 @@ lib_ecore_x_libecore_x_la_CPPFLAGS = \
104-I$(top_srcdir)/src/lib/ecore_x \ 104-I$(top_srcdir)/src/lib/ecore_x \
105-I$(top_builddir)/src/lib/ecore_x \ 105-I$(top_builddir)/src/lib/ecore_x \
106-DEFL_ECORE_X_BUILD \ 106-DEFL_ECORE_X_BUILD \
107@EFL_CFLAGS@ \
108@EFL_COV_CFLAGS@ \ 107@EFL_COV_CFLAGS@ \
109@ECORE_X_CFLAGS@ 108@ECORE_X_CFLAGS@
110 109
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index b860da7a88..7c604646a8 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -31,7 +31,6 @@ lib_eet_libeet_la_CPPFLAGS = \
31-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 31-DPACKAGE_LIB_DIR=\"$(libdir)\" \
32-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 32-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
33-DEFL_EET_BUILD \ 33-DEFL_EET_BUILD \
34@EFL_CFLAGS@ \
35@EFL_COV_CFLAGS@ \ 34@EFL_COV_CFLAGS@ \
36@EET_CFLAGS@ \ 35@EET_CFLAGS@ \
37@USE_EVIL_CFLAGS@ 36@USE_EVIL_CFLAGS@
@@ -59,7 +58,6 @@ bin_eet_eet_CPPFLAGS = \
59-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 58-DPACKAGE_BIN_DIR=\"$(bindir)\" \
60-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 59-DPACKAGE_LIB_DIR=\"$(libdir)\" \
61-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 60-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
62@EFL_CFLAGS@ \
63@EFL_COV_CFLAGS@ \ 61@EFL_COV_CFLAGS@ \
64@EET_CFLAGS@ \ 62@EET_CFLAGS@ \
65@USE_EVIL_CFLAGS@ 63@USE_EVIL_CFLAGS@
@@ -68,7 +66,7 @@ bin_eet_eet_LDADD = \
68lib/eet/libeet.la \ 66lib/eet/libeet.la \
69lib/eina/libeina.la \ 67lib/eina/libeina.la \
70@USE_EVIL_LIBS@ \ 68@USE_EVIL_LIBS@ \
71@EET_LIBS@ \ 69@EET_LDFLAGS@ \
72@EFL_COV_LIBS@ 70@EFL_COV_LIBS@
73 71
74### Unit tests 72### Unit tests
@@ -95,7 +93,7 @@ tests_eet_eet_suite_LDADD = \
95lib/eet/libeet.la \ 93lib/eet/libeet.la \
96lib/eina/libeina.la \ 94lib/eina/libeina.la \
97@CHECK_LIBS@ \ 95@CHECK_LIBS@ \
98@EET_LIBS@ 96@EET_LDFLAGS@
99 97
100endif 98endif
101 99
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index ed827670cf..1822713644 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -25,7 +25,6 @@ EFREET_COMMON_CPPFLAGS = \
25-DPACKAGE_DATA_DIR=\"$(datadir)\" \ 25-DPACKAGE_DATA_DIR=\"$(datadir)\" \
26-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 26-DLOCALE_DIR=\"@LOCALE_DIR@\" \
27-DEFL_EFREET_BUILD \ 27-DEFL_EFREET_BUILD \
28@EFL_CFLAGS@ \
29@EFL_COV_CFLAGS@ \ 28@EFL_COV_CFLAGS@ \
30@EFREET_CFLAGS@ \ 29@EFREET_CFLAGS@ \
31@USE_EVIL_CFLAGS@ 30@USE_EVIL_CFLAGS@
@@ -43,6 +42,18 @@ lib/edbus/libedbus2.la \
43 42
44EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la 43EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la
45 44
45EFREET_COMMON_USER_LDADD = \
46lib/efreet/libefreet.la \
47lib/eina/libeina.la \
48lib/eo/libeo.la \
49lib/ecore/libecore.la \
50lib/ecore_file/libecore_file.la \
51lib/eet/libeet.la \
52lib/edbus/libedbus2.la \
53@USE_EVIL_LIBS@ \
54@EFREET_LDFLAGS@ \
55@EFL_COV_LIBS@
56
46installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ 57installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
47dist_installed_efreetmainheaders_DATA = \ 58dist_installed_efreetmainheaders_DATA = \
48lib/efreet/Efreet.h \ 59lib/efreet/Efreet.h \
@@ -104,7 +115,7 @@ bin/efreet/efreetd_cache.h \
104bin/efreet/efreetd_cache.c 115bin/efreet/efreetd_cache.c
105 116
106bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 117bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
107bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LIBADD) 118bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD)
108 119
109efreetinternal_bindir=$(libdir)/efreet 120efreetinternal_bindir=$(libdir)/efreet
110efreetinternal_bin_PROGRAMS = \ 121efreetinternal_bin_PROGRAMS = \
@@ -112,12 +123,12 @@ bin/efreet/efreet_desktop_cache_create \
112bin/efreet/efreet_icon_cache_create 123bin/efreet/efreet_icon_cache_create
113 124
114bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 125bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
115bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) 126bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
116bin_efreet_efreet_desktop_cache_create_SOURCES = \ 127bin_efreet_efreet_desktop_cache_create_SOURCES = \
117bin/efreet/efreet_desktop_cache_create.c 128bin/efreet/efreet_desktop_cache_create.c
118 129
119bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 130bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
120bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) 131bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
121bin_efreet_efreet_icon_cache_create_SOURCES = \ 132bin_efreet_efreet_icon_cache_create_SOURCES = \
122bin/efreet/efreet_icon_cache_create.c 133bin/efreet/efreet_icon_cache_create.c
123 134
@@ -138,7 +149,7 @@ tests/efreet/compare/efreet_menu_alloc
138# efreet_test 149# efreet_test
139tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 150tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
140tests_efreet_efreet_test_LDADD = \ 151tests_efreet_efreet_test_LDADD = \
141$(EFREET_COMMON_USER_LIBADD) \ 152$(EFREET_COMMON_USER_LDADD) \
142lib/efreet/libefreet_mime.la 153lib/efreet/libefreet_mime.la
143 154
144tests_efreet_efreet_test_SOURCES = \ 155tests_efreet_efreet_test_SOURCES = \
@@ -154,38 +165,38 @@ tests/efreet/main.c
154 165
155# efreet_spec_test 166# efreet_spec_test
156tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 167tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
157tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LIBADD) 168tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD)
158tests_efreet_efreet_spec_test_SOURCES = \ 169tests_efreet_efreet_spec_test_SOURCES = \
159tests/efreet/efreet_spec_test.c 170tests/efreet/efreet_spec_test.c
160 171
161# efreet_cache_test 172# efreet_cache_test
162tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 173tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
163tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LIBADD) 174tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD)
164tests_efreet_efreet_cache_test_SOURCES = \ 175tests_efreet_efreet_cache_test_SOURCES = \
165tests/efreet/ef_cache.c 176tests/efreet/ef_cache.c
166 177
167# efreet_icon_cache_dump 178# efreet_icon_cache_dump
168tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 179tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
169tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LIBADD) 180tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD)
170tests_efreet_efreet_icon_cache_dump_SOURCES = \ 181tests_efreet_efreet_icon_cache_dump_SOURCES = \
171tests/efreet/efreet_icon_cache_dump.c 182tests/efreet/efreet_icon_cache_dump.c
172 183
173# efreet_user_dir 184# efreet_user_dir
174tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 185tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
175tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LIBADD) 186tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD)
176tests_efreet_efreet_user_dir_SOURCES = \ 187tests_efreet_efreet_user_dir_SOURCES = \
177tests/efreet/efreet_user_dir.c 188tests/efreet/efreet_user_dir.c
178 189
179# efreet_alloc 190# efreet_alloc
180tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 191tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
181tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) 192tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
182tests_efreet_compare_efreet_alloc_SOURCES = \ 193tests_efreet_compare_efreet_alloc_SOURCES = \
183tests/efreet/compare/efreet_alloc.c \ 194tests/efreet/compare/efreet_alloc.c \
184tests/efreet/compare/comp.h 195tests/efreet/compare/comp.h
185 196
186# efreet_menu_alloc 197# efreet_menu_alloc
187tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 198tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
188tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) 199tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
189tests_efreet_compare_efreet_menu_alloc_SOURCES = \ 200tests_efreet_compare_efreet_menu_alloc_SOURCES = \
190tests/efreet/compare/efreet_menu_alloc.c \ 201tests/efreet/compare/efreet_menu_alloc.c \
191tests/efreet/compare/comp.h 202tests/efreet/compare/comp.h
@@ -215,6 +226,6 @@ tests/efreet/efreet_test_efreet.c \
215tests/efreet/efreet_test_efreet_cache.c 226tests/efreet/efreet_test_efreet_cache.c
216 227
217tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ 228tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
218tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LIBADD) @CHECK_LIBS@ 229tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@
219 230
220endif 231endif
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index d457f18018..ed8c80ef87 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -161,10 +161,10 @@ chained_pool_module_la_CPPFLAGS = \
161-I$(top_srcdir)/src/lib/eina \ 161-I$(top_srcdir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eina \ 162-I$(top_builddir)/src/lib/eina \
163-DEFL_EINA_BUILD 163-DEFL_EINA_BUILD
164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ 164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@
165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
166chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ 166chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
167chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ 167chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version
168chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static 168chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
169endif 169endif
170 170
@@ -178,10 +178,10 @@ one_big_module_la_CPPFLAGS = \
178-I$(top_srcdir)/src/lib/eina \ 178-I$(top_srcdir)/src/lib/eina \
179-I$(top_builddir)/src/lib/eina \ 179-I$(top_builddir)/src/lib/eina \
180-DEFL_EINA_BUILD 180-DEFL_EINA_BUILD
181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ 181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@
182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
183one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ 183one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@
184one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ 184one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version
185one_big_module_la_LIBTOOLFLAGS = --tag=disable-static 185one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
186endif 186endif
187 187
@@ -209,14 +209,16 @@ lib_eina_libeina_la_CPPFLAGS = \
209-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 209-DPACKAGE_LIB_DIR=\"$(libdir)\" \
210-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 210-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
211-DEFL_EINA_BUILD \ 211-DEFL_EINA_BUILD \
212@EFL_CFLAGS@ \
213@EFL_COV_CFLAGS@ \ 212@EFL_COV_CFLAGS@ \
214@EFL_PTHREAD_CFLAGS@ \
215@EINA_CFLAGS@ \ 213@EINA_CFLAGS@ \
216@VALGRIND_CFLAGS@ \ 214@VALGRIND_CFLAGS@ \
217@USE_EVIL_CFLAGS@ 215@USE_EVIL_CFLAGS@
218 216
219lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ 217lib_eina_libeina_la_LIBADD = \
218@EINA_LIBS@ \
219@EFL_COV_LIBS@ \
220@USE_EVIL_LIBS@ \
221@DL_LIBS@
220lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 222lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
221 223
222### Script 224### Script
@@ -279,7 +281,7 @@ tests_eina_eina_suite_CPPFLAGS = \
279tests_eina_eina_suite_LDADD = \ 281tests_eina_eina_suite_LDADD = \
280lib/eina/libeina.la \ 282lib/eina/libeina.la \
281@CHECK_LIBS@ \ 283@CHECK_LIBS@ \
282@EINA_LIBS@ 284@EINA_LDFLAGS@
283 285
284tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx 286tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
285 287
@@ -291,7 +293,7 @@ tests_eina_cxx_compile_test_CPPFLAGS = \
291 293
292tests_eina_cxx_compile_test_LDADD = \ 294tests_eina_cxx_compile_test_LDADD = \
293lib/eina/libeina.la \ 295lib/eina/libeina.la \
294@EINA_LIBS@ 296@EINA_LDFLAGS@
295 297
296EXTRA_LTLIBRARIES = tests/eina/module_dummy.la 298EXTRA_LTLIBRARIES = tests/eina/module_dummy.la
297 299
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 43cfe1ce47..40816e65e3 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -34,7 +34,7 @@ lib_eio_libeio_la_CPPFLAGS = \
34-I$(top_srcdir)/src/lib/ecore \ 34-I$(top_srcdir)/src/lib/ecore \
35-I$(top_srcdir)/src/lib/eio \ 35-I$(top_srcdir)/src/lib/eio \
36-DEFL_EIO_BUILD \ 36-DEFL_EIO_BUILD \
37@EFL_CFLAGS@ \ 37@EIO_CFLAGS@ \
38@EFL_COV_CFLAGS@ 38@EFL_COV_CFLAGS@
39 39
40lib_eio_libeio_la_LIBADD = \ 40lib_eio_libeio_la_LIBADD = \
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index d8452f799c..f5bb307ea9 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -24,7 +24,6 @@ lib_embryo_libembryo_la_CPPFLAGS = \
24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
25-DEFL_EMBRYO_BUILD \ 25-DEFL_EMBRYO_BUILD \
26@EMBRYO_CFLAGS@ \ 26@EMBRYO_CFLAGS@ \
27@EFL_CFLAGS@ \
28@USE_EVIL_CFLAGS@ 27@USE_EVIL_CFLAGS@
29 28
30lib_embryo_libembryo_la_LIBADD = \ 29lib_embryo_libembryo_la_LIBADD = \
@@ -61,13 +60,13 @@ bin_embryo_embryo_cc_CPPFLAGS = \
61-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 60-DPACKAGE_BIN_DIR=\"$(bindir)\" \
62-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 61-DPACKAGE_LIB_DIR=\"$(libdir)\" \
63-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 62-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
64@EFL_CFLAGS@ \
65@EMBRYO_CFLAGS@ \ 63@EMBRYO_CFLAGS@ \
66@USE_EVIL_CFLAGS@ 64@USE_EVIL_CFLAGS@
67 65
68bin_embryo_embryo_cc_LDADD = \ 66bin_embryo_embryo_cc_LDADD = \
69lib/embryo/libembryo.la \ 67lib/embryo/libembryo.la \
70lib/eina/libeina.la \ 68lib/eina/libeina.la \
69@EMBRYO_LDFLAGS@ \
71@USE_EVIL_LIBS@ 70@USE_EVIL_LIBS@
72 71
73EXTRA_DIST += \ 72EXTRA_DIST += \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index aa0fad66cc..9c5795d47f 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -17,7 +17,6 @@ lib_eo_libeo_la_CPPFLAGS = \
17-I$(top_srcdir)/src/lib/eo \ 17-I$(top_srcdir)/src/lib/eo \
18-DNDEBUG \ 18-DNDEBUG \
19-DEFL_EO_BUILD \ 19-DEFL_EO_BUILD \
20@EFL_CFLAGS@ \
21@EFL_COV_CFLAGS@ \ 20@EFL_COV_CFLAGS@ \
22@EO_CFLAGS@ \ 21@EO_CFLAGS@ \
23@USE_EVIL_CFLAGS@ 22@USE_EVIL_CFLAGS@
@@ -57,7 +56,7 @@ tests_eo_test_access_CPPFLAGS = \
57 56
58tests_eo_test_access_LDADD = \ 57tests_eo_test_access_LDADD = \
59lib/eo/libeo.la \ 58lib/eo/libeo.la \
60@EO_LIBS@ 59@EO_LDFLAGS@
61 60
62tests_eo_test_composite_objects_SOURCES = \ 61tests_eo_test_composite_objects_SOURCES = \
63tests/eo/composite_objects/composite_objects_comp.c \ 62tests/eo/composite_objects/composite_objects_comp.c \
@@ -75,7 +74,7 @@ tests_eo_test_composite_objects_CPPFLAGS = \
75 74
76tests_eo_test_composite_objects_LDADD = \ 75tests_eo_test_composite_objects_LDADD = \
77lib/eo/libeo.la \ 76lib/eo/libeo.la \
78@EO_LIBS@ 77@EO_LDFLAGS@
79 78
80tests_eo_test_constructors_SOURCES = \ 79tests_eo_test_constructors_SOURCES = \
81tests/eo/constructors/constructors_main.c \ 80tests/eo/constructors/constructors_main.c \
@@ -105,7 +104,7 @@ tests_eo_test_constructors_CPPFLAGS = \
105 104
106tests_eo_test_constructors_LDADD = \ 105tests_eo_test_constructors_LDADD = \
107lib/eo/libeo.la \ 106lib/eo/libeo.la \
108@EO_LIBS@ 107@EO_LDFLAGS@
109 108
110if EFL_ENABLE_TESTS 109if EFL_ENABLE_TESTS
111 110
@@ -129,7 +128,7 @@ tests_eo_eo_suite_CPPFLAGS = \
129tests_eo_eo_suite_LDADD = \ 128tests_eo_eo_suite_LDADD = \
130lib/eo/libeo.la \ 129lib/eo/libeo.la \
131@CHECK_LIBS@ \ 130@CHECK_LIBS@ \
132@EO_LIBS@ 131@EO_LDFLAGS@
133 132
134endif 133endif
135 134
@@ -153,7 +152,7 @@ tests_eo_test_function_overrides_CPPFLAGS = \
153 152
154tests_eo_test_function_overrides_LDADD = \ 153tests_eo_test_function_overrides_LDADD = \
155lib/eo/libeo.la \ 154lib/eo/libeo.la \
156@EO_LIBS@ 155@EO_LDFLAGS@
157 156
158tests_eo_test_interface_SOURCES = \ 157tests_eo_test_interface_SOURCES = \
159tests/eo/interface/interface_interface.c \ 158tests/eo/interface/interface_interface.c \
@@ -173,7 +172,7 @@ tests_eo_test_interface_CPPFLAGS = \
173 172
174tests_eo_test_interface_LDADD = \ 173tests_eo_test_interface_LDADD = \
175lib/eo/libeo.la \ 174lib/eo/libeo.la \
176@EO_LIBS@ 175@EO_LDFLAGS@
177 176
178tests_eo_test_mixin_SOURCES = \ 177tests_eo_test_mixin_SOURCES = \
179tests/eo/mixin/mixin_inherit.c \ 178tests/eo/mixin/mixin_inherit.c \
@@ -199,7 +198,7 @@ tests_eo_test_mixin_CPPFLAGS = \
199 198
200tests_eo_test_mixin_LDADD = \ 199tests_eo_test_mixin_LDADD = \
201lib/eo/libeo.la \ 200lib/eo/libeo.la \
202@EO_LIBS@ 201@EO_LDFLAGS@
203 202
204tests_eo_test_signals_SOURCES = \ 203tests_eo_test_signals_SOURCES = \
205tests/eo/signals/signals_main.c \ 204tests/eo/signals/signals_main.c \
@@ -215,6 +214,6 @@ tests_eo_test_signals_CPPFLAGS = \
215 214
216tests_eo_test_signals_LDADD = \ 215tests_eo_test_signals_LDADD = \
217lib/eo/libeo.la \ 216lib/eo/libeo.la \
218@EO_LIBS@ 217@EO_LDFLAGS@
219 218
220EXTRA_DIST += tests/eo/eunit_tests.h 219EXTRA_DIST += tests/eo/eunit_tests.h
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 02d8a393f8..c50321b877 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -204,7 +204,6 @@ lib_evas_libevas_la_CPPFLAGS = \
204-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 204-DPACKAGE_BIN_DIR=\"$(bindir)\" \
205-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 205-DPACKAGE_LIB_DIR=\"$(libdir)\" \
206-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \ 206-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
207@EFL_CFLAGS@ \
208@EFL_COV_CFLAGS@ \ 207@EFL_COV_CFLAGS@ \
209@EVAS_CFLAGS@ \ 208@EVAS_CFLAGS@ \
210@VALGRIND_CFLAGS@ \ 209@VALGRIND_CFLAGS@ \
@@ -377,9 +376,8 @@ modules_evas_engines_software_generic_module_la_CPPFLAGS = \
377-I$(top_srcdir)/src/lib/evas/include \ 376-I$(top_srcdir)/src/lib/evas/include \
378-I$(top_srcdir)/src/lib/evas/cserve2 \ 377-I$(top_srcdir)/src/lib/evas/cserve2 \
379-DEFL_EVAS_BUILD \ 378-DEFL_EVAS_BUILD \
380@EFL_CFLAGS@ \
381@EVAS_CFLAGS@ 379@EVAS_CFLAGS@
382modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la 380modules_evas_engines_software_generic_module_la_LIBADD = lib/evas/libevas.la
383modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version 381modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version
384modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static 382modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
385endif 383endif
@@ -404,10 +402,9 @@ modules_evas_engines_buffer_module_la_CPPFLAGS = \
404-I$(top_srcdir)/src/lib/evas/include \ 402-I$(top_srcdir)/src/lib/evas/include \
405-I$(top_srcdir)/src/lib/evas/cserve2 \ 403-I$(top_srcdir)/src/lib/evas/cserve2 \
406-DEFL_EVAS_BUILD \ 404-DEFL_EVAS_BUILD \
407@EFL_CFLAGS@ \
408@EVAS_CFLAGS@ \ 405@EVAS_CFLAGS@ \
409@USE_EVIL_CFLAGS@ 406@USE_EVIL_CFLAGS@
410modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ 407modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la
411modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version 408modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
412modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static 409modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
413endif 410endif
@@ -437,11 +434,9 @@ modules_evas_engines_fb_module_la_CPPFLAGS = \
437-I$(top_srcdir)/src/lib/evas/include \ 434-I$(top_srcdir)/src/lib/evas/include \
438-I$(top_srcdir)/src/lib/evas/cserve2 \ 435-I$(top_srcdir)/src/lib/evas/cserve2 \
439@evas_engine_fb_cflags@ \ 436@evas_engine_fb_cflags@ \
440@EFL_CFLAGS@ \
441@EVAS_CFLAGS@ 437@EVAS_CFLAGS@
442modules_evas_engines_fb_module_la_LIBADD = \ 438modules_evas_engines_fb_module_la_LIBADD = \
443lib/evas/libevas.la \ 439lib/evas/libevas.la \
444@EFL_LIBS@ \
445@evas_engine_fb_libs@ 440@evas_engine_fb_libs@
446modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version 441modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version
447modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static 442modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -554,12 +549,10 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
554-I$(top_srcdir)/src/lib/evas/include \ 549-I$(top_srcdir)/src/lib/evas/include \
555-I$(top_srcdir)/src/lib/evas/cserve2 \ 550-I$(top_srcdir)/src/lib/evas/cserve2 \
556-DEFL_EVAS_BUILD \ 551-DEFL_EVAS_BUILD \
557@EFL_CFLAGS@ \
558@EVAS_CFLAGS@ 552@EVAS_CFLAGS@
559modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ 553modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
560lib/eet/libeet.la \ 554lib/eet/libeet.la \
561lib/evas/libevas.la \ 555lib/evas/libevas.la
562@EFL_LIBS@
563modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version 556modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version
564modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static 557modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static
565endif 558endif
@@ -592,7 +585,6 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
592-I$(top_srcdir)/src/lib/evas/cserve2 \ 585-I$(top_srcdir)/src/lib/evas/cserve2 \
593-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 586-I$(top_srcdir)/src/modules/evas/engines/gl_common \
594@evas_engine_gl_cocoa_cflags@ \ 587@evas_engine_gl_cocoa_cflags@ \
595@EFL_CFLAGS@ \
596@EVAS_CFLAGS@ 588@EVAS_CFLAGS@
597modules_evas_engines_gl_cocoa_module_la_LIBADD = 589modules_evas_engines_gl_cocoa_module_la_LIBADD =
598if ! EVAS_STATIC_BUILD_GL_COMMON 590if ! EVAS_STATIC_BUILD_GL_COMMON
@@ -602,7 +594,6 @@ endif
602modules_evas_engines_gl_cocoa_module_la_LIBADD += \ 594modules_evas_engines_gl_cocoa_module_la_LIBADD += \
603lib/eet/libeet.la \ 595lib/eet/libeet.la \
604lib/evas/libevas.la \ 596lib/evas/libevas.la \
605@EFL_LIBS@ \
606@evas_engine_gl_cocoa_libs@ 597@evas_engine_gl_cocoa_libs@
607modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version 598modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version
608modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static 599modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -635,7 +626,6 @@ modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
635-I$(top_srcdir)/src/lib/evas/cserve2 \ 626-I$(top_srcdir)/src/lib/evas/cserve2 \
636-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 627-I$(top_srcdir)/src/modules/evas/engines/gl_common \
637@evas_engine_gl_sdl_cflags@ \ 628@evas_engine_gl_sdl_cflags@ \
638@EFL_CFLAGS@ \
639@EVAS_CFLAGS@ 629@EVAS_CFLAGS@
640modules_evas_engines_gl_sdl_module_la_LIBADD = 630modules_evas_engines_gl_sdl_module_la_LIBADD =
641if ! EVAS_STATIC_BUILD_GL_COMMON 631if ! EVAS_STATIC_BUILD_GL_COMMON
@@ -644,7 +634,6 @@ modules/evas/engines/gl_common/libevas_engine_gl_common.la
644endif 634endif
645modules_evas_engines_gl_sdl_module_la_LIBADD += \ 635modules_evas_engines_gl_sdl_module_la_LIBADD += \
646lib/evas/libevas.la \ 636lib/evas/libevas.la \
647@EFL_LIBS@ \
648@evas_engine_gl_sdl_libs@ 637@evas_engine_gl_sdl_libs@
649modules_evas_engines_gl_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version 638modules_evas_engines_gl_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version
650modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static 639modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -678,7 +667,6 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
678-I$(top_srcdir)/src/lib/evas/cserve2 \ 667-I$(top_srcdir)/src/lib/evas/cserve2 \
679-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 668-I$(top_srcdir)/src/modules/evas/engines/gl_common \
680@evas_engine_gl_xlib_cflags@ \ 669@evas_engine_gl_xlib_cflags@ \
681@EFL_CFLAGS@ \
682@EVAS_CFLAGS@ 670@EVAS_CFLAGS@
683modules_evas_engines_gl_x11_module_la_LIBADD = 671modules_evas_engines_gl_x11_module_la_LIBADD =
684if ! EVAS_STATIC_BUILD_GL_COMMON 672if ! EVAS_STATIC_BUILD_GL_COMMON
@@ -688,7 +676,6 @@ endif
688modules_evas_engines_gl_x11_module_la_LIBADD += \ 676modules_evas_engines_gl_x11_module_la_LIBADD += \
689lib/eet/libeet.la \ 677lib/eet/libeet.la \
690lib/evas/libevas.la \ 678lib/evas/libevas.la \
691@EFL_LIBS@ \
692@evas_engine_gl_xlib_libs@ 679@evas_engine_gl_xlib_libs@
693modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version 680modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version
694modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static 681modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -718,12 +705,10 @@ modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
718-I$(top_srcdir)/src/lib/evas/include \ 705-I$(top_srcdir)/src/lib/evas/include \
719-I$(top_srcdir)/src/lib/evas/cserve2 \ 706-I$(top_srcdir)/src/lib/evas/cserve2 \
720@evas_engine_psl1ght_cflags@ \ 707@evas_engine_psl1ght_cflags@ \
721@EFL_CFLAGS@ \
722@EVAS_CFLAGS@ 708@EVAS_CFLAGS@
723modules_evas_engines_psl1ght_module_la_LIBADD = \ 709modules_evas_engines_psl1ght_module_la_LIBADD = \
724lib/evas/libevas.la \ 710lib/evas/libevas.la \
725@evas_engine_psl1ght_libs@ \ 711@evas_engine_psl1ght_libs@
726@EFL_LIBS@
727modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version 712modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version
728modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static 713modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
729endif 714endif
@@ -755,14 +740,12 @@ modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
755-I$(top_srcdir)/src/lib/evas/cserve2 \ 740-I$(top_srcdir)/src/lib/evas/cserve2 \
756-DEFL_EVAS_BUILD \ 741-DEFL_EVAS_BUILD \
757@evas_engine_software_ddraw_cflags@ \ 742@evas_engine_software_ddraw_cflags@ \
758@EFL_CFLAGS@ \
759@EVAS_CFLAGS@ \ 743@EVAS_CFLAGS@ \
760@USE_EVIL_CFLAGS@ 744@USE_EVIL_CFLAGS@
761modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions 745modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
762modules_evas_engines_software_ddraw_module_la_LIBADD = \ 746modules_evas_engines_software_ddraw_module_la_LIBADD = \
763lib/evas/libevas.la \ 747lib/evas/libevas.la \
764@evas_engine_software_ddraw_libs@ \ 748@evas_engine_software_ddraw_libs@
765@EFL_LIBS@
766modules_evas_engines_software_ddraw_module_la_LDFLAGS = -no-undefined -module -avoid-version 749modules_evas_engines_software_ddraw_module_la_LDFLAGS = -no-undefined -module -avoid-version
767modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static 750modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static
768endif 751endif
@@ -793,13 +776,11 @@ modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
793-I$(top_srcdir)/src/lib/evas/cserve2 \ 776-I$(top_srcdir)/src/lib/evas/cserve2 \
794-DEFL_EVAS_BUILD \ 777-DEFL_EVAS_BUILD \
795@evas_engine_software_gdi_cflags@ \ 778@evas_engine_software_gdi_cflags@ \
796@EFL_CFLAGS@ \
797@EVAS_CFLAGS@ \ 779@EVAS_CFLAGS@ \
798@USE_EVIL_CFLAGS@ 780@USE_EVIL_CFLAGS@
799modules_evas_engines_software_gdi_module_la_LIBADD = \ 781modules_evas_engines_software_gdi_module_la_LIBADD = \
800lib/evas/libevas.la \ 782lib/evas/libevas.la \
801@evas_engine_software_gdi_libs@ \ 783@evas_engine_software_gdi_libs@
802@EFL_LIBS@
803modules_evas_engines_software_gdi_module_la_LDFLAGS = -no-undefined -module -avoid-version 784modules_evas_engines_software_gdi_module_la_LDFLAGS = -no-undefined -module -avoid-version
804modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static 785modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static
805endif 786endif
@@ -819,7 +800,6 @@ SOFTWARE_X11_CPPFLAGS = \
819-I$(top_srcdir)/src/lib/evas \ 800-I$(top_srcdir)/src/lib/evas \
820-I$(top_srcdir)/src/lib/evas/include \ 801-I$(top_srcdir)/src/lib/evas/include \
821-I$(top_srcdir)/src/lib/evas/cserve2 \ 802-I$(top_srcdir)/src/lib/evas/cserve2 \
822@EFL_CFLAGS@ \
823@EVAS_CFLAGS@ 803@EVAS_CFLAGS@
824SOFTWARE_X11_LIBADD = 804SOFTWARE_X11_LIBADD =
825if BUILD_ENGINE_SOFTWARE_XLIB 805if BUILD_ENGINE_SOFTWARE_XLIB
@@ -861,7 +841,7 @@ enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_A
861enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la 841enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
862modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES) 842modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
863modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS) 843modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS)
864modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ $(SOFTWARE_X11_LIBADD) 844modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la $(SOFTWARE_X11_LIBADD)
865modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version 845modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version
866modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static 846modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
867endif 847endif
@@ -878,7 +858,7 @@ lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES)
878lib_evas_libevas_la_CPPFLAGS += \ 858lib_evas_libevas_la_CPPFLAGS += \
879-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 859-I$(top_srcdir)/src/modules/evas/engines/gl_common \
880@evas_engine_wayland_egl_cflags@ 860@evas_engine_wayland_egl_cflags@
881lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_egl_libs@ 861lib_evas_libevas_la_LIBADD += @evas_engine_wayland_egl_libs@
882else 862else
883enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) 863enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
884enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la 864enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
@@ -893,13 +873,11 @@ modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
893-I$(top_srcdir)/src/lib/evas/cserve2 \ 873-I$(top_srcdir)/src/lib/evas/cserve2 \
894-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 874-I$(top_srcdir)/src/modules/evas/engines/gl_common \
895@evas_engine_wayland_egl_cflags@ \ 875@evas_engine_wayland_egl_cflags@ \
896@EFL_CFLAGS@ \
897@EVAS_CFLAGS@ 876@EVAS_CFLAGS@
898modules_evas_engines_wayland_egl_module_la_LIBADD = \ 877modules_evas_engines_wayland_egl_module_la_LIBADD = \
899modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 878modules/evas/engines/gl_common/libevas_engine_gl_common.la \
900lib/eet/libeet.la \ 879lib/eet/libeet.la \
901lib/evas/libevas.la \ 880lib/evas/libevas.la \
902@EFL_LIBS@ \
903@evas_engine_wayland_egl_libs@ 881@evas_engine_wayland_egl_libs@
904modules_evas_engines_wayland_egl_module_la_LDFLAGS = -no-undefined -module -avoid-version 882modules_evas_engines_wayland_egl_module_la_LDFLAGS = -no-undefined -module -avoid-version
905modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static 883modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -915,7 +893,7 @@ modules/evas/engines/wayland_shm/evas_engine.h
915if EVAS_STATIC_BUILD_WAYLAND_SHM 893if EVAS_STATIC_BUILD_WAYLAND_SHM
916lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES) 894lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES)
917lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@ 895lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@
918lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_shm_libs@ 896lib_evas_libevas_la_LIBADD += @evas_engine_wayland_shm_libs@
919else 897else
920enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) 898enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
921enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la 899enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
@@ -928,11 +906,9 @@ modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
928-I$(top_srcdir)/src/lib/evas/include \ 906-I$(top_srcdir)/src/lib/evas/include \
929-I$(top_srcdir)/src/lib/evas/cserve2 \ 907-I$(top_srcdir)/src/lib/evas/cserve2 \
930@evas_engine_wayland_shm_cflags@ \ 908@evas_engine_wayland_shm_cflags@ \
931@EFL_CFLAGS@ \
932@EVAS_CFLAGS@ 909@EVAS_CFLAGS@
933modules_evas_engines_wayland_shm_module_la_LIBADD = \ 910modules_evas_engines_wayland_shm_module_la_LIBADD = \
934lib/evas/libevas.la \ 911lib/evas/libevas.la \
935@EFL_LIBS@ \
936@evas_engine_wayland_shm_libs@ 912@evas_engine_wayland_shm_libs@
937modules_evas_engines_wayland_shm_module_la_LDFLAGS = -no-undefined -module -avoid-version 913modules_evas_engines_wayland_shm_module_la_LDFLAGS = -no-undefined -module -avoid-version
938modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static 914modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -958,11 +934,9 @@ modules_evas_loaders_bmp_module_la_CPPFLAGS = \
958-I$(top_srcdir)/src/lib/evas/include \ 934-I$(top_srcdir)/src/lib/evas/include \
959-DEFL_EVAS_BUILD \ 935-DEFL_EVAS_BUILD \
960@evas_image_loader_bmp_cflags@ \ 936@evas_image_loader_bmp_cflags@ \
961@EFL_CFLAGS@ \
962@EVAS_CFLAGS@ 937@EVAS_CFLAGS@
963modules_evas_loaders_bmp_module_la_LIBADD = \ 938modules_evas_loaders_bmp_module_la_LIBADD = \
964lib/evas/libevas.la \ 939lib/evas/libevas.la \
965@EFL_LIBS@ \
966@evas_image_loader_bmp_libs@ 940@evas_image_loader_bmp_libs@
967modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version 941modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
968modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static 942modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -987,7 +961,6 @@ modules_evas_loaders_eet_module_la_CPPFLAGS = \
987-I$(top_srcdir)/src/lib/evas/include \ 961-I$(top_srcdir)/src/lib/evas/include \
988-DEFL_EVAS_BUILD \ 962-DEFL_EVAS_BUILD \
989@evas_image_loader_eet_cflags@ \ 963@evas_image_loader_eet_cflags@ \
990@EFL_CFLAGS@ \
991@EVAS_CFLAGS@ 964@EVAS_CFLAGS@
992modules_evas_loaders_eet_module_la_LIBADD = \ 965modules_evas_loaders_eet_module_la_LIBADD = \
993lib/evas/libevas.la \ 966lib/evas/libevas.la \
@@ -1015,11 +988,9 @@ modules_evas_loaders_generic_module_la_CPPFLAGS = \
1015-I$(top_srcdir)/src/lib/evas/include \ 988-I$(top_srcdir)/src/lib/evas/include \
1016-DEFL_EVAS_BUILD \ 989-DEFL_EVAS_BUILD \
1017@evas_image_loader_generic_cflags@ \ 990@evas_image_loader_generic_cflags@ \
1018@EFL_CFLAGS@ \
1019@EVAS_CFLAGS@ 991@EVAS_CFLAGS@
1020modules_evas_loaders_generic_module_la_LIBADD = \ 992modules_evas_loaders_generic_module_la_LIBADD = \
1021lib/evas/libevas.la \ 993lib/evas/libevas.la \
1022@EFL_LIBS@ \
1023@evas_image_loader_generic_libs@ 994@evas_image_loader_generic_libs@
1024modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version 995modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version
1025modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static 996modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1043,11 +1014,9 @@ modules_evas_loaders_gif_module_la_CPPFLAGS = \
1043-I$(top_srcdir)/src/lib/evas/include \ 1014-I$(top_srcdir)/src/lib/evas/include \
1044-DEFL_EVAS_BUILD \ 1015-DEFL_EVAS_BUILD \
1045@evas_image_loader_gif_cflags@ \ 1016@evas_image_loader_gif_cflags@ \
1046@EFL_CFLAGS@ \
1047@EVAS_CFLAGS@ 1017@EVAS_CFLAGS@
1048modules_evas_loaders_gif_module_la_LIBADD = \ 1018modules_evas_loaders_gif_module_la_LIBADD = \
1049lib/evas/libevas.la \ 1019lib/evas/libevas.la \
1050@EFL_LIBS@ \
1051@evas_image_loader_gif_libs@ 1020@evas_image_loader_gif_libs@
1052modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version 1021modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version
1053modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static 1022modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1071,11 +1040,9 @@ modules_evas_loaders_ico_module_la_CPPFLAGS = \
1071-I$(top_srcdir)/src/lib/evas/include \ 1040-I$(top_srcdir)/src/lib/evas/include \
1072-DEFL_EVAS_BUILD \ 1041-DEFL_EVAS_BUILD \
1073@evas_image_loader_ico_cflags@ \ 1042@evas_image_loader_ico_cflags@ \
1074@EFL_CFLAGS@ \
1075@EVAS_CFLAGS@ 1043@EVAS_CFLAGS@
1076modules_evas_loaders_ico_module_la_LIBADD = \ 1044modules_evas_loaders_ico_module_la_LIBADD = \
1077lib/evas/libevas.la \ 1045lib/evas/libevas.la \
1078@EFL_LIBS@ \
1079@evas_image_loader_ico_libs@ 1046@evas_image_loader_ico_libs@
1080modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version 1047modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version
1081modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static 1048modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1102,11 +1069,9 @@ modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
1102-I$(top_srcdir)/src/lib/evas/include \ 1069-I$(top_srcdir)/src/lib/evas/include \
1103-DEFL_EVAS_BUILD \ 1070-DEFL_EVAS_BUILD \
1104@evas_image_loader_jpeg_cflags@ \ 1071@evas_image_loader_jpeg_cflags@ \
1105@EFL_CFLAGS@ \
1106@EVAS_CFLAGS@ 1072@EVAS_CFLAGS@
1107modules_evas_loaders_jpeg_module_la_LIBADD = \ 1073modules_evas_loaders_jpeg_module_la_LIBADD = \
1108lib/evas/libevas.la \ 1074lib/evas/libevas.la \
1109@EFL_LIBS@ \
1110@evas_image_loader_jpeg_libs@ 1075@evas_image_loader_jpeg_libs@
1111modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version 1076modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version
1112modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static 1077modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1121,11 +1086,9 @@ modules_evas_savers_jpeg_module_la_CPPFLAGS = \
1121-I$(top_srcdir)/src/lib/evas \ 1086-I$(top_srcdir)/src/lib/evas \
1122-I$(top_srcdir)/src/lib/evas/include \ 1087-I$(top_srcdir)/src/lib/evas/include \
1123@evas_image_loader_jpeg_cflags@ \ 1088@evas_image_loader_jpeg_cflags@ \
1124@EFL_CFLAGS@ \
1125@EVAS_CFLAGS@ 1089@EVAS_CFLAGS@
1126modules_evas_savers_jpeg_module_la_LIBADD = \ 1090modules_evas_savers_jpeg_module_la_LIBADD = \
1127lib/evas/libevas.la \ 1091lib/evas/libevas.la \
1128@EFL_LIBS@ \
1129@evas_image_loader_jpeg_libs@ 1092@evas_image_loader_jpeg_libs@
1130modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version 1093modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version
1131modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static 1094modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1150,11 +1113,9 @@ modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
1150-I$(top_srcdir)/src/lib/evas/include \ 1113-I$(top_srcdir)/src/lib/evas/include \
1151-DEFL_EVAS_BUILD \ 1114-DEFL_EVAS_BUILD \
1152@evas_image_loader_pmaps_cflags@ \ 1115@evas_image_loader_pmaps_cflags@ \
1153@EFL_CFLAGS@ \
1154@EVAS_CFLAGS@ 1116@EVAS_CFLAGS@
1155modules_evas_loaders_pmaps_module_la_LIBADD = \ 1117modules_evas_loaders_pmaps_module_la_LIBADD = \
1156lib/evas/libevas.la \ 1118lib/evas/libevas.la \
1157@EFL_LIBS@ \
1158@evas_image_loader_pmaps_libs@ 1119@evas_image_loader_pmaps_libs@
1159modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version 1120modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version
1160modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static 1121modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1178,11 +1139,9 @@ modules_evas_loaders_png_module_la_CPPFLAGS = \
1178-I$(top_srcdir)/src/lib/evas/include \ 1139-I$(top_srcdir)/src/lib/evas/include \
1179-DEFL_EVAS_BUILD \ 1140-DEFL_EVAS_BUILD \
1180@evas_image_loader_png_cflags@ \ 1141@evas_image_loader_png_cflags@ \
1181@EFL_CFLAGS@ \
1182@EVAS_CFLAGS@ 1142@EVAS_CFLAGS@
1183modules_evas_loaders_png_module_la_LIBADD = \ 1143modules_evas_loaders_png_module_la_LIBADD = \
1184lib/evas/libevas.la \ 1144lib/evas/libevas.la \
1185@EFL_LIBS@ \
1186@evas_image_loader_png_libs@ 1145@evas_image_loader_png_libs@
1187modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version 1146modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version
1188modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static 1147modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1198,11 +1157,9 @@ modules_evas_savers_png_module_la_CPPFLAGS = \
1198-I$(top_srcdir)/src/lib/evas/include \ 1157-I$(top_srcdir)/src/lib/evas/include \
1199-DEFL_EVAS_BUILD \ 1158-DEFL_EVAS_BUILD \
1200@evas_image_loader_png_cflags@ \ 1159@evas_image_loader_png_cflags@ \
1201@EFL_CFLAGS@ \
1202@EVAS_CFLAGS@ 1160@EVAS_CFLAGS@
1203modules_evas_savers_png_module_la_LIBADD = \ 1161modules_evas_savers_png_module_la_LIBADD = \
1204lib/evas/libevas.la \ 1162lib/evas/libevas.la \
1205@EFL_LIBS@ \
1206@evas_image_loader_png_libs@ 1163@evas_image_loader_png_libs@
1207modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version 1164modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version
1208modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static 1165modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1226,11 +1183,9 @@ modules_evas_loaders_psd_module_la_CPPFLAGS = \
1226-I$(top_srcdir)/src/lib/evas/include \ 1183-I$(top_srcdir)/src/lib/evas/include \
1227-DEFL_EVAS_BUILD \ 1184-DEFL_EVAS_BUILD \
1228@evas_image_loader_psd_cflags@ \ 1185@evas_image_loader_psd_cflags@ \
1229@EFL_CFLAGS@ \
1230@EVAS_CFLAGS@ 1186@EVAS_CFLAGS@
1231modules_evas_loaders_psd_module_la_LIBADD = \ 1187modules_evas_loaders_psd_module_la_LIBADD = \
1232lib/evas/libevas.la \ 1188lib/evas/libevas.la \
1233@EFL_LIBS@ \
1234@evas_image_loader_psd_libs@ 1189@evas_image_loader_psd_libs@
1235modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version 1190modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version
1236modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static 1191modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1254,11 +1209,9 @@ modules_evas_loaders_svg_module_la_CPPFLAGS = \
1254-I$(top_srcdir)/src/lib/evas/include \ 1209-I$(top_srcdir)/src/lib/evas/include \
1255-DEFL_EVAS_BUILD \ 1210-DEFL_EVAS_BUILD \
1256@evas_image_loader_svg_cflags@ \ 1211@evas_image_loader_svg_cflags@ \
1257@EFL_CFLAGS@ \
1258@EVAS_CFLAGS@ 1212@EVAS_CFLAGS@
1259modules_evas_loaders_svg_module_la_LIBADD = \ 1213modules_evas_loaders_svg_module_la_LIBADD = \
1260lib/evas/libevas.la \ 1214lib/evas/libevas.la \
1261@EFL_LIBS@ \
1262@evas_image_loader_svg_libs@ 1215@evas_image_loader_svg_libs@
1263modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version 1216modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version
1264modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static 1217modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1282,11 +1235,9 @@ modules_evas_loaders_tga_module_la_CPPFLAGS = \
1282-I$(top_srcdir)/src/lib/evas/include \ 1235-I$(top_srcdir)/src/lib/evas/include \
1283-DEFL_EVAS_BUILD \ 1236-DEFL_EVAS_BUILD \
1284@evas_image_loader_tga_cflags@ \ 1237@evas_image_loader_tga_cflags@ \
1285@EFL_CFLAGS@ \
1286@EVAS_CFLAGS@ 1238@EVAS_CFLAGS@
1287modules_evas_loaders_tga_module_la_LIBADD = \ 1239modules_evas_loaders_tga_module_la_LIBADD = \
1288lib/evas/libevas.la \ 1240lib/evas/libevas.la \
1289@EFL_LIBS@ \
1290@evas_image_loader_tga_libs@ 1241@evas_image_loader_tga_libs@
1291modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version 1242modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version
1292modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static 1243modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1310,12 +1261,10 @@ modules_evas_loaders_tiff_module_la_CPPFLAGS = \
1310-I$(top_srcdir)/src/lib/evas/include \ 1261-I$(top_srcdir)/src/lib/evas/include \
1311-DEFL_EVAS_BUILD \ 1262-DEFL_EVAS_BUILD \
1312@evas_image_loader_tiff_cflags@ \ 1263@evas_image_loader_tiff_cflags@ \
1313@EFL_CFLAGS@ \
1314@EVAS_CFLAGS@ \ 1264@EVAS_CFLAGS@ \
1315@USE_EVIL_CFLAGS@ 1265@USE_EVIL_CFLAGS@
1316modules_evas_loaders_tiff_module_la_LIBADD = \ 1266modules_evas_loaders_tiff_module_la_LIBADD = \
1317lib/evas/libevas.la \ 1267lib/evas/libevas.la \
1318@EFL_LIBS@ \
1319@evas_image_loader_tiff_libs@ 1268@evas_image_loader_tiff_libs@
1320modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version 1269modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version
1321modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static 1270modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1331,12 +1280,10 @@ modules_evas_savers_tiff_module_la_CPPFLAGS = \
1331-I$(top_srcdir)/src/lib/evas/include \ 1280-I$(top_srcdir)/src/lib/evas/include \
1332-DEFL_EVAS_BUILD \ 1281-DEFL_EVAS_BUILD \
1333@evas_image_loader_tiff_cflags@ \ 1282@evas_image_loader_tiff_cflags@ \
1334@EFL_CFLAGS@ \
1335@EVAS_CFLAGS@ \ 1283@EVAS_CFLAGS@ \
1336@USE_EVIL_CFLAGS@ 1284@USE_EVIL_CFLAGS@
1337modules_evas_savers_tiff_module_la_LIBADD = \ 1285modules_evas_savers_tiff_module_la_LIBADD = \
1338lib/evas/libevas.la \ 1286lib/evas/libevas.la \
1339@EFL_LIBS@ \
1340@evas_image_loader_tiff_libs@ 1287@evas_image_loader_tiff_libs@
1341modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version 1288modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version
1342modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static 1289modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1360,11 +1307,9 @@ modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
1360-I$(top_srcdir)/src/lib/evas/include \ 1307-I$(top_srcdir)/src/lib/evas/include \
1361-DEFL_EVAS_BUILD \ 1308-DEFL_EVAS_BUILD \
1362@evas_image_loader_wbmp_cflags@ \ 1309@evas_image_loader_wbmp_cflags@ \
1363@EFL_CFLAGS@ \
1364@EVAS_CFLAGS@ 1310@EVAS_CFLAGS@
1365modules_evas_loaders_wbmp_module_la_LIBADD = \ 1311modules_evas_loaders_wbmp_module_la_LIBADD = \
1366lib/evas/libevas.la \ 1312lib/evas/libevas.la \
1367@EFL_LIBS@ \
1368@evas_image_loader_wbmp_libs@ 1313@evas_image_loader_wbmp_libs@
1369modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version 1314modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
1370modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static 1315modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1388,11 +1333,9 @@ modules_evas_loaders_webp_module_la_CPPFLAGS = \
1388-I$(top_srcdir)/src/lib/evas/include \ 1333-I$(top_srcdir)/src/lib/evas/include \
1389-DEFL_EVAS_BUILD \ 1334-DEFL_EVAS_BUILD \
1390@evas_image_loader_webp_cflags@ \ 1335@evas_image_loader_webp_cflags@ \
1391@EFL_CFLAGS@ \
1392@EVAS_CFLAGS@ 1336@EVAS_CFLAGS@
1393modules_evas_loaders_webp_module_la_LIBADD = \ 1337modules_evas_loaders_webp_module_la_LIBADD = \
1394lib/evas/libevas.la \ 1338lib/evas/libevas.la \
1395@EFL_LIBS@ \
1396@evas_image_loader_webp_libs@ 1339@evas_image_loader_webp_libs@
1397modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version 1340modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version
1398modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static 1341modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1416,11 +1359,9 @@ modules_evas_loaders_xpm_module_la_CPPFLAGS = \
1416-I$(top_srcdir)/src/lib/evas/include \ 1359-I$(top_srcdir)/src/lib/evas/include \
1417-DEFL_EVAS_BUILD \ 1360-DEFL_EVAS_BUILD \
1418@evas_image_loader_xpm_cflags@ \ 1361@evas_image_loader_xpm_cflags@ \
1419@EFL_CFLAGS@ \
1420@EVAS_CFLAGS@ 1362@EVAS_CFLAGS@
1421modules_evas_loaders_xpm_module_la_LIBADD = \ 1363modules_evas_loaders_xpm_module_la_LIBADD = \
1422lib/evas/libevas.la \ 1364lib/evas/libevas.la \
1423@EFL_LIBS@ \
1424@evas_image_loader_xpm_libs@ 1365@evas_image_loader_xpm_libs@
1425modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version 1366modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version
1426modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static 1367modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1466,12 +1407,10 @@ bin_evas_evas_cserve2_CPPFLAGS = \
1466-I$(top_srcdir)/src/lib/evas/cserve2 \ 1407-I$(top_srcdir)/src/lib/evas/cserve2 \
1467-I$(top_srcdir)/src/lib/eet \ 1408-I$(top_srcdir)/src/lib/eet \
1468-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 1409-DPACKAGE_LIB_DIR=\"$(libdir)\" \
1469@EVAS_CFLAGS@ \ 1410@EVAS_CFLAGS@
1470@EFL_CFLAGS@
1471 1411
1472bin_evas_evas_cserve2_LDADD = \ 1412bin_evas_evas_cserve2_LDADD = \
1473@EVAS_LIBS@ \ 1413@EVAS_LDFLAGS@ \
1474@EFL_LIBS@ \
1475lib/eet/libeet.la \ 1414lib/eet/libeet.la \
1476lib/eina/libeina.la \ 1415lib/eina/libeina.la \
1477lib/evas/libevas.la 1416lib/evas/libevas.la
@@ -1486,8 +1425,7 @@ bin_evas_evas_cserve2_client_CPPFLAGS = \
1486-I$(top_srcdir)/src/lib/evas \ 1425-I$(top_srcdir)/src/lib/evas \
1487-I$(top_srcdir)/src/lib/evas/include \ 1426-I$(top_srcdir)/src/lib/evas/include \
1488-I$(top_srcdir)/src/lib/evas/cserve2 \ 1427-I$(top_srcdir)/src/lib/evas/cserve2 \
1489@EVAS_CFLAGS@ \ 1428@EVAS_CFLAGS@
1490@EFL_CFLAGS@
1491 1429
1492bin_evas_evas_cserve2_usage_SOURCES = \ 1430bin_evas_evas_cserve2_usage_SOURCES = \
1493bin/evas/evas_cserve2_usage.c 1431bin/evas/evas_cserve2_usage.c
@@ -1499,13 +1437,11 @@ bin_evas_evas_cserve2_usage_CPPFLAGS = \
1499-I$(top_srcdir)/src/lib/evas \ 1437-I$(top_srcdir)/src/lib/evas \
1500-I$(top_srcdir)/src/lib/evas/include \ 1438-I$(top_srcdir)/src/lib/evas/include \
1501-I$(top_srcdir)/src/lib/evas/cserve2 \ 1439-I$(top_srcdir)/src/lib/evas/cserve2 \
1502@EVAS_CFLAGS@ \ 1440@EVAS_CFLAGS@
1503@EFL_CFLAGS@
1504 1441
1505bin_evas_evas_cserve2_usage_LDADD = \ 1442bin_evas_evas_cserve2_usage_LDADD = \
1506lib/eina/libeina.la \ 1443lib/eina/libeina.la \
1507@EFL_LIBS@ \ 1444@EVAS_LDFLAGS@
1508@EVAS_LIBS@
1509 1445
1510bin_evas_evas_cserve2_debug_SOURCES = \ 1446bin_evas_evas_cserve2_debug_SOURCES = \
1511bin/evas/evas_cserve2_debug.c 1447bin/evas/evas_cserve2_debug.c
@@ -1517,13 +1453,11 @@ bin_evas_evas_cserve2_debug_CPPFLAGS = \
1517-I$(top_srcdir)/src/lib/evas \ 1453-I$(top_srcdir)/src/lib/evas \
1518-I$(top_srcdir)/src/lib/evas/include \ 1454-I$(top_srcdir)/src/lib/evas/include \
1519-I$(top_srcdir)/src/lib/evas/cserve2 \ 1455-I$(top_srcdir)/src/lib/evas/cserve2 \
1520@EVAS_CFLAGS@ \ 1456@EVAS_CFLAGS@
1521@EFL_CFLAGS@
1522 1457
1523bin_evas_evas_cserve2_debug_LDADD = \ 1458bin_evas_evas_cserve2_debug_LDADD = \
1524lib/eina/libeina.la \ 1459lib/eina/libeina.la \
1525@EFL_LIBS@ \ 1460@EVAS_LDFLAGS@
1526@EVAS_LIBS@
1527 1461
1528bin_evas_evas_cserve2_slave_SOURCES = \ 1462bin_evas_evas_cserve2_slave_SOURCES = \
1529bin/evas/evas_cserve2_slave.c \ 1463bin/evas/evas_cserve2_slave.c \
@@ -1537,13 +1471,11 @@ bin_evas_evas_cserve2_slave_CPPFLAGS = \
1537-I$(top_srcdir)/src/lib/evas/include \ 1471-I$(top_srcdir)/src/lib/evas/include \
1538-I$(top_srcdir)/src/lib/evas/cserve2 \ 1472-I$(top_srcdir)/src/lib/evas/cserve2 \
1539-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 1473-DPACKAGE_LIB_DIR=\"$(libdir)\" \
1540@EVAS_CFLAGS@ \ 1474@EVAS_CFLAGS@
1541@EFL_CFLAGS@
1542 1475
1543bin_evas_evas_cserve2_slave_LDADD = \ 1476bin_evas_evas_cserve2_slave_LDADD = \
1544lib/eina/libeina.la \ 1477lib/eina/libeina.la \
1545@EFL_LIBS@ \ 1478@EVAS_LDFLAGS@
1546@EVAS_LIBS@
1547 1479
1548bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic 1480bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic
1549 1481
@@ -1557,11 +1489,9 @@ bin_evas_dummy_slave_CPPFLAGS = \
1557-I$(top_srcdir)/src/lib/evas \ 1489-I$(top_srcdir)/src/lib/evas \
1558-I$(top_srcdir)/src/lib/evas/include \ 1490-I$(top_srcdir)/src/lib/evas/include \
1559-I$(top_srcdir)/src/lib/evas/cserve2 \ 1491-I$(top_srcdir)/src/lib/evas/cserve2 \
1560@EVAS_CFLAGS@ \ 1492@EVAS_CFLAGS@
1561@EFL_CFLAGS@
1562 1493
1563bin_evas_dummy_slave_LDADD = \ 1494bin_evas_dummy_slave_LDADD = \
1564@EFL_LIBS@ \
1565@EVAS_LIBS@ 1495@EVAS_LIBS@
1566 1496
1567### Cserve2 loaders 1497### Cserve2 loaders
@@ -1578,9 +1508,8 @@ bin_evas_loaders_bmp_module_la_CPPFLAGS = \
1578-I$(top_srcdir)/src/lib/evas/include \ 1508-I$(top_srcdir)/src/lib/evas/include \
1579-I$(top_srcdir)/src/lib/evas/cserve2 \ 1509-I$(top_srcdir)/src/lib/evas/cserve2 \
1580-I$(top_srcdir)/src/bin/evas \ 1510-I$(top_srcdir)/src/bin/evas \
1581@EFL_CFLAGS@ \
1582@EVAS_CFLAGS@ 1511@EVAS_CFLAGS@
1583bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ 1512bin_evas_loaders_bmp_module_la_LIBADD = @EVAS_LIBS@
1584bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version 1513bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
1585bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static 1514bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
1586endif 1515endif
@@ -1599,9 +1528,8 @@ bin_evas_loaders_eet_module_la_CPPFLAGS = \
1599-I$(top_srcdir)/src/lib/evas/cserve2 \ 1528-I$(top_srcdir)/src/lib/evas/cserve2 \
1600-I$(top_srcdir)/src/bin/evas \ 1529-I$(top_srcdir)/src/bin/evas \
1601@evas_image_loader_eet_cflags@ \ 1530@evas_image_loader_eet_cflags@ \
1602@EFL_CFLAGS@ \
1603@EVAS_CFLAGS@ 1531@EVAS_CFLAGS@
1604bin_evas_loaders_eet_module_la_LIBADD = @EFL_LIBS@ \ 1532bin_evas_loaders_eet_module_la_LIBADD = @EVAS_LIBS@ \
1605@evas_image_loader_eet_libs@ \ 1533@evas_image_loader_eet_libs@ \
1606lib/eet/libeet.la 1534lib/eet/libeet.la
1607bin_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version 1535bin_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version
@@ -1621,9 +1549,8 @@ bin_evas_loaders_ico_module_la_CPPFLAGS = \
1621-I$(top_srcdir)/src/lib/evas/cserve2 \ 1549-I$(top_srcdir)/src/lib/evas/cserve2 \
1622-I$(top_srcdir)/src/bin/evas \ 1550-I$(top_srcdir)/src/bin/evas \
1623@evas_image_loader_ico_cflags@ \ 1551@evas_image_loader_ico_cflags@ \
1624@EFL_CFLAGS@ \
1625@EVAS_CFLAGS@ 1552@EVAS_CFLAGS@
1626bin_evas_loaders_ico_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_ico_libs@ 1553bin_evas_loaders_ico_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_ico_libs@
1627bin_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version 1554bin_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version
1628bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static 1555bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
1629endif 1556endif
@@ -1641,9 +1568,8 @@ bin_evas_loaders_jpeg_module_la_CPPFLAGS = \
1641-I$(top_srcdir)/src/lib/evas/cserve2 \ 1568-I$(top_srcdir)/src/lib/evas/cserve2 \
1642-I$(top_srcdir)/src/bin/evas \ 1569-I$(top_srcdir)/src/bin/evas \
1643@evas_image_loader_jpeg_cflags@ \ 1570@evas_image_loader_jpeg_cflags@ \
1644@EFL_CFLAGS@ \
1645@EVAS_CFLAGS@ 1571@EVAS_CFLAGS@
1646bin_evas_loaders_jpeg_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_jpeg_libs@ 1572bin_evas_loaders_jpeg_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_jpeg_libs@
1647bin_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version 1573bin_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version
1648bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static 1574bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
1649endif 1575endif
@@ -1661,9 +1587,8 @@ bin_evas_loaders_pmaps_module_la_CPPFLAGS = \
1661-I$(top_srcdir)/src/lib/evas/cserve2 \ 1587-I$(top_srcdir)/src/lib/evas/cserve2 \
1662-I$(top_srcdir)/src/bin/evas \ 1588-I$(top_srcdir)/src/bin/evas \
1663@evas_image_loader_pmaps_cflags@ \ 1589@evas_image_loader_pmaps_cflags@ \
1664@EFL_CFLAGS@ \
1665@EVAS_CFLAGS@ 1590@EVAS_CFLAGS@
1666bin_evas_loaders_pmaps_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_pmaps_libs@ 1591bin_evas_loaders_pmaps_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_pmaps_libs@
1667bin_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version 1592bin_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version
1668bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static 1593bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
1669endif 1594endif
@@ -1681,9 +1606,8 @@ bin_evas_loaders_png_module_la_CPPFLAGS = \
1681-I$(top_srcdir)/src/lib/evas/cserve2 \ 1606-I$(top_srcdir)/src/lib/evas/cserve2 \
1682-I$(top_srcdir)/src/bin/evas \ 1607-I$(top_srcdir)/src/bin/evas \
1683@evas_image_loader_png_cflags@ \ 1608@evas_image_loader_png_cflags@ \
1684@EFL_CFLAGS@ \
1685@EVAS_CFLAGS@ 1609@EVAS_CFLAGS@
1686bin_evas_loaders_png_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_png_libs@ 1610bin_evas_loaders_png_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_png_libs@
1687bin_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version 1611bin_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version
1688bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static 1612bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
1689endif 1613endif
@@ -1701,9 +1625,8 @@ bin_evas_loaders_psd_module_la_CPPFLAGS = \
1701-I$(top_srcdir)/src/lib/evas/cserve2 \ 1625-I$(top_srcdir)/src/lib/evas/cserve2 \
1702-I$(top_srcdir)/src/bin/evas \ 1626-I$(top_srcdir)/src/bin/evas \
1703@evas_image_loader_psd_cflags@ \ 1627@evas_image_loader_psd_cflags@ \
1704@EFL_CFLAGS@ \
1705@EVAS_CFLAGS@ 1628@EVAS_CFLAGS@
1706bin_evas_loaders_psd_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_psd_libs@ 1629bin_evas_loaders_psd_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_psd_libs@
1707bin_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version 1630bin_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version
1708bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static 1631bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
1709endif 1632endif
@@ -1721,9 +1644,8 @@ bin_evas_loaders_tga_module_la_CPPFLAGS = \
1721-I$(top_srcdir)/src/lib/evas/cserve2 \ 1644-I$(top_srcdir)/src/lib/evas/cserve2 \
1722-I$(top_srcdir)/src/bin/evas \ 1645-I$(top_srcdir)/src/bin/evas \
1723@evas_image_loader_tga_cflags@ \ 1646@evas_image_loader_tga_cflags@ \
1724@EFL_CFLAGS@ \
1725@EVAS_CFLAGS@ 1647@EVAS_CFLAGS@
1726bin_evas_loaders_tga_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tga_libs@ 1648bin_evas_loaders_tga_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tga_libs@
1727bin_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version 1649bin_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version
1728bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static 1650bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
1729endif 1651endif
@@ -1741,9 +1663,8 @@ bin_evas_loaders_tiff_module_la_CPPFLAGS = \
1741-I$(top_srcdir)/src/lib/evas/cserve2 \ 1663-I$(top_srcdir)/src/lib/evas/cserve2 \
1742-I$(top_srcdir)/src/bin/evas \ 1664-I$(top_srcdir)/src/bin/evas \
1743@evas_image_loader_tiff_cflags@ \ 1665@evas_image_loader_tiff_cflags@ \
1744@EFL_CFLAGS@ \
1745@EVAS_CFLAGS@ 1666@EVAS_CFLAGS@
1746bin_evas_loaders_tiff_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tiff_libs@ 1667bin_evas_loaders_tiff_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tiff_libs@
1747bin_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version 1668bin_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version
1748bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static 1669bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
1749endif 1670endif
@@ -1761,9 +1682,8 @@ bin_evas_loaders_wbmp_module_la_CPPFLAGS = \
1761-I$(top_srcdir)/src/lib/evas/cserve2 \ 1682-I$(top_srcdir)/src/lib/evas/cserve2 \
1762-I$(top_srcdir)/src/bin/evas \ 1683-I$(top_srcdir)/src/bin/evas \
1763@evas_image_loader_wbmp_cflags@ \ 1684@evas_image_loader_wbmp_cflags@ \
1764@EFL_CFLAGS@ \
1765@EVAS_CFLAGS@ 1685@EVAS_CFLAGS@
1766bin_evas_loaders_wbmp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_wbmp_libs@ 1686bin_evas_loaders_wbmp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_wbmp_libs@
1767bin_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version 1687bin_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
1768bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static 1688bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
1769endif 1689endif
@@ -1781,9 +1701,8 @@ bin_evas_loaders_webp_module_la_CPPFLAGS = \
1781-I$(top_srcdir)/src/lib/evas/cserve2 \ 1701-I$(top_srcdir)/src/lib/evas/cserve2 \
1782-I$(top_srcdir)/src/bin/evas \ 1702-I$(top_srcdir)/src/bin/evas \
1783@evas_image_loader_webp_cflags@ \ 1703@evas_image_loader_webp_cflags@ \
1784@EFL_CFLAGS@ \
1785@EVAS_CFLAGS@ 1704@EVAS_CFLAGS@
1786bin_evas_loaders_webp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_webp_libs@ 1705bin_evas_loaders_webp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_webp_libs@
1787bin_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version 1706bin_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version
1788bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static 1707bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
1789endif 1708endif
@@ -1801,9 +1720,8 @@ bin_evas_loaders_xpm_module_la_CPPFLAGS = \
1801-I$(top_srcdir)/src/lib/evas/cserve2 \ 1720-I$(top_srcdir)/src/lib/evas/cserve2 \
1802-I$(top_srcdir)/src/bin/evas \ 1721-I$(top_srcdir)/src/bin/evas \
1803@evas_image_loader_xpm_cflags@ \ 1722@evas_image_loader_xpm_cflags@ \
1804@EFL_CFLAGS@ \
1805@EVAS_CFLAGS@ 1723@EVAS_CFLAGS@
1806bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@ 1724bin_evas_loaders_xpm_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_xpm_libs@
1807bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version 1725bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version
1808bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static 1726bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
1809endif 1727endif
@@ -1837,6 +1755,6 @@ tests_evas_evas_suite_LDADD = \
1837lib/evas/libevas.la \ 1755lib/evas/libevas.la \
1838lib/eina/libeina.la \ 1756lib/eina/libeina.la \
1839@CHECK_LIBS@ \ 1757@CHECK_LIBS@ \
1840@EVAS_CFLAGS@ 1758@EVAS_LDFLAGS@
1841 1759
1842endif 1760endif
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 273d42b044..b0ed2a8dfd 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -157,14 +157,17 @@ endif
157 157
158bin_evil_evil_suite_CPPFLAGS = \ 158bin_evil_evil_suite_CPPFLAGS = \
159-I$(top_srcdir)/src/lib/evil \ 159-I$(top_srcdir)/src/lib/evil \
160@EFL_CFLAGS@ \ 160@EVIL_CFLAGS@ \
161@EVIL_CPPFLAGS@ 161@EVIL_CPPFLAGS@
162 162
163bin_evil_evil_suite_LDADD = \ 163bin_evil_evil_suite_LDADD = \
164lib/evil/libevil.la \ 164lib/evil/libevil.la \
165lib/evil/libdl.la \ 165lib/evil/libdl.la \
166@EVIL_LDFLAGS@ \
166-lm 167-lm
167 168
168bin_evil_test_evil_SOURCES = bin/evil/test_evil.c 169bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
169 170
170bin_evil_test_evil_LDADD = lib/evil/libevil.la 171bin_evil_test_evil_LDADD = \
172lib/evil/libevil.la \
173@EVIL_LDFLAGS@
diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am
index 909a38810e..23e13411a2 100644
--- a/src/benchmarks/eina/Makefile.am
+++ b/src/benchmarks/eina/Makefile.am
@@ -42,7 +42,11 @@ EXTRA_LTLIBRARIES = libcity.la
42libcity_la_SOURCES = city.cc 42libcity_la_SOURCES = city.cc
43 43
44nodist_EXTRA_eina_bench_SOURCES = dummy.cc 44nodist_EXTRA_eina_bench_SOURCES = dummy.cc
45eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/eina/libeina.la libcity.la @EINA_LIBS@ 45eina_bench_LDADD = \
46$(top_builddir)/src/lib/eina/libeina.la \
47libcity.la \
48@GLIB_LIBS@ \
49@EINA_LDFLAGS@
46 50
47EXTRA_DIST = strlog 51EXTRA_DIST = strlog
48 52
diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am
index 052b445f33..c57c2e6036 100644
--- a/src/benchmarks/eo/Makefile.am
+++ b/src/benchmarks/eo/Makefile.am
@@ -22,7 +22,7 @@ eo_bench_eo_do.c
22eo_bench_LDADD = \ 22eo_bench_LDADD = \
23$(top_builddir)/src/lib/eo/libeo.la \ 23$(top_builddir)/src/lib/eo/libeo.la \
24$(top_builddir)/src/lib/eina/libeina.la \ 24$(top_builddir)/src/lib/eina/libeina.la \
25@EO_LIBS@ 25@EO_LDFLAGS@
26 26
27clean-local: 27clean-local:
28 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda 28 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am
index b23dfeb466..edcab2b69d 100644
--- a/src/examples/ecore/Makefile.am
+++ b/src/examples/ecore/Makefile.am
@@ -51,108 +51,127 @@ ecore_thread_example \
51ecore_time_functions_example \ 51ecore_time_functions_example \
52ecore_timer_example 52ecore_timer_example
53 53
54ECORE_COMMON_LDADD = \
55$(top_builddir)/src/lib/ecore/libecore.la \
56$(top_builddir)/src/lib/eo/libeo.la \
57$(top_builddir)/src/lib/eina/libeina.la \
58@ECORE_LDFLAGS@
59
54if HAVE_ECORE_AUDIO 60if HAVE_ECORE_AUDIO
55EXTRA_PROGRAMS += \ 61EXTRA_PROGRAMS += \
56ecore_audio_custom \ 62ecore_audio_custom \
57ecore_audio_playback \ 63ecore_audio_playback \
58ecore_audio_to_ogg 64ecore_audio_to_ogg
59 65
66ECORE_AUDIO_COMMON_LDADD = \
67$(top_builddir)/src/lib/ecore_audio/libecore_audio.la \
68$(ECORE_COMMON_LDADD)
69
60ecore_audio_custom_SOURCES = ecore_audio_custom.c 70ecore_audio_custom_SOURCES = ecore_audio_custom.c
61ecore_audio_custom_LDADD = $(top_builddir)/src/lib/ecore_audio/libecore_audio.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 71ecore_audio_custom_LDADD = $(ECORE_AUDIO_COMMON_LDADD)
62 72
63ecore_audio_playback_SOURCES = ecore_audio_playback.c 73ecore_audio_playback_SOURCES = ecore_audio_playback.c
64ecore_audio_playback_LDADD = $(top_builddir)/src/lib/ecore_audio/libecore_audio.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 74ecore_audio_playback_LDADD = $(ECORE_AUDIO_COMMON_LDADD)
65 75
66ecore_audio_to_ogg_SOURCES = ecore_audio_to_ogg.c 76ecore_audio_to_ogg_SOURCES = ecore_audio_to_ogg.c
67ecore_audio_to_ogg_LDADD = $(top_builddir)/src/lib/ecore_audio/libecore_audio.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 77ecore_audio_to_ogg_LDADD = $(ECORE_AUDIO_COMMON_LDADD)
68endif 78endif
69 79
80ECORE_EVAS_COMMON_LDADD = \
81$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
82$(top_builddir)/src/lib/evas/libevas.la \
83$(ECORE_COMMON_LDADD)
84
85ECORE_CON_COMMON_LDADD = \
86$(top_builddir)/src/lib/ecore_con/libecore_con.la \
87$(ECORE_COMMON_LDADD)
88
70ecore_animator_example_SOURCES = ecore_animator_example.c 89ecore_animator_example_SOURCES = ecore_animator_example.c
71ecore_animator_example_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/evas/libevas.la @ECORE_LIBS@ 90ecore_animator_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
72 91
73ecore_client_bench_SOURCES = ecore_client_bench.c 92ecore_client_bench_SOURCES = ecore_client_bench.c
74ecore_client_bench_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 93ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD)
75 94
76ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c 95ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c
77ecore_con_client_simple_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 96ecore_con_client_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD)
78 97
79ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c 98ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c
80ecore_con_lookup_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 99ecore_con_lookup_example_LDADD = $(ECORE_CON_COMMON_LDADD)
81 100
82ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c 101ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c
83ecore_con_server_http_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 102ecore_con_server_http_example_LDADD = $(ECORE_CON_COMMON_LDADD)
84 103
85ecore_con_server_simple_example_SOURCES = ecore_con_server_simple_example.c 104ecore_con_server_simple_example_SOURCES = ecore_con_server_simple_example.c
86ecore_con_server_simple_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 105ecore_con_server_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD)
87 106
88ecore_con_url_cookies_example_SOURCES = ecore_con_url_cookies_example.c 107ecore_con_url_cookies_example_SOURCES = ecore_con_url_cookies_example.c
89ecore_con_url_cookies_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 108ecore_con_url_cookies_example_LDADD = $(ECORE_CON_COMMON_LDADD)
90 109
91ecore_con_url_download_example_SOURCES = ecore_con_url_download_example.c 110ecore_con_url_download_example_SOURCES = ecore_con_url_download_example.c
92ecore_con_url_download_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 111ecore_con_url_download_example_LDADD = $(ECORE_CON_COMMON_LDADD)
93 112
94ecore_con_url_headers_example_SOURCES = ecore_con_url_headers_example.c 113ecore_con_url_headers_example_SOURCES = ecore_con_url_headers_example.c
95ecore_con_url_headers_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 114ecore_con_url_headers_example_LDADD = $(ECORE_CON_COMMON_LDADD)
96 115
97ecore_evas_basics_example_SOURCES = ecore_evas_basics_example.c 116ecore_evas_basics_example_SOURCES = ecore_evas_basics_example.c
98ecore_evas_basics_example_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/evas/libevas.la @ECORE_LIBS@ 117ecore_evas_basics_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
99 118
100ecore_evas_buffer_example_01_SOURCES = ecore_evas_buffer_example_01.c 119ecore_evas_buffer_example_01_SOURCES = ecore_evas_buffer_example_01.c
101ecore_evas_buffer_example_01_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/evas/libevas.la @ECORE_LIBS@ 120ecore_evas_buffer_example_01_LDADD = $(ECORE_EVAS_COMMON_LDADD)
102 121
103ecore_evas_buffer_example_02_SOURCES = ecore_evas_buffer_example_02.c 122ecore_evas_buffer_example_02_SOURCES = ecore_evas_buffer_example_02.c
104ecore_evas_buffer_example_02_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/evas/libevas.la @ECORE_LIBS@ 123ecore_evas_buffer_example_02_LDADD = $(ECORE_EVAS_COMMON_LDADD)
105 124
106ecore_evas_callbacks_SOURCES = ecore_evas_callbacks.c 125ecore_evas_callbacks_SOURCES = ecore_evas_callbacks.c
107ecore_evas_callbacks_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 126ecore_evas_callbacks_LDADD = $(ECORE_EVAS_COMMON_LDADD)
108 127
109ecore_evas_ews_example_SOURCES = ecore_evas_ews_example.c 128ecore_evas_ews_example_SOURCES = ecore_evas_ews_example.c
110ecore_evas_ews_example_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/evas/libevas.la @ECORE_LIBS@ 129ecore_evas_ews_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
111 130
112ecore_evas_object_example_SOURCES = ecore_evas_object_example.c 131ecore_evas_object_example_SOURCES = ecore_evas_object_example.c
113ecore_evas_object_example_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/evas/libevas.la @ECORE_LIBS@ 132ecore_evas_object_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
114 133
115ecore_evas_window_sizes_example_SOURCES = ecore_evas_window_sizes_example.c 134ecore_evas_window_sizes_example_SOURCES = ecore_evas_window_sizes_example.c
116ecore_evas_window_sizes_example_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/evas/libevas.la @ECORE_LIBS@ 135ecore_evas_window_sizes_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
117 136
118ecore_event_example_01_SOURCES = ecore_event_example_01.c 137ecore_event_example_01_SOURCES = ecore_event_example_01.c
119ecore_event_example_01_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 138ecore_event_example_01_LDADD = $(ECORE_COMMON_LDADD)
120 139
121ecore_event_example_02_SOURCES = ecore_event_example_02.c 140ecore_event_example_02_SOURCES = ecore_event_example_02.c
122ecore_event_example_02_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 141ecore_event_example_02_LDADD = $(ECORE_COMMON_LDADD)
123 142
124ecore_exe_example_SOURCES = ecore_exe_example.c 143ecore_exe_example_SOURCES = ecore_exe_example.c
125ecore_exe_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 144ecore_exe_example_LDADD = $(ECORE_COMMON_LDADD)
126 145
127ecore_exe_example_child_SOURCES = ecore_exe_example_child.c 146ecore_exe_example_child_SOURCES = ecore_exe_example_child.c
128ecore_exe_example_child_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 147ecore_exe_example_child_LDADD = $(ECORE_COMMON_LDADD)
129 148
130ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c 149ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c
131ecore_fd_handler_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 150ecore_fd_handler_example_LDADD = $(ECORE_COMMON_LDADD)
132 151
133ecore_idler_example_SOURCES = ecore_idler_example.c 152ecore_idler_example_SOURCES = ecore_idler_example.c
134ecore_idler_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eo/libeo.la @ECORE_LIBS@ 153ecore_idler_example_LDADD = $(ECORE_COMMON_LDADD)
135 154
136ecore_job_example_SOURCES = ecore_job_example.c 155ecore_job_example_SOURCES = ecore_job_example.c
137ecore_job_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 156ecore_job_example_LDADD = $(ECORE_COMMON_LDADD)
138 157
139ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c 158ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c
140ecore_pipe_simple_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 159ecore_pipe_simple_example_LDADD = $(ECORE_COMMON_LDADD)
141 160
142ecore_poller_example_SOURCES = ecore_poller_example.c 161ecore_poller_example_SOURCES = ecore_poller_example.c
143ecore_poller_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eo/libeo.la @ECORE_LIBS@ 162ecore_poller_example_LDADD = $(ECORE_COMMON_LDADD)
144 163
145ecore_server_bench_SOURCES = ecore_server_bench.c 164ecore_server_bench_SOURCES = ecore_server_bench.c
146ecore_server_bench_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 165ecore_server_bench_LDADD = $(ECORE_CON_COMMON_LDADD)
147 166
148ecore_thread_example_SOURCES = ecore_thread_example.c 167ecore_thread_example_SOURCES = ecore_thread_example.c
149ecore_thread_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ 168ecore_thread_example_LDADD = $(ECORE_COMMON_LDADD)
150 169
151ecore_time_functions_example_SOURCES = ecore_time_functions_example.c 170ecore_time_functions_example_SOURCES = ecore_time_functions_example.c
152ecore_time_functions_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 171ecore_time_functions_example_LDADD = $(ECORE_COMMON_LDADD)
153 172
154ecore_timer_example_SOURCES = ecore_timer_example.c 173ecore_timer_example_SOURCES = ecore_timer_example.c
155ecore_timer_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ 174ecore_timer_example_LDADD = $(ECORE_COMMON_LDADD)
156 175
157SRCS = \ 176SRCS = \
158ecore_animator_example \ 177ecore_animator_example \
diff --git a/src/examples/edbus/Makefile.am b/src/examples/edbus/Makefile.am
index 33e8e80a02..b91dcd8029 100644
--- a/src/examples/edbus/Makefile.am
+++ b/src/examples/edbus/Makefile.am
@@ -12,9 +12,11 @@ AM_CPPFLAGS = \
12@EDBUS_CFLAGS@ 12@EDBUS_CFLAGS@
13 13
14EXAMPLES_LIBS = \ 14EXAMPLES_LIBS = \
15$(top_builddir)/src/lib/eo/libeo.la \
15$(top_builddir)/src/lib/ecore/libecore.la \ 16$(top_builddir)/src/lib/ecore/libecore.la \
16$(top_builddir)/src/lib/eina/libeina.la \ 17$(top_builddir)/src/lib/eina/libeina.la \
17$(top_builddir)/src/lib/edbus/libedbus2.la 18$(top_builddir)/src/lib/edbus/libedbus2.la \
19@EDBUS_LDFLAGS@
18 20
19EXTRA_PROGRAMS = \ 21EXTRA_PROGRAMS = \
20connman-list-services \ 22connman-list-services \
diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am
index 17756bae59..f9e626fc6e 100644
--- a/src/examples/eet/Makefile.am
+++ b/src/examples/eet/Makefile.am
@@ -10,25 +10,25 @@ AM_CPPFLAGS = \
10EXTRA_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher 10EXTRA_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher
11 11
12eet_basic_SOURCES = eet-basic.c 12eet_basic_SOURCES = eet-basic.c
13eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ 13eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@
14 14
15eet_file_SOURCES = eet-file.c 15eet_file_SOURCES = eet-file.c
16eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ 16eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@
17 17
18eet_data_simple_SOURCES = eet-data-simple.c 18eet_data_simple_SOURCES = eet-data-simple.c
19eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ 19eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@
20 20
21eet_data_nested_SOURCES = eet-data-nested.c 21eet_data_nested_SOURCES = eet-data-nested.c
22eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ 22eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@
23 23
24eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c 24eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c
25eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ 25eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@
26 26
27eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c 27eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c
28eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ 28eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@
29 29
30eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c 30eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c
31eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ 31eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@
32 32
33SRCS = \ 33SRCS = \
34eet-basic.c \ 34eet-basic.c \
diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am
index 0af0a55124..5bb9e83d97 100644
--- a/src/examples/eina/Makefile.am
+++ b/src/examples/eina/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib/eina \ 5-I$(top_srcdir)/src/lib/eina \
6-I$(top_builddir)/src/lib/eina 6-I$(top_builddir)/src/lib/eina
7 7
8LDADD = $(top_builddir)/src/lib/eina/libeina.la 8LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LDFLAGS@
9 9
10SRCS = \ 10SRCS = \
11eina_accessor_01.c \ 11eina_accessor_01.c \
@@ -100,11 +100,12 @@ eina_inarray_02
100#eina_model_04_parrot.h \ 100#eina_model_04_parrot.h \
101#eina_model_04_whistler.h 101#eina_model_04_whistler.h
102 102
103if BUILD_TILER_EXAMPLE 103# TODO: use ecore_evas from single tree
104AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ 104#if BUILD_TILER_EXAMPLE
105EXTRA_PROGRAMS += eina_tiler_01 105#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@
106eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LIBS@ 106#EXTRA_PROGRAMS += eina_tiler_01
107endif 107#eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LDFLAGS@
108#endif
108 109
109examples: $(EXTRA_PROGRAMS) 110examples: $(EXTRA_PROGRAMS)
110 111
diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am
index ee0db70d78..ad4f901625 100644
--- a/src/examples/eio/Makefile.am
+++ b/src/examples/eio/Makefile.am
@@ -17,10 +17,11 @@ EXTRA_PROGRAMS = eio_file_ls
17eio_file_ls_SOURCES = eio_file_ls.c 17eio_file_ls_SOURCES = eio_file_ls.c
18eio_file_ls_LDADD = \ 18eio_file_ls_LDADD = \
19$(top_builddir)/src/lib/eio/libeio.la \ 19$(top_builddir)/src/lib/eio/libeio.la \
20$(top_builddir)/src/lib/eo/libeo.la \
20$(top_builddir)/src/lib/ecore/libecore.la \ 21$(top_builddir)/src/lib/ecore/libecore.la \
21$(top_builddir)/src/lib/eet/libeet.la \ 22$(top_builddir)/src/lib/eet/libeet.la \
22$(top_builddir)/src/lib/eina/libeina.la \ 23$(top_builddir)/src/lib/eina/libeina.la \
23@EIO_LIBS@ 24@EIO_LDFLAGS@
24 25
25SRCS = \ 26SRCS = \
26eio_file_ls 27eio_file_ls
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index ede96e0e7b..eeca8cbe68 100644
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -27,7 +27,7 @@ isa/eo_isa_mixin.h \
27isa/eo_isa_simple.c \ 27isa/eo_isa_simple.c \
28isa/eo_isa_simple.h 28isa/eo_isa_simple.h
29 29
30eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ 30eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@
31 31
32if EO_BUILD_EXAMPLE_EVAS 32if EO_BUILD_EXAMPLE_EVAS
33 33
@@ -46,7 +46,7 @@ evas/evas_evas_obj.c \
46evas/evas_evas_obj.h \ 46evas/evas_evas_obj.h \
47evas/evas_test.c 47evas/evas_test.c
48 48
49eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LIBS@ 49eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LDFLAGS@
50 50
51endif 51endif
52 52
@@ -59,7 +59,7 @@ simple/simple_mixin.h \
59simple/simple_simple.c \ 59simple/simple_simple.c \
60simple/simple_simple.h 60simple/simple_simple.h
61 61
62eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ 62eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@
63 63
64examples: $(EXTRA_PROGRAMS) 64examples: $(EXTRA_PROGRAMS)
65 65
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index dde2f7766b..4e2471b2da 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -19,12 +19,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/modules/evas/engines/buffer
19 19
20EXTRA_PROGRAMS += evas_buffer_simple 20EXTRA_PROGRAMS += evas_buffer_simple
21evas_buffer_simple_SOURCES = evas-buffer-simple.c 21evas_buffer_simple_SOURCES = evas-buffer-simple.c
22evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la 22evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@
23endif 23endif
24 24
25EXTRA_PROGRAMS += evas_init_shutdown 25EXTRA_PROGRAMS += evas_init_shutdown
26evas_init_shutdown_SOURCES = evas-init-shutdown.c 26evas_init_shutdown_SOURCES = evas-init-shutdown.c
27evas_init_shutdown_LDADD = $(top_builddir)/src/lib/evas/libevas.la 27evas_init_shutdown_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@
28 28
29#the ones using ecore_evas follow 29#the ones using ecore_evas follow
30#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ 30#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@