diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-12-31 00:46:14 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-12-31 00:46:14 +0000 |
commit | df1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c (patch) | |
tree | e26086071ac285910d3e162c39819f3a2c3affea | |
parent | 51f8fe26fc4774e69be3547d49ae902c287c8b61 (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 '')
37 files changed, 209 insertions, 253 deletions
diff --git a/configure.ac b/configure.ac index 3c41884931..386a24dcc5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -142,6 +142,11 @@ platform_cflags_evil="" | |||
142 | platform_cflags_escape="" | 142 | platform_cflags_escape="" |
143 | platform_cflags_exotic="" | 143 | platform_cflags_exotic="" |
144 | 144 | ||
145 | requirements_pc_efl="" | ||
146 | requirements_pc_deps_efl="" | ||
147 | requirements_libs_efl="" | ||
148 | requirements_cflags_efl="" | ||
149 | |||
145 | requirements_pc_crypto="" | 150 | requirements_pc_crypto="" |
146 | requirements_pc_deps_crypto="" | 151 | requirements_pc_deps_crypto="" |
147 | requirements_libs_crypto="" | 152 | requirements_libs_crypto="" |
@@ -441,8 +446,8 @@ esac | |||
441 | EFL_ATTRIBUTE_VECTOR | 446 | EFL_ATTRIBUTE_VECTOR |
442 | EFL_ATTRIBUTE_ALWAYS_INLINE | 447 | EFL_ATTRIBUTE_ALWAYS_INLINE |
443 | 448 | ||
444 | EFL_LIBS="" | 449 | EFL_LIBS="${EFL_LIBS}" |
445 | AC_SUBST([EFL_LIBS]) | 450 | EFL_CFLAGS="${EFL_CFLAGS}" |
446 | 451 | ||
447 | ## CPU architecture specific assembly | 452 | ## CPU architecture specific assembly |
448 | 453 | ||
@@ -826,6 +831,9 @@ EINA_CONFIG([ENABLE_LOG], [test "x${enable_log}" = "xyes"]) | |||
826 | 831 | ||
827 | EFL_CHECK_THREADS | 832 | EFL_CHECK_THREADS |
828 | 833 | ||
834 | EFL_ADD_LIBS([EINA], [${EFL_PTHREAD_LIBS}]) | ||
835 | EFL_ADD_CFLAGS([EINA], [${EFL_PTHREAD_CFLAGS}]) | ||
836 | |||
829 | EINA_CONFIG([HAVE_PTHREAD_BARRIER], [test "x${efl_have_pthread_barrier}" = "xyes"]) | 837 | EINA_CONFIG([HAVE_PTHREAD_BARRIER], [test "x${efl_have_pthread_barrier}" = "xyes"]) |
830 | EINA_CONFIG([HAVE_PTHREAD_AFFINITY], [test "x${efl_have_setaffinity}" = "xyes"]) | 838 | EINA_CONFIG([HAVE_PTHREAD_AFFINITY], [test "x${efl_have_setaffinity}" = "xyes"]) |
831 | EINA_CONFIG([HAVE_DEBUG_THREADS], [test "$want_debug_threads" = "yes"]) | 839 | EINA_CONFIG([HAVE_DEBUG_THREADS], [test "$want_debug_threads" = "yes"]) |
@@ -3197,9 +3205,6 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina]) | |||
3197 | EFL_LIB_END([Efreet]) | 3205 | EFL_LIB_END([Efreet]) |
3198 | #### End of Efreet | 3206 | #### End of Efreet |
3199 | 3207 | ||
3200 | EFL_LIBS="${EFL_LIBS} ${requirements_libs_efl}" | ||
3201 | |||
3202 | |||
3203 | AC_CONFIG_FILES([ | 3208 | AC_CONFIG_FILES([ |
3204 | Makefile | 3209 | Makefile |
3205 | data/Makefile | 3210 | data/Makefile |
@@ -3465,7 +3470,7 @@ echo " Ecore_Evas...................: $have_ecore_evas" | |||
3465 | echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" | 3470 | echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" |
3466 | #fi | 3471 | #fi |
3467 | echo | 3472 | echo |
3468 | echo "Tests..................: ${with_tests}" | 3473 | echo "Tests..................: ${build_tests}" |
3469 | 3474 | ||
3470 | echo "Examples...............: make examples" | 3475 | echo "Examples...............: make examples" |
3471 | echo " installation.......: make install-examples" | 3476 | echo " installation.......: make install-examples" |
@@ -138,12 +138,14 @@ requirements_pc_[]m4_defn([DOWN])="" | |||
138 | requirements_pc_deps_[]m4_defn([DOWN])="" | 138 | requirements_pc_deps_[]m4_defn([DOWN])="" |
139 | 139 | ||
140 | m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}" | 140 | m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}" |
141 | m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}" | ||
141 | m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}" | 142 | m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}" |
142 | 143 | ||
143 | AC_SUBST([requirements_libs_]m4_defn([DOWN])) | 144 | AC_SUBST([requirements_libs_]m4_defn([DOWN])) |
144 | AC_SUBST([requirements_cflags_]m4_defn([DOWN])) | 145 | AC_SUBST([requirements_cflags_]m4_defn([DOWN])) |
145 | AC_SUBST([requirements_pc_]m4_defn([DOWN])) | 146 | AC_SUBST([requirements_pc_]m4_defn([DOWN])) |
146 | AC_SUBST(m4_defn([UP])[_LIBS]) | 147 | AC_SUBST(m4_defn([UP])[_LIBS]) |
148 | AC_SUBST(m4_defn([UP])[_LDFLAGS]) | ||
147 | AC_SUBST(m4_defn([UP])[_CFLAGS]) | 149 | AC_SUBST(m4_defn([UP])[_CFLAGS]) |
148 | 150 | ||
149 | AC_MSG_NOTICE([Start $1 checks]) | 151 | AC_MSG_NOTICE([Start $1 checks]) |
@@ -159,8 +161,11 @@ AC_DEFUN([EFL_LIB_END], | |||
159 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl | 161 | m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl |
160 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl | 162 | m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl |
161 | 163 | ||
162 | m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${requirements_libs_[]m4_defn([DOWN])}" | 164 | m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_LDFLAGS}" |
163 | m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${requirements_cflags_[]m4_defn([DOWN])}" | 165 | m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${m4_defn([UP])_LDFLAGS} ${EFL_LIBS} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} " |
166 | m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl}" | ||
167 | requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" | ||
168 | requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" | ||
164 | 169 | ||
165 | AC_MSG_NOTICE([Finished $1 checks]) | 170 | AC_MSG_NOTICE([Finished $1 checks]) |
166 | m4_popdef([UP]) | 171 | m4_popdef([UP]) |
diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4 index 98dc0a1ba5..6b98390e5c 100644 --- a/m4/efl_compiler.m4 +++ b/m4/efl_compiler.m4 | |||
@@ -56,7 +56,7 @@ m4_foreach_w([flag], [$2], [EFL_CHECK_COMPILER_FLAG([$1], m4_defn([flag]))]) | |||
56 | dnl Macro that checks for a linker flag availability | 56 | dnl Macro that checks for a linker flag availability |
57 | dnl | 57 | dnl |
58 | dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]]) | 58 | dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]]) |
59 | dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value) | 59 | dnl AC_SUBST : EFL_LDFLAGS (EFL being replaced by its value) |
60 | 60 | ||
61 | AC_DEFUN([EFL_CHECK_LINKER_FLAG], | 61 | AC_DEFUN([EFL_CHECK_LINKER_FLAG], |
62 | [ | 62 | [ |
@@ -79,10 +79,9 @@ LDFLAGS="${LDFLAGS_save}" | |||
79 | AC_LANG_POP([C]) | 79 | AC_LANG_POP([C]) |
80 | 80 | ||
81 | if test "x${have_flag}" = "xyes" ; then | 81 | if test "x${have_flag}" = "xyes" ; then |
82 | UPEFL[_LIBS]="${UPEFL[_LIBS]} [$2]" | 82 | UPEFL[_LDFLAGS]="${UPEFL[_LDFLAGS]} [$2]" |
83 | fi | 83 | fi |
84 | AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2]) | 84 | AC_SUBST(UPEFL[_LDFLAGS]) |
85 | AC_SUBST(UPEFL[_LIBS]) | ||
86 | 85 | ||
87 | m4_popdef([UP]) | 86 | m4_popdef([UP]) |
88 | m4_popdef([UPEFL]) | 87 | m4_popdef([UPEFL]) |
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 | ||
80 | bin_edbus_edbus_codegen_LDADD = \ | 79 | bin_edbus_edbus_codegen_LDADD = \ |
@@ -82,4 +81,5 @@ lib/eina/libeina.la \ | |||
82 | lib/eo/libeo.la \ | 81 | lib/eo/libeo.la \ |
83 | lib/ecore/libecore.la \ | 82 | lib/ecore/libecore.la \ |
84 | lib/edbus/libedbus2.la \ | 83 | lib/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 \ | |||
100 | lib/ecore_file/libecore_file.la \ | 99 | lib/ecore_file/libecore_file.la \ |
101 | lib/ecore/libecore.la \ | 100 | lib/ecore/libecore.la \ |
102 | lib/eina/libeina.la \ | 101 | lib/eina/libeina.la \ |
102 | @ECORE_LDFLAGS@ \ | ||
103 | @CHECK_LIBS@ | 103 | @CHECK_LIBS@ |
104 | 104 | ||
105 | if HAVE_ECORE_AUDIO | 105 | if 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 | ||
26 | lib_ecore_cocoa_libecore_cocoa_la_LIBADD = \ | 26 | lib_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) | |||
58 | ecoreevasenginebufferpkg_LTLIBRARIES = modules/ecore_evas/engines/buffer/module.la | 58 | ecoreevasenginebufferpkg_LTLIBRARIES = modules/ecore_evas/engines/buffer/module.la |
59 | modules_ecore_evas_engines_buffer_module_la_SOURCES = $(BUFFERSOURCES) | 59 | modules_ecore_evas_engines_buffer_module_la_SOURCES = $(BUFFERSOURCES) |
60 | modules_ecore_evas_engines_buffer_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) | 60 | modules_ecore_evas_engines_buffer_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) |
61 | modules_ecore_evas_engines_buffer_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la @EFL_LIBS@ | 61 | modules_ecore_evas_engines_buffer_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la |
62 | modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version | 62 | modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version |
63 | modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static | 63 | modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static |
64 | endif | 64 | endif |
@@ -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 |
77 | modules_ecore_evas_engines_x_module_la_LIBADD = \ | 77 | modules_ecore_evas_engines_x_module_la_LIBADD = \ |
78 | lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ | 78 | lib/ecore_evas/libecore_evas.la \ |
79 | lib/ecore_x/libecore_x.la | 79 | lib/ecore_x/libecore_x.la |
80 | modules_ecore_evas_engines_x_module_la_LDFLAGS = -no-undefined -module -avoid-version | 80 | modules_ecore_evas_engines_x_module_la_LDFLAGS = -no-undefined -module -avoid-version |
81 | modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static | 81 | modules_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 |
93 | modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ | 93 | modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ |
94 | lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ | 94 | lib/ecore_evas/libecore_evas.la \ |
95 | lib/ecore_cocoa/libecore_cocoa.la | 95 | lib/ecore_cocoa/libecore_cocoa.la |
96 | modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version | 96 | modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version |
97 | modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static | 97 | modules_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 |
109 | modules_ecore_evas_engines_fb_module_la_LIBADD = \ | 109 | modules_ecore_evas_engines_fb_module_la_LIBADD = \ |
110 | lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ | 110 | lib/ecore_evas/libecore_evas.la \ |
111 | lib/ecore_fb/libecore_fb.la | 111 | lib/ecore_fb/libecore_fb.la |
112 | modules_ecore_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version | 112 | modules_ecore_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version |
113 | modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static | 113 | modules_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 |
125 | modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ | 125 | modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ |
126 | lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ | 126 | lib/ecore_evas/libecore_evas.la \ |
127 | lib/ecore_psl1ght/libecore_psl1ght.la | 127 | lib/ecore_psl1ght/libecore_psl1ght.la |
128 | modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version | 128 | modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version |
129 | modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static | 129 | modules_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@ |
147 | modules_ecore_evas_engines_wayland_module_la_LIBADD = \ | 147 | modules_ecore_evas_engines_wayland_module_la_LIBADD = \ |
148 | lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ | 148 | lib/ecore_evas/libecore_evas.la \ |
149 | lib/ecore_wayland/libecore_wayland.la | 149 | lib/ecore_wayland/libecore_wayland.la |
150 | modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -no-undefined -module -avoid-version | 150 | modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -no-undefined -module -avoid-version |
151 | modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static | 151 | modules_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 |
164 | modules_ecore_evas_engines_sdl_module_la_LIBADD = \ | 164 | modules_ecore_evas_engines_sdl_module_la_LIBADD = \ |
165 | lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ | 165 | lib/ecore_evas/libecore_evas.la \ |
166 | lib/ecore_sdl/libecore_sdl.la | 166 | lib/ecore_sdl/libecore_sdl.la |
167 | modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version | 167 | modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version |
168 | modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static | 168 | modules_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 |
182 | modules_ecore_evas_engines_win32_module_la_LIBADD = \ | 182 | modules_ecore_evas_engines_win32_module_la_LIBADD = \ |
183 | lib/ecore/libecore_evas.la @EFL_LIBS@ \ | 183 | lib/ecore/libecore_evas.la \ |
184 | lib/ecore_win32/libecore_win32.la | 184 | lib/ecore_win32/libecore_win32.la |
185 | modules_ecore_evas_engines_win32_module_la_LDFLAGS = -no-undefined -module -avoid-version | 185 | modules_ecore_evas_engines_win32_module_la_LDFLAGS = -no-undefined -module -avoid-version |
186 | modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static | 186 | modules_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 | ||
41 | lib_ecore_file_libecore_file_la_LIBADD = \ | 41 | lib_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 | ||
29 | lib_ecore_imf_libecore_imf_la_LIBADD = \ | 29 | lib_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 | ||
55 | lib_ecore_imf_libecore_imf_evas_la_LIBADD = \ | 55 | lib_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@ |
91 | modules_ecore_immodules_ibus_ibus_la_LIBADD = \ | 90 | modules_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@ |
127 | modules_ecore_immodules_scim_scim_la_LIBADD = \ | 125 | modules_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@ |
158 | modules_ecore_immodules_xim_xim_la_LIBADD = \ | 155 | modules_ecore_immodules_xim_xim_la_LIBADD = \ |
159 | lib/ecore_imf/libecore_imf.la \ | 156 | lib/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 | ||
28 | lib_ecore_input_libecore_input_la_LIBADD = \ | 28 | lib_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 | ||
57 | lib_ecore_input_libecore_input_evas_la_LIBADD = \ | 57 | lib_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 | ||
28 | lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = \ | 28 | lib_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 | ||
38 | lib_ecore_win32_libecore_win32_la_LIBADD = \ | 38 | lib_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 | ||
28 | lib_ecore_wince_libecore_wince_la_LIBADD = \ | 28 | lib_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 = \ | |||
68 | lib/eet/libeet.la \ | 66 | lib/eet/libeet.la \ |
69 | lib/eina/libeina.la \ | 67 | lib/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 = \ | |||
95 | lib/eet/libeet.la \ | 93 | lib/eet/libeet.la \ |
96 | lib/eina/libeina.la \ | 94 | lib/eina/libeina.la \ |
97 | @CHECK_LIBS@ \ | 95 | @CHECK_LIBS@ \ |
98 | @EET_LIBS@ | 96 | @EET_LDFLAGS@ |
99 | 97 | ||
100 | endif | 98 | endif |
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 | ||
44 | EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la | 43 | EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la |
45 | 44 | ||
45 | EFREET_COMMON_USER_LDADD = \ | ||
46 | lib/efreet/libefreet.la \ | ||
47 | lib/eina/libeina.la \ | ||
48 | lib/eo/libeo.la \ | ||
49 | lib/ecore/libecore.la \ | ||
50 | lib/ecore_file/libecore_file.la \ | ||
51 | lib/eet/libeet.la \ | ||
52 | lib/edbus/libedbus2.la \ | ||
53 | @USE_EVIL_LIBS@ \ | ||
54 | @EFREET_LDFLAGS@ \ | ||
55 | @EFL_COV_LIBS@ | ||
56 | |||
46 | installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ | 57 | installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ |
47 | dist_installed_efreetmainheaders_DATA = \ | 58 | dist_installed_efreetmainheaders_DATA = \ |
48 | lib/efreet/Efreet.h \ | 59 | lib/efreet/Efreet.h \ |
@@ -104,7 +115,7 @@ bin/efreet/efreetd_cache.h \ | |||
104 | bin/efreet/efreetd_cache.c | 115 | bin/efreet/efreetd_cache.c |
105 | 116 | ||
106 | bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 117 | bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
107 | bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LIBADD) | 118 | bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD) |
108 | 119 | ||
109 | efreetinternal_bindir=$(libdir)/efreet | 120 | efreetinternal_bindir=$(libdir)/efreet |
110 | efreetinternal_bin_PROGRAMS = \ | 121 | efreetinternal_bin_PROGRAMS = \ |
@@ -112,12 +123,12 @@ bin/efreet/efreet_desktop_cache_create \ | |||
112 | bin/efreet/efreet_icon_cache_create | 123 | bin/efreet/efreet_icon_cache_create |
113 | 124 | ||
114 | bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 125 | bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
115 | bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) | 126 | bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) |
116 | bin_efreet_efreet_desktop_cache_create_SOURCES = \ | 127 | bin_efreet_efreet_desktop_cache_create_SOURCES = \ |
117 | bin/efreet/efreet_desktop_cache_create.c | 128 | bin/efreet/efreet_desktop_cache_create.c |
118 | 129 | ||
119 | bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 130 | bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
120 | bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) | 131 | bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) |
121 | bin_efreet_efreet_icon_cache_create_SOURCES = \ | 132 | bin_efreet_efreet_icon_cache_create_SOURCES = \ |
122 | bin/efreet/efreet_icon_cache_create.c | 133 | bin/efreet/efreet_icon_cache_create.c |
123 | 134 | ||
@@ -138,7 +149,7 @@ tests/efreet/compare/efreet_menu_alloc | |||
138 | # efreet_test | 149 | # efreet_test |
139 | tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 150 | tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
140 | tests_efreet_efreet_test_LDADD = \ | 151 | tests_efreet_efreet_test_LDADD = \ |
141 | $(EFREET_COMMON_USER_LIBADD) \ | 152 | $(EFREET_COMMON_USER_LDADD) \ |
142 | lib/efreet/libefreet_mime.la | 153 | lib/efreet/libefreet_mime.la |
143 | 154 | ||
144 | tests_efreet_efreet_test_SOURCES = \ | 155 | tests_efreet_efreet_test_SOURCES = \ |
@@ -154,38 +165,38 @@ tests/efreet/main.c | |||
154 | 165 | ||
155 | # efreet_spec_test | 166 | # efreet_spec_test |
156 | tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 167 | tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
157 | tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LIBADD) | 168 | tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD) |
158 | tests_efreet_efreet_spec_test_SOURCES = \ | 169 | tests_efreet_efreet_spec_test_SOURCES = \ |
159 | tests/efreet/efreet_spec_test.c | 170 | tests/efreet/efreet_spec_test.c |
160 | 171 | ||
161 | # efreet_cache_test | 172 | # efreet_cache_test |
162 | tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 173 | tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
163 | tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LIBADD) | 174 | tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD) |
164 | tests_efreet_efreet_cache_test_SOURCES = \ | 175 | tests_efreet_efreet_cache_test_SOURCES = \ |
165 | tests/efreet/ef_cache.c | 176 | tests/efreet/ef_cache.c |
166 | 177 | ||
167 | # efreet_icon_cache_dump | 178 | # efreet_icon_cache_dump |
168 | tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 179 | tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
169 | tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LIBADD) | 180 | tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD) |
170 | tests_efreet_efreet_icon_cache_dump_SOURCES = \ | 181 | tests_efreet_efreet_icon_cache_dump_SOURCES = \ |
171 | tests/efreet/efreet_icon_cache_dump.c | 182 | tests/efreet/efreet_icon_cache_dump.c |
172 | 183 | ||
173 | # efreet_user_dir | 184 | # efreet_user_dir |
174 | tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 185 | tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
175 | tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LIBADD) | 186 | tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD) |
176 | tests_efreet_efreet_user_dir_SOURCES = \ | 187 | tests_efreet_efreet_user_dir_SOURCES = \ |
177 | tests/efreet/efreet_user_dir.c | 188 | tests/efreet/efreet_user_dir.c |
178 | 189 | ||
179 | # efreet_alloc | 190 | # efreet_alloc |
180 | tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 191 | tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
181 | tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) | 192 | tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) |
182 | tests_efreet_compare_efreet_alloc_SOURCES = \ | 193 | tests_efreet_compare_efreet_alloc_SOURCES = \ |
183 | tests/efreet/compare/efreet_alloc.c \ | 194 | tests/efreet/compare/efreet_alloc.c \ |
184 | tests/efreet/compare/comp.h | 195 | tests/efreet/compare/comp.h |
185 | 196 | ||
186 | # efreet_menu_alloc | 197 | # efreet_menu_alloc |
187 | tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) | 198 | tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) |
188 | tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) | 199 | tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) |
189 | tests_efreet_compare_efreet_menu_alloc_SOURCES = \ | 200 | tests_efreet_compare_efreet_menu_alloc_SOURCES = \ |
190 | tests/efreet/compare/efreet_menu_alloc.c \ | 201 | tests/efreet/compare/efreet_menu_alloc.c \ |
191 | tests/efreet/compare/comp.h | 202 | tests/efreet/compare/comp.h |
@@ -215,6 +226,6 @@ tests/efreet/efreet_test_efreet.c \ | |||
215 | tests/efreet/efreet_test_efreet_cache.c | 226 | tests/efreet/efreet_test_efreet_cache.c |
216 | 227 | ||
217 | tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ | 228 | tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ |
218 | tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LIBADD) @CHECK_LIBS@ | 229 | tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@ |
219 | 230 | ||
220 | endif | 231 | endif |
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 |
164 | chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ | 164 | chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ |
165 | chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c | 165 | chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c |
166 | chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ | 166 | chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ |
167 | chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ | 167 | chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version |
168 | chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static | 168 | chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static |
169 | endif | 169 | endif |
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 |
181 | one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ | 181 | one_big_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ |
182 | one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c | 182 | one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c |
183 | one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ | 183 | one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ |
184 | one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ | 184 | one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version |
185 | one_big_module_la_LIBTOOLFLAGS = --tag=disable-static | 185 | one_big_module_la_LIBTOOLFLAGS = --tag=disable-static |
186 | endif | 186 | endif |
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 | ||
219 | lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ | 217 | lib_eina_libeina_la_LIBADD = \ |
218 | @EINA_LIBS@ \ | ||
219 | @EFL_COV_LIBS@ \ | ||
220 | @USE_EVIL_LIBS@ \ | ||
221 | @DL_LIBS@ | ||
220 | lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ | 222 | lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ |
221 | 223 | ||
222 | ### Script | 224 | ### Script |
@@ -279,7 +281,7 @@ tests_eina_eina_suite_CPPFLAGS = \ | |||
279 | tests_eina_eina_suite_LDADD = \ | 281 | tests_eina_eina_suite_LDADD = \ |
280 | lib/eina/libeina.la \ | 282 | lib/eina/libeina.la \ |
281 | @CHECK_LIBS@ \ | 283 | @CHECK_LIBS@ \ |
282 | @EINA_LIBS@ | 284 | @EINA_LDFLAGS@ |
283 | 285 | ||
284 | tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx | 286 | tests_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 | ||
292 | tests_eina_cxx_compile_test_LDADD = \ | 294 | tests_eina_cxx_compile_test_LDADD = \ |
293 | lib/eina/libeina.la \ | 295 | lib/eina/libeina.la \ |
294 | @EINA_LIBS@ | 296 | @EINA_LDFLAGS@ |
295 | 297 | ||
296 | EXTRA_LTLIBRARIES = tests/eina/module_dummy.la | 298 | EXTRA_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 | ||
40 | lib_eio_libeio_la_LIBADD = \ | 40 | lib_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 | ||
30 | lib_embryo_libembryo_la_LIBADD = \ | 29 | lib_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 | ||
68 | bin_embryo_embryo_cc_LDADD = \ | 66 | bin_embryo_embryo_cc_LDADD = \ |
69 | lib/embryo/libembryo.la \ | 67 | lib/embryo/libembryo.la \ |
70 | lib/eina/libeina.la \ | 68 | lib/eina/libeina.la \ |
69 | @EMBRYO_LDFLAGS@ \ | ||
71 | @USE_EVIL_LIBS@ | 70 | @USE_EVIL_LIBS@ |
72 | 71 | ||
73 | EXTRA_DIST += \ | 72 | EXTRA_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 | ||
58 | tests_eo_test_access_LDADD = \ | 57 | tests_eo_test_access_LDADD = \ |
59 | lib/eo/libeo.la \ | 58 | lib/eo/libeo.la \ |
60 | @EO_LIBS@ | 59 | @EO_LDFLAGS@ |
61 | 60 | ||
62 | tests_eo_test_composite_objects_SOURCES = \ | 61 | tests_eo_test_composite_objects_SOURCES = \ |
63 | tests/eo/composite_objects/composite_objects_comp.c \ | 62 | tests/eo/composite_objects/composite_objects_comp.c \ |
@@ -75,7 +74,7 @@ tests_eo_test_composite_objects_CPPFLAGS = \ | |||
75 | 74 | ||
76 | tests_eo_test_composite_objects_LDADD = \ | 75 | tests_eo_test_composite_objects_LDADD = \ |
77 | lib/eo/libeo.la \ | 76 | lib/eo/libeo.la \ |
78 | @EO_LIBS@ | 77 | @EO_LDFLAGS@ |
79 | 78 | ||
80 | tests_eo_test_constructors_SOURCES = \ | 79 | tests_eo_test_constructors_SOURCES = \ |
81 | tests/eo/constructors/constructors_main.c \ | 80 | tests/eo/constructors/constructors_main.c \ |
@@ -105,7 +104,7 @@ tests_eo_test_constructors_CPPFLAGS = \ | |||
105 | 104 | ||
106 | tests_eo_test_constructors_LDADD = \ | 105 | tests_eo_test_constructors_LDADD = \ |
107 | lib/eo/libeo.la \ | 106 | lib/eo/libeo.la \ |
108 | @EO_LIBS@ | 107 | @EO_LDFLAGS@ |
109 | 108 | ||
110 | if EFL_ENABLE_TESTS | 109 | if EFL_ENABLE_TESTS |
111 | 110 | ||
@@ -129,7 +128,7 @@ tests_eo_eo_suite_CPPFLAGS = \ | |||
129 | tests_eo_eo_suite_LDADD = \ | 128 | tests_eo_eo_suite_LDADD = \ |
130 | lib/eo/libeo.la \ | 129 | lib/eo/libeo.la \ |
131 | @CHECK_LIBS@ \ | 130 | @CHECK_LIBS@ \ |
132 | @EO_LIBS@ | 131 | @EO_LDFLAGS@ |
133 | 132 | ||
134 | endif | 133 | endif |
135 | 134 | ||
@@ -153,7 +152,7 @@ tests_eo_test_function_overrides_CPPFLAGS = \ | |||
153 | 152 | ||
154 | tests_eo_test_function_overrides_LDADD = \ | 153 | tests_eo_test_function_overrides_LDADD = \ |
155 | lib/eo/libeo.la \ | 154 | lib/eo/libeo.la \ |
156 | @EO_LIBS@ | 155 | @EO_LDFLAGS@ |
157 | 156 | ||
158 | tests_eo_test_interface_SOURCES = \ | 157 | tests_eo_test_interface_SOURCES = \ |
159 | tests/eo/interface/interface_interface.c \ | 158 | tests/eo/interface/interface_interface.c \ |
@@ -173,7 +172,7 @@ tests_eo_test_interface_CPPFLAGS = \ | |||
173 | 172 | ||
174 | tests_eo_test_interface_LDADD = \ | 173 | tests_eo_test_interface_LDADD = \ |
175 | lib/eo/libeo.la \ | 174 | lib/eo/libeo.la \ |
176 | @EO_LIBS@ | 175 | @EO_LDFLAGS@ |
177 | 176 | ||
178 | tests_eo_test_mixin_SOURCES = \ | 177 | tests_eo_test_mixin_SOURCES = \ |
179 | tests/eo/mixin/mixin_inherit.c \ | 178 | tests/eo/mixin/mixin_inherit.c \ |
@@ -199,7 +198,7 @@ tests_eo_test_mixin_CPPFLAGS = \ | |||
199 | 198 | ||
200 | tests_eo_test_mixin_LDADD = \ | 199 | tests_eo_test_mixin_LDADD = \ |
201 | lib/eo/libeo.la \ | 200 | lib/eo/libeo.la \ |
202 | @EO_LIBS@ | 201 | @EO_LDFLAGS@ |
203 | 202 | ||
204 | tests_eo_test_signals_SOURCES = \ | 203 | tests_eo_test_signals_SOURCES = \ |
205 | tests/eo/signals/signals_main.c \ | 204 | tests/eo/signals/signals_main.c \ |
@@ -215,6 +214,6 @@ tests_eo_test_signals_CPPFLAGS = \ | |||
215 | 214 | ||
216 | tests_eo_test_signals_LDADD = \ | 215 | tests_eo_test_signals_LDADD = \ |
217 | lib/eo/libeo.la \ | 216 | lib/eo/libeo.la \ |
218 | @EO_LIBS@ | 217 | @EO_LDFLAGS@ |
219 | 218 | ||
220 | EXTRA_DIST += tests/eo/eunit_tests.h | 219 | EXTRA_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@ |
382 | modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la | 380 | modules_evas_engines_software_generic_module_la_LIBADD = lib/evas/libevas.la |
383 | modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version | 381 | modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version |
384 | modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static | 382 | modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static |
385 | endif | 383 | endif |
@@ -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@ |
410 | modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ | 407 | modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la |
411 | modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version | 408 | modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version |
412 | modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static | 409 | modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static |
413 | endif | 410 | endif |
@@ -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@ |
442 | modules_evas_engines_fb_module_la_LIBADD = \ | 438 | modules_evas_engines_fb_module_la_LIBADD = \ |
443 | lib/evas/libevas.la \ | 439 | lib/evas/libevas.la \ |
444 | @EFL_LIBS@ \ | ||
445 | @evas_engine_fb_libs@ | 440 | @evas_engine_fb_libs@ |
446 | modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version | 441 | modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version |
447 | modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static | 442 | modules_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@ |
559 | modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ | 553 | modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ |
560 | lib/eet/libeet.la \ | 554 | lib/eet/libeet.la \ |
561 | lib/evas/libevas.la \ | 555 | lib/evas/libevas.la |
562 | @EFL_LIBS@ | ||
563 | modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version | 556 | modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version |
564 | modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static | 557 | modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static |
565 | endif | 558 | endif |
@@ -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@ |
597 | modules_evas_engines_gl_cocoa_module_la_LIBADD = | 589 | modules_evas_engines_gl_cocoa_module_la_LIBADD = |
598 | if ! EVAS_STATIC_BUILD_GL_COMMON | 590 | if ! EVAS_STATIC_BUILD_GL_COMMON |
@@ -602,7 +594,6 @@ endif | |||
602 | modules_evas_engines_gl_cocoa_module_la_LIBADD += \ | 594 | modules_evas_engines_gl_cocoa_module_la_LIBADD += \ |
603 | lib/eet/libeet.la \ | 595 | lib/eet/libeet.la \ |
604 | lib/evas/libevas.la \ | 596 | lib/evas/libevas.la \ |
605 | @EFL_LIBS@ \ | ||
606 | @evas_engine_gl_cocoa_libs@ | 597 | @evas_engine_gl_cocoa_libs@ |
607 | modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version | 598 | modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version |
608 | modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static | 599 | modules_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@ |
640 | modules_evas_engines_gl_sdl_module_la_LIBADD = | 630 | modules_evas_engines_gl_sdl_module_la_LIBADD = |
641 | if ! EVAS_STATIC_BUILD_GL_COMMON | 631 | if ! EVAS_STATIC_BUILD_GL_COMMON |
@@ -644,7 +634,6 @@ modules/evas/engines/gl_common/libevas_engine_gl_common.la | |||
644 | endif | 634 | endif |
645 | modules_evas_engines_gl_sdl_module_la_LIBADD += \ | 635 | modules_evas_engines_gl_sdl_module_la_LIBADD += \ |
646 | lib/evas/libevas.la \ | 636 | lib/evas/libevas.la \ |
647 | @EFL_LIBS@ \ | ||
648 | @evas_engine_gl_sdl_libs@ | 637 | @evas_engine_gl_sdl_libs@ |
649 | modules_evas_engines_gl_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version | 638 | modules_evas_engines_gl_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version |
650 | modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static | 639 | modules_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@ |
683 | modules_evas_engines_gl_x11_module_la_LIBADD = | 671 | modules_evas_engines_gl_x11_module_la_LIBADD = |
684 | if ! EVAS_STATIC_BUILD_GL_COMMON | 672 | if ! EVAS_STATIC_BUILD_GL_COMMON |
@@ -688,7 +676,6 @@ endif | |||
688 | modules_evas_engines_gl_x11_module_la_LIBADD += \ | 676 | modules_evas_engines_gl_x11_module_la_LIBADD += \ |
689 | lib/eet/libeet.la \ | 677 | lib/eet/libeet.la \ |
690 | lib/evas/libevas.la \ | 678 | lib/evas/libevas.la \ |
691 | @EFL_LIBS@ \ | ||
692 | @evas_engine_gl_xlib_libs@ | 679 | @evas_engine_gl_xlib_libs@ |
693 | modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version | 680 | modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version |
694 | modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static | 681 | modules_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@ |
723 | modules_evas_engines_psl1ght_module_la_LIBADD = \ | 709 | modules_evas_engines_psl1ght_module_la_LIBADD = \ |
724 | lib/evas/libevas.la \ | 710 | lib/evas/libevas.la \ |
725 | @evas_engine_psl1ght_libs@ \ | 711 | @evas_engine_psl1ght_libs@ |
726 | @EFL_LIBS@ | ||
727 | modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version | 712 | modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version |
728 | modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static | 713 | modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static |
729 | endif | 714 | endif |
@@ -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@ |
761 | modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions | 745 | modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions |
762 | modules_evas_engines_software_ddraw_module_la_LIBADD = \ | 746 | modules_evas_engines_software_ddraw_module_la_LIBADD = \ |
763 | lib/evas/libevas.la \ | 747 | lib/evas/libevas.la \ |
764 | @evas_engine_software_ddraw_libs@ \ | 748 | @evas_engine_software_ddraw_libs@ |
765 | @EFL_LIBS@ | ||
766 | modules_evas_engines_software_ddraw_module_la_LDFLAGS = -no-undefined -module -avoid-version | 749 | modules_evas_engines_software_ddraw_module_la_LDFLAGS = -no-undefined -module -avoid-version |
767 | modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static | 750 | modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static |
768 | endif | 751 | endif |
@@ -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@ |
799 | modules_evas_engines_software_gdi_module_la_LIBADD = \ | 781 | modules_evas_engines_software_gdi_module_la_LIBADD = \ |
800 | lib/evas/libevas.la \ | 782 | lib/evas/libevas.la \ |
801 | @evas_engine_software_gdi_libs@ \ | 783 | @evas_engine_software_gdi_libs@ |
802 | @EFL_LIBS@ | ||
803 | modules_evas_engines_software_gdi_module_la_LDFLAGS = -no-undefined -module -avoid-version | 784 | modules_evas_engines_software_gdi_module_la_LDFLAGS = -no-undefined -module -avoid-version |
804 | modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static | 785 | modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static |
805 | endif | 786 | endif |
@@ -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@ |
824 | SOFTWARE_X11_LIBADD = | 804 | SOFTWARE_X11_LIBADD = |
825 | if BUILD_ENGINE_SOFTWARE_XLIB | 805 | if BUILD_ENGINE_SOFTWARE_XLIB |
@@ -861,7 +841,7 @@ enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_A | |||
861 | enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la | 841 | enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la |
862 | modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES) | 842 | modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES) |
863 | modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS) | 843 | modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS) |
864 | modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ $(SOFTWARE_X11_LIBADD) | 844 | modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la $(SOFTWARE_X11_LIBADD) |
865 | modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version | 845 | modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version |
866 | modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static | 846 | modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static |
867 | endif | 847 | endif |
@@ -878,7 +858,7 @@ lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES) | |||
878 | lib_evas_libevas_la_CPPFLAGS += \ | 858 | lib_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@ |
881 | lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_egl_libs@ | 861 | lib_evas_libevas_la_LIBADD += @evas_engine_wayland_egl_libs@ |
882 | else | 862 | else |
883 | enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) | 863 | enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) |
884 | enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la | 864 | enginewaylandeglpkg_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@ |
898 | modules_evas_engines_wayland_egl_module_la_LIBADD = \ | 877 | modules_evas_engines_wayland_egl_module_la_LIBADD = \ |
899 | modules/evas/engines/gl_common/libevas_engine_gl_common.la \ | 878 | modules/evas/engines/gl_common/libevas_engine_gl_common.la \ |
900 | lib/eet/libeet.la \ | 879 | lib/eet/libeet.la \ |
901 | lib/evas/libevas.la \ | 880 | lib/evas/libevas.la \ |
902 | @EFL_LIBS@ \ | ||
903 | @evas_engine_wayland_egl_libs@ | 881 | @evas_engine_wayland_egl_libs@ |
904 | modules_evas_engines_wayland_egl_module_la_LDFLAGS = -no-undefined -module -avoid-version | 882 | modules_evas_engines_wayland_egl_module_la_LDFLAGS = -no-undefined -module -avoid-version |
905 | modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static | 883 | modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static |
@@ -915,7 +893,7 @@ modules/evas/engines/wayland_shm/evas_engine.h | |||
915 | if EVAS_STATIC_BUILD_WAYLAND_SHM | 893 | if EVAS_STATIC_BUILD_WAYLAND_SHM |
916 | lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES) | 894 | lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES) |
917 | lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@ | 895 | lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@ |
918 | lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_shm_libs@ | 896 | lib_evas_libevas_la_LIBADD += @evas_engine_wayland_shm_libs@ |
919 | else | 897 | else |
920 | enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) | 898 | enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) |
921 | enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la | 899 | enginewaylandshmpkg_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@ |
933 | modules_evas_engines_wayland_shm_module_la_LIBADD = \ | 910 | modules_evas_engines_wayland_shm_module_la_LIBADD = \ |
934 | lib/evas/libevas.la \ | 911 | lib/evas/libevas.la \ |
935 | @EFL_LIBS@ \ | ||
936 | @evas_engine_wayland_shm_libs@ | 912 | @evas_engine_wayland_shm_libs@ |
937 | modules_evas_engines_wayland_shm_module_la_LDFLAGS = -no-undefined -module -avoid-version | 913 | modules_evas_engines_wayland_shm_module_la_LDFLAGS = -no-undefined -module -avoid-version |
938 | modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static | 914 | modules_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@ |
963 | modules_evas_loaders_bmp_module_la_LIBADD = \ | 938 | modules_evas_loaders_bmp_module_la_LIBADD = \ |
964 | lib/evas/libevas.la \ | 939 | lib/evas/libevas.la \ |
965 | @EFL_LIBS@ \ | ||
966 | @evas_image_loader_bmp_libs@ | 940 | @evas_image_loader_bmp_libs@ |
967 | modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version | 941 | modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version |
968 | modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static | 942 | modules_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@ |
992 | modules_evas_loaders_eet_module_la_LIBADD = \ | 965 | modules_evas_loaders_eet_module_la_LIBADD = \ |
993 | lib/evas/libevas.la \ | 966 | lib/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@ |
1020 | modules_evas_loaders_generic_module_la_LIBADD = \ | 992 | modules_evas_loaders_generic_module_la_LIBADD = \ |
1021 | lib/evas/libevas.la \ | 993 | lib/evas/libevas.la \ |
1022 | @EFL_LIBS@ \ | ||
1023 | @evas_image_loader_generic_libs@ | 994 | @evas_image_loader_generic_libs@ |
1024 | modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version | 995 | modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1025 | modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static | 996 | modules_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@ |
1048 | modules_evas_loaders_gif_module_la_LIBADD = \ | 1018 | modules_evas_loaders_gif_module_la_LIBADD = \ |
1049 | lib/evas/libevas.la \ | 1019 | lib/evas/libevas.la \ |
1050 | @EFL_LIBS@ \ | ||
1051 | @evas_image_loader_gif_libs@ | 1020 | @evas_image_loader_gif_libs@ |
1052 | modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1021 | modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1053 | modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static | 1022 | modules_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@ |
1076 | modules_evas_loaders_ico_module_la_LIBADD = \ | 1044 | modules_evas_loaders_ico_module_la_LIBADD = \ |
1077 | lib/evas/libevas.la \ | 1045 | lib/evas/libevas.la \ |
1078 | @EFL_LIBS@ \ | ||
1079 | @evas_image_loader_ico_libs@ | 1046 | @evas_image_loader_ico_libs@ |
1080 | modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1047 | modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1081 | modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static | 1048 | modules_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@ |
1107 | modules_evas_loaders_jpeg_module_la_LIBADD = \ | 1073 | modules_evas_loaders_jpeg_module_la_LIBADD = \ |
1108 | lib/evas/libevas.la \ | 1074 | lib/evas/libevas.la \ |
1109 | @EFL_LIBS@ \ | ||
1110 | @evas_image_loader_jpeg_libs@ | 1075 | @evas_image_loader_jpeg_libs@ |
1111 | modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1076 | modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1112 | modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static | 1077 | modules_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@ |
1126 | modules_evas_savers_jpeg_module_la_LIBADD = \ | 1090 | modules_evas_savers_jpeg_module_la_LIBADD = \ |
1127 | lib/evas/libevas.la \ | 1091 | lib/evas/libevas.la \ |
1128 | @EFL_LIBS@ \ | ||
1129 | @evas_image_loader_jpeg_libs@ | 1092 | @evas_image_loader_jpeg_libs@ |
1130 | modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1093 | modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1131 | modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static | 1094 | modules_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@ |
1155 | modules_evas_loaders_pmaps_module_la_LIBADD = \ | 1117 | modules_evas_loaders_pmaps_module_la_LIBADD = \ |
1156 | lib/evas/libevas.la \ | 1118 | lib/evas/libevas.la \ |
1157 | @EFL_LIBS@ \ | ||
1158 | @evas_image_loader_pmaps_libs@ | 1119 | @evas_image_loader_pmaps_libs@ |
1159 | modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1120 | modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1160 | modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static | 1121 | modules_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@ |
1183 | modules_evas_loaders_png_module_la_LIBADD = \ | 1143 | modules_evas_loaders_png_module_la_LIBADD = \ |
1184 | lib/evas/libevas.la \ | 1144 | lib/evas/libevas.la \ |
1185 | @EFL_LIBS@ \ | ||
1186 | @evas_image_loader_png_libs@ | 1145 | @evas_image_loader_png_libs@ |
1187 | modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1146 | modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1188 | modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static | 1147 | modules_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@ |
1203 | modules_evas_savers_png_module_la_LIBADD = \ | 1161 | modules_evas_savers_png_module_la_LIBADD = \ |
1204 | lib/evas/libevas.la \ | 1162 | lib/evas/libevas.la \ |
1205 | @EFL_LIBS@ \ | ||
1206 | @evas_image_loader_png_libs@ | 1163 | @evas_image_loader_png_libs@ |
1207 | modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1164 | modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1208 | modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static | 1165 | modules_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@ |
1231 | modules_evas_loaders_psd_module_la_LIBADD = \ | 1187 | modules_evas_loaders_psd_module_la_LIBADD = \ |
1232 | lib/evas/libevas.la \ | 1188 | lib/evas/libevas.la \ |
1233 | @EFL_LIBS@ \ | ||
1234 | @evas_image_loader_psd_libs@ | 1189 | @evas_image_loader_psd_libs@ |
1235 | modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1190 | modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1236 | modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static | 1191 | modules_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@ |
1259 | modules_evas_loaders_svg_module_la_LIBADD = \ | 1213 | modules_evas_loaders_svg_module_la_LIBADD = \ |
1260 | lib/evas/libevas.la \ | 1214 | lib/evas/libevas.la \ |
1261 | @EFL_LIBS@ \ | ||
1262 | @evas_image_loader_svg_libs@ | 1215 | @evas_image_loader_svg_libs@ |
1263 | modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1216 | modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1264 | modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static | 1217 | modules_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@ |
1287 | modules_evas_loaders_tga_module_la_LIBADD = \ | 1239 | modules_evas_loaders_tga_module_la_LIBADD = \ |
1288 | lib/evas/libevas.la \ | 1240 | lib/evas/libevas.la \ |
1289 | @EFL_LIBS@ \ | ||
1290 | @evas_image_loader_tga_libs@ | 1241 | @evas_image_loader_tga_libs@ |
1291 | modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1242 | modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1292 | modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static | 1243 | modules_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@ |
1316 | modules_evas_loaders_tiff_module_la_LIBADD = \ | 1266 | modules_evas_loaders_tiff_module_la_LIBADD = \ |
1317 | lib/evas/libevas.la \ | 1267 | lib/evas/libevas.la \ |
1318 | @EFL_LIBS@ \ | ||
1319 | @evas_image_loader_tiff_libs@ | 1268 | @evas_image_loader_tiff_libs@ |
1320 | modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1269 | modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1321 | modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static | 1270 | modules_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@ |
1337 | modules_evas_savers_tiff_module_la_LIBADD = \ | 1285 | modules_evas_savers_tiff_module_la_LIBADD = \ |
1338 | lib/evas/libevas.la \ | 1286 | lib/evas/libevas.la \ |
1339 | @EFL_LIBS@ \ | ||
1340 | @evas_image_loader_tiff_libs@ | 1287 | @evas_image_loader_tiff_libs@ |
1341 | modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1288 | modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1342 | modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static | 1289 | modules_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@ |
1365 | modules_evas_loaders_wbmp_module_la_LIBADD = \ | 1311 | modules_evas_loaders_wbmp_module_la_LIBADD = \ |
1366 | lib/evas/libevas.la \ | 1312 | lib/evas/libevas.la \ |
1367 | @EFL_LIBS@ \ | ||
1368 | @evas_image_loader_wbmp_libs@ | 1313 | @evas_image_loader_wbmp_libs@ |
1369 | modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1314 | modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1370 | modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static | 1315 | modules_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@ |
1393 | modules_evas_loaders_webp_module_la_LIBADD = \ | 1337 | modules_evas_loaders_webp_module_la_LIBADD = \ |
1394 | lib/evas/libevas.la \ | 1338 | lib/evas/libevas.la \ |
1395 | @EFL_LIBS@ \ | ||
1396 | @evas_image_loader_webp_libs@ | 1339 | @evas_image_loader_webp_libs@ |
1397 | modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1340 | modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1398 | modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static | 1341 | modules_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@ |
1421 | modules_evas_loaders_xpm_module_la_LIBADD = \ | 1363 | modules_evas_loaders_xpm_module_la_LIBADD = \ |
1422 | lib/evas/libevas.la \ | 1364 | lib/evas/libevas.la \ |
1423 | @EFL_LIBS@ \ | ||
1424 | @evas_image_loader_xpm_libs@ | 1365 | @evas_image_loader_xpm_libs@ |
1425 | modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1366 | modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1426 | modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static | 1367 | modules_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 | ||
1472 | bin_evas_evas_cserve2_LDADD = \ | 1412 | bin_evas_evas_cserve2_LDADD = \ |
1473 | @EVAS_LIBS@ \ | 1413 | @EVAS_LDFLAGS@ \ |
1474 | @EFL_LIBS@ \ | ||
1475 | lib/eet/libeet.la \ | 1414 | lib/eet/libeet.la \ |
1476 | lib/eina/libeina.la \ | 1415 | lib/eina/libeina.la \ |
1477 | lib/evas/libevas.la | 1416 | lib/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 | ||
1492 | bin_evas_evas_cserve2_usage_SOURCES = \ | 1430 | bin_evas_evas_cserve2_usage_SOURCES = \ |
1493 | bin/evas/evas_cserve2_usage.c | 1431 | bin/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 | ||
1505 | bin_evas_evas_cserve2_usage_LDADD = \ | 1442 | bin_evas_evas_cserve2_usage_LDADD = \ |
1506 | lib/eina/libeina.la \ | 1443 | lib/eina/libeina.la \ |
1507 | @EFL_LIBS@ \ | 1444 | @EVAS_LDFLAGS@ |
1508 | @EVAS_LIBS@ | ||
1509 | 1445 | ||
1510 | bin_evas_evas_cserve2_debug_SOURCES = \ | 1446 | bin_evas_evas_cserve2_debug_SOURCES = \ |
1511 | bin/evas/evas_cserve2_debug.c | 1447 | bin/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 | ||
1523 | bin_evas_evas_cserve2_debug_LDADD = \ | 1458 | bin_evas_evas_cserve2_debug_LDADD = \ |
1524 | lib/eina/libeina.la \ | 1459 | lib/eina/libeina.la \ |
1525 | @EFL_LIBS@ \ | 1460 | @EVAS_LDFLAGS@ |
1526 | @EVAS_LIBS@ | ||
1527 | 1461 | ||
1528 | bin_evas_evas_cserve2_slave_SOURCES = \ | 1462 | bin_evas_evas_cserve2_slave_SOURCES = \ |
1529 | bin/evas/evas_cserve2_slave.c \ | 1463 | bin/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 | ||
1543 | bin_evas_evas_cserve2_slave_LDADD = \ | 1476 | bin_evas_evas_cserve2_slave_LDADD = \ |
1544 | lib/eina/libeina.la \ | 1477 | lib/eina/libeina.la \ |
1545 | @EFL_LIBS@ \ | 1478 | @EVAS_LDFLAGS@ |
1546 | @EVAS_LIBS@ | ||
1547 | 1479 | ||
1548 | bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic | 1480 | bin_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 | ||
1563 | bin_evas_dummy_slave_LDADD = \ | 1494 | bin_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@ |
1583 | bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ | 1512 | bin_evas_loaders_bmp_module_la_LIBADD = @EVAS_LIBS@ |
1584 | bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1513 | bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1585 | bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static | 1514 | bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static |
1586 | endif | 1515 | endif |
@@ -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@ |
1604 | bin_evas_loaders_eet_module_la_LIBADD = @EFL_LIBS@ \ | 1532 | bin_evas_loaders_eet_module_la_LIBADD = @EVAS_LIBS@ \ |
1605 | @evas_image_loader_eet_libs@ \ | 1533 | @evas_image_loader_eet_libs@ \ |
1606 | lib/eet/libeet.la | 1534 | lib/eet/libeet.la |
1607 | bin_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1535 | bin_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@ |
1626 | bin_evas_loaders_ico_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_ico_libs@ | 1553 | bin_evas_loaders_ico_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_ico_libs@ |
1627 | bin_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1554 | bin_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1628 | bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static | 1555 | bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static |
1629 | endif | 1556 | endif |
@@ -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@ |
1646 | bin_evas_loaders_jpeg_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_jpeg_libs@ | 1572 | bin_evas_loaders_jpeg_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_jpeg_libs@ |
1647 | bin_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1573 | bin_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1648 | bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static | 1574 | bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static |
1649 | endif | 1575 | endif |
@@ -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@ |
1666 | bin_evas_loaders_pmaps_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_pmaps_libs@ | 1591 | bin_evas_loaders_pmaps_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_pmaps_libs@ |
1667 | bin_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1592 | bin_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1668 | bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static | 1593 | bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static |
1669 | endif | 1594 | endif |
@@ -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@ |
1686 | bin_evas_loaders_png_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_png_libs@ | 1610 | bin_evas_loaders_png_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_png_libs@ |
1687 | bin_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1611 | bin_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1688 | bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static | 1612 | bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static |
1689 | endif | 1613 | endif |
@@ -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@ |
1706 | bin_evas_loaders_psd_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_psd_libs@ | 1629 | bin_evas_loaders_psd_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_psd_libs@ |
1707 | bin_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1630 | bin_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1708 | bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static | 1631 | bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static |
1709 | endif | 1632 | endif |
@@ -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@ |
1726 | bin_evas_loaders_tga_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tga_libs@ | 1648 | bin_evas_loaders_tga_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tga_libs@ |
1727 | bin_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1649 | bin_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1728 | bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static | 1650 | bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static |
1729 | endif | 1651 | endif |
@@ -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@ |
1746 | bin_evas_loaders_tiff_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tiff_libs@ | 1667 | bin_evas_loaders_tiff_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tiff_libs@ |
1747 | bin_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1668 | bin_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1748 | bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static | 1669 | bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static |
1749 | endif | 1670 | endif |
@@ -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@ |
1766 | bin_evas_loaders_wbmp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_wbmp_libs@ | 1686 | bin_evas_loaders_wbmp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_wbmp_libs@ |
1767 | bin_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1687 | bin_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1768 | bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static | 1688 | bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static |
1769 | endif | 1689 | endif |
@@ -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@ |
1786 | bin_evas_loaders_webp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_webp_libs@ | 1705 | bin_evas_loaders_webp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_webp_libs@ |
1787 | bin_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1706 | bin_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1788 | bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static | 1707 | bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static |
1789 | endif | 1708 | endif |
@@ -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@ |
1806 | bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@ | 1724 | bin_evas_loaders_xpm_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_xpm_libs@ |
1807 | bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version | 1725 | bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version |
1808 | bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static | 1726 | bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static |
1809 | endif | 1727 | endif |
@@ -1837,6 +1755,6 @@ tests_evas_evas_suite_LDADD = \ | |||
1837 | lib/evas/libevas.la \ | 1755 | lib/evas/libevas.la \ |
1838 | lib/eina/libeina.la \ | 1756 | lib/eina/libeina.la \ |
1839 | @CHECK_LIBS@ \ | 1757 | @CHECK_LIBS@ \ |
1840 | @EVAS_CFLAGS@ | 1758 | @EVAS_LDFLAGS@ |
1841 | 1759 | ||
1842 | endif | 1760 | endif |
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 | ||
158 | bin_evil_evil_suite_CPPFLAGS = \ | 158 | bin_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 | ||
163 | bin_evil_evil_suite_LDADD = \ | 163 | bin_evil_evil_suite_LDADD = \ |
164 | lib/evil/libevil.la \ | 164 | lib/evil/libevil.la \ |
165 | lib/evil/libdl.la \ | 165 | lib/evil/libdl.la \ |
166 | @EVIL_LDFLAGS@ \ | ||
166 | -lm | 167 | -lm |
167 | 168 | ||
168 | bin_evil_test_evil_SOURCES = bin/evil/test_evil.c | 169 | bin_evil_test_evil_SOURCES = bin/evil/test_evil.c |
169 | 170 | ||
170 | bin_evil_test_evil_LDADD = lib/evil/libevil.la | 171 | bin_evil_test_evil_LDADD = \ |
172 | lib/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 | |||
42 | libcity_la_SOURCES = city.cc | 42 | libcity_la_SOURCES = city.cc |
43 | 43 | ||
44 | nodist_EXTRA_eina_bench_SOURCES = dummy.cc | 44 | nodist_EXTRA_eina_bench_SOURCES = dummy.cc |
45 | eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/eina/libeina.la libcity.la @EINA_LIBS@ | 45 | eina_bench_LDADD = \ |
46 | $(top_builddir)/src/lib/eina/libeina.la \ | ||
47 | libcity.la \ | ||
48 | @GLIB_LIBS@ \ | ||
49 | @EINA_LDFLAGS@ | ||
46 | 50 | ||
47 | EXTRA_DIST = strlog | 51 | EXTRA_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 | |||
22 | eo_bench_LDADD = \ | 22 | eo_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 | ||
27 | clean-local: | 27 | clean-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 \ | |||
51 | ecore_time_functions_example \ | 51 | ecore_time_functions_example \ |
52 | ecore_timer_example | 52 | ecore_timer_example |
53 | 53 | ||
54 | ECORE_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 | |||
54 | if HAVE_ECORE_AUDIO | 60 | if HAVE_ECORE_AUDIO |
55 | EXTRA_PROGRAMS += \ | 61 | EXTRA_PROGRAMS += \ |
56 | ecore_audio_custom \ | 62 | ecore_audio_custom \ |
57 | ecore_audio_playback \ | 63 | ecore_audio_playback \ |
58 | ecore_audio_to_ogg | 64 | ecore_audio_to_ogg |
59 | 65 | ||
66 | ECORE_AUDIO_COMMON_LDADD = \ | ||
67 | $(top_builddir)/src/lib/ecore_audio/libecore_audio.la \ | ||
68 | $(ECORE_COMMON_LDADD) | ||
69 | |||
60 | ecore_audio_custom_SOURCES = ecore_audio_custom.c | 70 | ecore_audio_custom_SOURCES = ecore_audio_custom.c |
61 | ecore_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@ | 71 | ecore_audio_custom_LDADD = $(ECORE_AUDIO_COMMON_LDADD) |
62 | 72 | ||
63 | ecore_audio_playback_SOURCES = ecore_audio_playback.c | 73 | ecore_audio_playback_SOURCES = ecore_audio_playback.c |
64 | ecore_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@ | 74 | ecore_audio_playback_LDADD = $(ECORE_AUDIO_COMMON_LDADD) |
65 | 75 | ||
66 | ecore_audio_to_ogg_SOURCES = ecore_audio_to_ogg.c | 76 | ecore_audio_to_ogg_SOURCES = ecore_audio_to_ogg.c |
67 | ecore_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@ | 77 | ecore_audio_to_ogg_LDADD = $(ECORE_AUDIO_COMMON_LDADD) |
68 | endif | 78 | endif |
69 | 79 | ||
80 | ECORE_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 | |||
85 | ECORE_CON_COMMON_LDADD = \ | ||
86 | $(top_builddir)/src/lib/ecore_con/libecore_con.la \ | ||
87 | $(ECORE_COMMON_LDADD) | ||
88 | |||
70 | ecore_animator_example_SOURCES = ecore_animator_example.c | 89 | ecore_animator_example_SOURCES = ecore_animator_example.c |
71 | ecore_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@ | 90 | ecore_animator_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
72 | 91 | ||
73 | ecore_client_bench_SOURCES = ecore_client_bench.c | 92 | ecore_client_bench_SOURCES = ecore_client_bench.c |
74 | ecore_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@ | 93 | ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD) |
75 | 94 | ||
76 | ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c | 95 | ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c |
77 | ecore_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@ | 96 | ecore_con_client_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD) |
78 | 97 | ||
79 | ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c | 98 | ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c |
80 | ecore_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@ | 99 | ecore_con_lookup_example_LDADD = $(ECORE_CON_COMMON_LDADD) |
81 | 100 | ||
82 | ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c | 101 | ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c |
83 | ecore_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@ | 102 | ecore_con_server_http_example_LDADD = $(ECORE_CON_COMMON_LDADD) |
84 | 103 | ||
85 | ecore_con_server_simple_example_SOURCES = ecore_con_server_simple_example.c | 104 | ecore_con_server_simple_example_SOURCES = ecore_con_server_simple_example.c |
86 | ecore_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@ | 105 | ecore_con_server_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD) |
87 | 106 | ||
88 | ecore_con_url_cookies_example_SOURCES = ecore_con_url_cookies_example.c | 107 | ecore_con_url_cookies_example_SOURCES = ecore_con_url_cookies_example.c |
89 | ecore_con_url_cookies_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 108 | ecore_con_url_cookies_example_LDADD = $(ECORE_CON_COMMON_LDADD) |
90 | 109 | ||
91 | ecore_con_url_download_example_SOURCES = ecore_con_url_download_example.c | 110 | ecore_con_url_download_example_SOURCES = ecore_con_url_download_example.c |
92 | ecore_con_url_download_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 111 | ecore_con_url_download_example_LDADD = $(ECORE_CON_COMMON_LDADD) |
93 | 112 | ||
94 | ecore_con_url_headers_example_SOURCES = ecore_con_url_headers_example.c | 113 | ecore_con_url_headers_example_SOURCES = ecore_con_url_headers_example.c |
95 | ecore_con_url_headers_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 114 | ecore_con_url_headers_example_LDADD = $(ECORE_CON_COMMON_LDADD) |
96 | 115 | ||
97 | ecore_evas_basics_example_SOURCES = ecore_evas_basics_example.c | 116 | ecore_evas_basics_example_SOURCES = ecore_evas_basics_example.c |
98 | ecore_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@ | 117 | ecore_evas_basics_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
99 | 118 | ||
100 | ecore_evas_buffer_example_01_SOURCES = ecore_evas_buffer_example_01.c | 119 | ecore_evas_buffer_example_01_SOURCES = ecore_evas_buffer_example_01.c |
101 | ecore_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@ | 120 | ecore_evas_buffer_example_01_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
102 | 121 | ||
103 | ecore_evas_buffer_example_02_SOURCES = ecore_evas_buffer_example_02.c | 122 | ecore_evas_buffer_example_02_SOURCES = ecore_evas_buffer_example_02.c |
104 | ecore_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@ | 123 | ecore_evas_buffer_example_02_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
105 | 124 | ||
106 | ecore_evas_callbacks_SOURCES = ecore_evas_callbacks.c | 125 | ecore_evas_callbacks_SOURCES = ecore_evas_callbacks.c |
107 | ecore_evas_callbacks_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 126 | ecore_evas_callbacks_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
108 | 127 | ||
109 | ecore_evas_ews_example_SOURCES = ecore_evas_ews_example.c | 128 | ecore_evas_ews_example_SOURCES = ecore_evas_ews_example.c |
110 | ecore_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@ | 129 | ecore_evas_ews_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
111 | 130 | ||
112 | ecore_evas_object_example_SOURCES = ecore_evas_object_example.c | 131 | ecore_evas_object_example_SOURCES = ecore_evas_object_example.c |
113 | ecore_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@ | 132 | ecore_evas_object_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
114 | 133 | ||
115 | ecore_evas_window_sizes_example_SOURCES = ecore_evas_window_sizes_example.c | 134 | ecore_evas_window_sizes_example_SOURCES = ecore_evas_window_sizes_example.c |
116 | ecore_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@ | 135 | ecore_evas_window_sizes_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) |
117 | 136 | ||
118 | ecore_event_example_01_SOURCES = ecore_event_example_01.c | 137 | ecore_event_example_01_SOURCES = ecore_event_example_01.c |
119 | ecore_event_example_01_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 138 | ecore_event_example_01_LDADD = $(ECORE_COMMON_LDADD) |
120 | 139 | ||
121 | ecore_event_example_02_SOURCES = ecore_event_example_02.c | 140 | ecore_event_example_02_SOURCES = ecore_event_example_02.c |
122 | ecore_event_example_02_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 141 | ecore_event_example_02_LDADD = $(ECORE_COMMON_LDADD) |
123 | 142 | ||
124 | ecore_exe_example_SOURCES = ecore_exe_example.c | 143 | ecore_exe_example_SOURCES = ecore_exe_example.c |
125 | ecore_exe_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 144 | ecore_exe_example_LDADD = $(ECORE_COMMON_LDADD) |
126 | 145 | ||
127 | ecore_exe_example_child_SOURCES = ecore_exe_example_child.c | 146 | ecore_exe_example_child_SOURCES = ecore_exe_example_child.c |
128 | ecore_exe_example_child_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 147 | ecore_exe_example_child_LDADD = $(ECORE_COMMON_LDADD) |
129 | 148 | ||
130 | ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c | 149 | ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c |
131 | ecore_fd_handler_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 150 | ecore_fd_handler_example_LDADD = $(ECORE_COMMON_LDADD) |
132 | 151 | ||
133 | ecore_idler_example_SOURCES = ecore_idler_example.c | 152 | ecore_idler_example_SOURCES = ecore_idler_example.c |
134 | ecore_idler_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eo/libeo.la @ECORE_LIBS@ | 153 | ecore_idler_example_LDADD = $(ECORE_COMMON_LDADD) |
135 | 154 | ||
136 | ecore_job_example_SOURCES = ecore_job_example.c | 155 | ecore_job_example_SOURCES = ecore_job_example.c |
137 | ecore_job_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 156 | ecore_job_example_LDADD = $(ECORE_COMMON_LDADD) |
138 | 157 | ||
139 | ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c | 158 | ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c |
140 | ecore_pipe_simple_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 159 | ecore_pipe_simple_example_LDADD = $(ECORE_COMMON_LDADD) |
141 | 160 | ||
142 | ecore_poller_example_SOURCES = ecore_poller_example.c | 161 | ecore_poller_example_SOURCES = ecore_poller_example.c |
143 | ecore_poller_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eo/libeo.la @ECORE_LIBS@ | 162 | ecore_poller_example_LDADD = $(ECORE_COMMON_LDADD) |
144 | 163 | ||
145 | ecore_server_bench_SOURCES = ecore_server_bench.c | 164 | ecore_server_bench_SOURCES = ecore_server_bench.c |
146 | ecore_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@ | 165 | ecore_server_bench_LDADD = $(ECORE_CON_COMMON_LDADD) |
147 | 166 | ||
148 | ecore_thread_example_SOURCES = ecore_thread_example.c | 167 | ecore_thread_example_SOURCES = ecore_thread_example.c |
149 | ecore_thread_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ | 168 | ecore_thread_example_LDADD = $(ECORE_COMMON_LDADD) |
150 | 169 | ||
151 | ecore_time_functions_example_SOURCES = ecore_time_functions_example.c | 170 | ecore_time_functions_example_SOURCES = ecore_time_functions_example.c |
152 | ecore_time_functions_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 171 | ecore_time_functions_example_LDADD = $(ECORE_COMMON_LDADD) |
153 | 172 | ||
154 | ecore_timer_example_SOURCES = ecore_timer_example.c | 173 | ecore_timer_example_SOURCES = ecore_timer_example.c |
155 | ecore_timer_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ | 174 | ecore_timer_example_LDADD = $(ECORE_COMMON_LDADD) |
156 | 175 | ||
157 | SRCS = \ | 176 | SRCS = \ |
158 | ecore_animator_example \ | 177 | ecore_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 | ||
14 | EXAMPLES_LIBS = \ | 14 | EXAMPLES_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 | ||
19 | EXTRA_PROGRAMS = \ | 21 | EXTRA_PROGRAMS = \ |
20 | connman-list-services \ | 22 | connman-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 = \ | |||
10 | EXTRA_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 | 10 | EXTRA_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 | ||
12 | eet_basic_SOURCES = eet-basic.c | 12 | eet_basic_SOURCES = eet-basic.c |
13 | eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ | 13 | eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@ |
14 | 14 | ||
15 | eet_file_SOURCES = eet-file.c | 15 | eet_file_SOURCES = eet-file.c |
16 | eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ | 16 | eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@ |
17 | 17 | ||
18 | eet_data_simple_SOURCES = eet-data-simple.c | 18 | eet_data_simple_SOURCES = eet-data-simple.c |
19 | eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ | 19 | eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ |
20 | 20 | ||
21 | eet_data_nested_SOURCES = eet-data-nested.c | 21 | eet_data_nested_SOURCES = eet-data-nested.c |
22 | eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ | 22 | eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ |
23 | 23 | ||
24 | eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c | 24 | eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c |
25 | eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ | 25 | eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ |
26 | 26 | ||
27 | eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c | 27 | eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c |
28 | eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ | 28 | eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ |
29 | 29 | ||
30 | eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c | 30 | eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c |
31 | eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ | 31 | eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@ |
32 | 32 | ||
33 | SRCS = \ | 33 | SRCS = \ |
34 | eet-basic.c \ | 34 | eet-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 | ||
8 | LDADD = $(top_builddir)/src/lib/eina/libeina.la | 8 | LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LDFLAGS@ |
9 | 9 | ||
10 | SRCS = \ | 10 | SRCS = \ |
11 | eina_accessor_01.c \ | 11 | eina_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 | ||
103 | if BUILD_TILER_EXAMPLE | 103 | # TODO: use ecore_evas from single tree |
104 | AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ | 104 | #if BUILD_TILER_EXAMPLE |
105 | EXTRA_PROGRAMS += eina_tiler_01 | 105 | #AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ |
106 | eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LIBS@ | 106 | #EXTRA_PROGRAMS += eina_tiler_01 |
107 | endif | 107 | #eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LDFLAGS@ |
108 | #endif | ||
108 | 109 | ||
109 | examples: $(EXTRA_PROGRAMS) | 110 | examples: $(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 | |||
17 | eio_file_ls_SOURCES = eio_file_ls.c | 17 | eio_file_ls_SOURCES = eio_file_ls.c |
18 | eio_file_ls_LDADD = \ | 18 | eio_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 | ||
25 | SRCS = \ | 26 | SRCS = \ |
26 | eio_file_ls | 27 | eio_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 \ | |||
27 | isa/eo_isa_simple.c \ | 27 | isa/eo_isa_simple.c \ |
28 | isa/eo_isa_simple.h | 28 | isa/eo_isa_simple.h |
29 | 29 | ||
30 | eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ | 30 | eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ |
31 | 31 | ||
32 | if EO_BUILD_EXAMPLE_EVAS | 32 | if EO_BUILD_EXAMPLE_EVAS |
33 | 33 | ||
@@ -46,7 +46,7 @@ evas/evas_evas_obj.c \ | |||
46 | evas/evas_evas_obj.h \ | 46 | evas/evas_evas_obj.h \ |
47 | evas/evas_test.c | 47 | evas/evas_test.c |
48 | 48 | ||
49 | eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LIBS@ | 49 | eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LDFLAGS@ |
50 | 50 | ||
51 | endif | 51 | endif |
52 | 52 | ||
@@ -59,7 +59,7 @@ simple/simple_mixin.h \ | |||
59 | simple/simple_simple.c \ | 59 | simple/simple_simple.c \ |
60 | simple/simple_simple.h | 60 | simple/simple_simple.h |
61 | 61 | ||
62 | eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ | 62 | eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ |
63 | 63 | ||
64 | examples: $(EXTRA_PROGRAMS) | 64 | examples: $(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 | ||
20 | EXTRA_PROGRAMS += evas_buffer_simple | 20 | EXTRA_PROGRAMS += evas_buffer_simple |
21 | evas_buffer_simple_SOURCES = evas-buffer-simple.c | 21 | evas_buffer_simple_SOURCES = evas-buffer-simple.c |
22 | evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la | 22 | evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@ |
23 | endif | 23 | endif |
24 | 24 | ||
25 | EXTRA_PROGRAMS += evas_init_shutdown | 25 | EXTRA_PROGRAMS += evas_init_shutdown |
26 | evas_init_shutdown_SOURCES = evas-init-shutdown.c | 26 | evas_init_shutdown_SOURCES = evas-init-shutdown.c |
27 | evas_init_shutdown_LDADD = $(top_builddir)/src/lib/evas/libevas.la | 27 | evas_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@ |