From df1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Mon, 31 Dec 2012 00:46:14 +0000 Subject: [PATCH] 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 --- configure.ac | 17 +++-- m4/efl.m4 | 9 ++- m4/efl_compiler.m4 | 7 +- src/Makefile_EDBus.am | 4 +- src/Makefile_Ecore.am | 2 +- src/Makefile_Ecore_Audio.am | 1 - src/Makefile_Ecore_Cocoa.am | 2 +- src/Makefile_Ecore_Con.am | 1 - src/Makefile_Ecore_Evas.am | 18 ++--- src/Makefile_Ecore_FB.am | 1 - src/Makefile_Ecore_File.am | 2 +- src/Makefile_Ecore_Imf.am | 13 ++-- src/Makefile_Ecore_Input.am | 4 +- src/Makefile_Ecore_Ipc.am | 1 - src/Makefile_Ecore_Psl1ght.am | 2 +- src/Makefile_Ecore_SDL.am | 1 - src/Makefile_Ecore_Wayland.am | 1 - src/Makefile_Ecore_Win32.am | 2 +- src/Makefile_Ecore_WinCE.am | 2 +- src/Makefile_Ecore_X.am | 1 - src/Makefile_Eet.am | 6 +- src/Makefile_Efreet.am | 35 ++++++---- src/Makefile_Eina.am | 20 +++--- src/Makefile_Eio.am | 2 +- src/Makefile_Embryo.am | 3 +- src/Makefile_Eo.am | 17 +++-- src/Makefile_Evas.am | 146 +++++++++------------------------------- src/Makefile_Evil.am | 7 +- src/benchmarks/eina/Makefile.am | 6 +- src/benchmarks/eo/Makefile.am | 2 +- src/examples/ecore/Makefile.am | 83 ++++++++++++++--------- src/examples/edbus/Makefile.am | 4 +- src/examples/eet/Makefile.am | 14 ++-- src/examples/eina/Makefile.am | 13 ++-- src/examples/eio/Makefile.am | 3 +- src/examples/eo/Makefile.am | 6 +- src/examples/evas/Makefile.am | 4 +- 37 files changed, 209 insertions(+), 253 deletions(-) diff --git a/configure.ac b/configure.ac index 3c41884..386a24d 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,11 @@ platform_cflags_evil="" platform_cflags_escape="" platform_cflags_exotic="" +requirements_pc_efl="" +requirements_pc_deps_efl="" +requirements_libs_efl="" +requirements_cflags_efl="" + requirements_pc_crypto="" requirements_pc_deps_crypto="" requirements_libs_crypto="" @@ -441,8 +446,8 @@ esac EFL_ATTRIBUTE_VECTOR EFL_ATTRIBUTE_ALWAYS_INLINE -EFL_LIBS="" -AC_SUBST([EFL_LIBS]) +EFL_LIBS="${EFL_LIBS}" +EFL_CFLAGS="${EFL_CFLAGS}" ## CPU architecture specific assembly @@ -826,6 +831,9 @@ EINA_CONFIG([ENABLE_LOG], [test "x${enable_log}" = "xyes"]) EFL_CHECK_THREADS +EFL_ADD_LIBS([EINA], [${EFL_PTHREAD_LIBS}]) +EFL_ADD_CFLAGS([EINA], [${EFL_PTHREAD_CFLAGS}]) + EINA_CONFIG([HAVE_PTHREAD_BARRIER], [test "x${efl_have_pthread_barrier}" = "xyes"]) EINA_CONFIG([HAVE_PTHREAD_AFFINITY], [test "x${efl_have_setaffinity}" = "xyes"]) EINA_CONFIG([HAVE_DEBUG_THREADS], [test "$want_debug_threads" = "yes"]) @@ -3197,9 +3205,6 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eina]) EFL_LIB_END([Efreet]) #### End of Efreet -EFL_LIBS="${EFL_LIBS} ${requirements_libs_efl}" - - AC_CONFIG_FILES([ Makefile data/Makefile @@ -3465,7 +3470,7 @@ echo " Ecore_Evas...................: $have_ecore_evas" echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" #fi echo -echo "Tests..................: ${with_tests}" +echo "Tests..................: ${build_tests}" echo "Examples...............: make examples" echo " installation.......: make install-examples" diff --git a/m4/efl.m4 b/m4/efl.m4 index 426e3fc..64a5ec7 100644 --- a/m4/efl.m4 +++ b/m4/efl.m4 @@ -138,12 +138,14 @@ requirements_pc_[]m4_defn([DOWN])="" requirements_pc_deps_[]m4_defn([DOWN])="" m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS}" +m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS}" m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS}" AC_SUBST([requirements_libs_]m4_defn([DOWN])) AC_SUBST([requirements_cflags_]m4_defn([DOWN])) AC_SUBST([requirements_pc_]m4_defn([DOWN])) AC_SUBST(m4_defn([UP])[_LIBS]) +AC_SUBST(m4_defn([UP])[_LDFLAGS]) AC_SUBST(m4_defn([UP])[_CFLAGS]) AC_MSG_NOTICE([Start $1 checks]) @@ -159,8 +161,11 @@ AC_DEFUN([EFL_LIB_END], m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl -m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${requirements_libs_[]m4_defn([DOWN])}" -m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${requirements_cflags_[]m4_defn([DOWN])}" +m4_defn([UP])_LDFLAGS="${m4_defn([UP])_LDFLAGS} ${EFL_LDFLAGS}" +m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} ${m4_defn([UP])_LDFLAGS} ${EFL_LIBS} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} " +m4_defn([UP])_CFLAGS="${m4_defn([UP])_CFLAGS} ${EFL_CFLAGS} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl}" +requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" +requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" AC_MSG_NOTICE([Finished $1 checks]) m4_popdef([UP]) diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4 index 98dc0a1..6b98390 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]))]) dnl Macro that checks for a linker flag availability dnl dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]]) -dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value) +dnl AC_SUBST : EFL_LDFLAGS (EFL being replaced by its value) AC_DEFUN([EFL_CHECK_LINKER_FLAG], [ @@ -79,10 +79,9 @@ LDFLAGS="${LDFLAGS_save}" AC_LANG_POP([C]) if test "x${have_flag}" = "xyes" ; then - UPEFL[_LIBS]="${UPEFL[_LIBS]} [$2]" + UPEFL[_LDFLAGS]="${UPEFL[_LDFLAGS]} [$2]" fi -AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2]) -AC_SUBST(UPEFL[_LIBS]) +AC_SUBST(UPEFL[_LDFLAGS]) m4_popdef([UP]) m4_popdef([UPEFL]) diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am index 395a3ca..89db001 100644 --- a/src/Makefile_EDBus.am +++ b/src/Makefile_EDBus.am @@ -40,7 +40,6 @@ lib_edbus_libedbus2_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/edbus \ -DEFL_EDBUS_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EDBUS_CFLAGS@ @@ -74,7 +73,7 @@ bin_edbus_edbus_codegen_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@EFL_CFLAGS@ \ +@EDBUS_CFLAGS@ \ @EFL_COV_CFLAGS@ bin_edbus_edbus_codegen_LDADD = \ @@ -82,4 +81,5 @@ lib/eina/libeina.la \ lib/eo/libeo.la \ lib/ecore/libecore.la \ lib/edbus/libedbus2.la \ +@EDBUS_LDFLAGS@ \ @EFL_COV_LIBS@ diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 365c9fd..1b0a13d 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -53,7 +53,6 @@ lib_ecore_libecore_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/ecore \ -DEFL_ECORE_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_CFLAGS@ \ @USE_EVIL_CFLAGS@ \ @@ -100,6 +99,7 @@ lib/ecore_con/libecore_con.la \ lib/ecore_file/libecore_file.la \ lib/ecore/libecore.la \ lib/eina/libeina.la \ +@ECORE_LDFLAGS@ \ @CHECK_LIBS@ if HAVE_ECORE_AUDIO diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index 67c8054..dc6140e 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -23,7 +23,6 @@ lib_ecore_audio_libecore_audio_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eet \ -I$(top_srcdir)/src/lib/ecore \ -DEFL_ECORE_AUDIO_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_AUDIO_CFLAGS@ diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am index ff5e0e8..d47a8aa 100644 --- a/src/Makefile_Ecore_Cocoa.am +++ b/src/Makefile_Ecore_Cocoa.am @@ -20,7 +20,7 @@ lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_cocoa \ -@EFL_CFLAGS@ \ +@ECORE_COCOA_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_cocoa_libecore_cocoa_la_LIBADD = \ diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index 584e932..dbbfa1d 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -41,7 +41,6 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_con \ -DEFL_ECORE_CON_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_CON_CFLAGS@ \ @USE_EVIL_CFLAGS@ diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am index 658c45e..ab31737 100644 --- a/src/Makefile_Ecore_Evas.am +++ b/src/Makefile_Ecore_Evas.am @@ -29,7 +29,7 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ -I$(top_srcdir)/src/modules/evas/engines/buffer \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DEFL_ECORE_EVAS_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_EVAS_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @USE_EVIL_CFLAGS@ @@ -58,7 +58,7 @@ ecoreevasenginebufferpkgdir = $(libdir)/ecore_evas/engines/buffer/$(MODULE_ARCH) ecoreevasenginebufferpkg_LTLIBRARIES = modules/ecore_evas/engines/buffer/module.la modules_ecore_evas_engines_buffer_module_la_SOURCES = $(BUFFERSOURCES) modules_ecore_evas_engines_buffer_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) -modules_ecore_evas_engines_buffer_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la @EFL_LIBS@ +modules_ecore_evas_engines_buffer_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -75,7 +75,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/modules/evas/engines/software_x11 \ -I$(top_srcdir)/src/modules/evas/engines/gl_x11 modules_ecore_evas_engines_x_module_la_LIBADD = \ -lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ +lib/ecore_evas/libecore_evas.la \ lib/ecore_x/libecore_x.la modules_ecore_evas_engines_x_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -91,7 +91,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_cocoa \ -I$(top_srcdir)/src/modules/evas/engines/gl_cocoa modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ -lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ +lib/ecore_evas/libecore_evas.la \ lib/ecore_cocoa/libecore_cocoa.la modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -107,7 +107,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_fb \ -I$(top_srcdir)/src/modules/evas/engines/fb modules_ecore_evas_engines_fb_module_la_LIBADD = \ -lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ +lib/ecore_evas/libecore_evas.la \ lib/ecore_fb/libecore_fb.la modules_ecore_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -123,7 +123,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_psl1ght \ -I$(top_srcdir)/src/modules/evas/engines/psl1ght modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ -lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ +lib/ecore_evas/libecore_evas.la \ lib/ecore_psl1ght/libecore_psl1ght.la modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -145,7 +145,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ @ECORE_WAYLAND_CFLAGS@ modules_ecore_evas_engines_wayland_module_la_LIBADD = \ -lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ +lib/ecore_evas/libecore_evas.la \ lib/ecore_wayland/libecore_wayland.la modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -162,7 +162,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_sdl \ -I$(top_srcdir)/src/modules/evas/engines/gl_sdl modules_ecore_evas_engines_sdl_module_la_LIBADD = \ -lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ +lib/ecore_evas/libecore_evas.la \ lib/ecore_sdl/libecore_sdl.la modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -180,7 +180,7 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ -I$(top_srcdir)/src/modules/evas/engines/software_gdi modules_ecore_evas_engines_win32_module_la_LIBADD = \ -lib/ecore/libecore_evas.la @EFL_LIBS@ \ +lib/ecore/libecore_evas.la \ lib/ecore_win32/libecore_win32.la modules_ecore_evas_engines_win32_module_la_LDFLAGS = -no-undefined -module -avoid-version 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 326f97e..f7e9629 100644 --- a/src/Makefile_Ecore_FB.am +++ b/src/Makefile_Ecore_FB.am @@ -25,7 +25,6 @@ lib_ecore_fb_libecore_fb_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_fb \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_FB_CFLAGS@ diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am index 7c9ffa7..8dfa6f3 100644 --- a/src/Makefile_Ecore_File.am +++ b/src/Makefile_Ecore_File.am @@ -35,7 +35,7 @@ lib_ecore_file_libecore_file_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_con \ -I$(top_srcdir)/src/lib/ecore_file \ -DEFL_ECORE_FILE_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_FILE_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_file_libecore_file_la_LIBADD = \ diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am index 9aa7529..da4d297 100644 --- a/src/Makefile_Ecore_Imf.am +++ b/src/Makefile_Ecore_Imf.am @@ -23,7 +23,7 @@ lib_ecore_imf_libecore_imf_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_imf \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DEFL_ECORE_IMF_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_IMF_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_imf_libecore_imf_la_LIBADD = \ @@ -49,7 +49,7 @@ lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_imf_evas \ -DEFL_ECORE_IMF_EVAS_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_IMF_EVAS_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_imf_libecore_imf_evas_la_LIBADD = \ @@ -84,8 +84,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/lib/evas \ --DEFL_ECORE_IMF_EVAS_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_IMF_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @IBUS_CFLAGS@ modules_ecore_immodules_ibus_ibus_la_LIBADD = \ @@ -120,8 +119,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/lib/evas \ --DEFL_ECORE_IMF_EVAS_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_IMF_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @SCIM_CFLAGS@ modules_ecore_immodules_scim_scim_la_LIBADD = \ @@ -152,8 +150,7 @@ modules_ecore_immodules_xim_xim_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_x \ -I$(top_builddir)/src/lib/ecore_x \ -I$(top_srcdir)/src/lib/ecore_imf \ --DEFL_ECORE_IMF_EVAS_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_IMF_CFLAGS@ \ @EFL_COV_CFLAGS@ modules_ecore_immodules_xim_xim_la_LIBADD = \ lib/ecore_imf/libecore_imf.la \ diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am index 80bbffa..765616a 100644 --- a/src/Makefile_Ecore_Input.am +++ b/src/Makefile_Ecore_Input.am @@ -22,7 +22,7 @@ lib_ecore_input_libecore_input_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -DEFL_ECORE_INPUT_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_INPUT_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_input_libecore_input_la_LIBADD = \ @@ -51,7 +51,7 @@ lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_input_evas \ -DEFL_ECORE_INPUT_EVAS_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_INPUT_EVAS_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_input_libecore_input_evas_la_LIBADD = \ diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am index 8fc822a..13a7efb 100644 --- a/src/Makefile_Ecore_Ipc.am +++ b/src/Makefile_Ecore_Ipc.am @@ -19,7 +19,6 @@ lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_con \ -I$(top_srcdir)/src/lib/ecore_ipc \ -DEFL_ECORE_IPC_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_IPC_CFLAGS@ diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am index f41c429..e22bfa4 100644 --- a/src/Makefile_Ecore_Psl1ght.am +++ b/src/Makefile_Ecore_Psl1ght.am @@ -22,7 +22,7 @@ lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_psl1ght \ -DEFL_ECORE_PSL1GHT_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_PSL1GHT_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = \ diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am index ea10516..1970ea6 100644 --- a/src/Makefile_Ecore_SDL.am +++ b/src/Makefile_Ecore_SDL.am @@ -20,7 +20,6 @@ lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_sdl \ -DEFL_ECORE_SDL_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_SDL_CFLAGS@ diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am index 1fc16f2..46e2d8b 100644 --- a/src/Makefile_Ecore_Wayland.am +++ b/src/Makefile_Ecore_Wayland.am @@ -22,7 +22,6 @@ lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_wayland \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_WAYLAND_CFLAGS@ diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am index 4fc87d7..a379ba6 100644 --- a/src/Makefile_Ecore_Win32.am +++ b/src/Makefile_Ecore_Win32.am @@ -32,7 +32,7 @@ lib_ecore_win32_libecore_win32_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_win32 \ -DEFL_ECORE_WIN32_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_WIN32_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_win32_libecore_win32_la_LIBADD = \ diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am index 62f5058..849273d 100644 --- a/src/Makefile_Ecore_WinCE.am +++ b/src/Makefile_Ecore_WinCE.am @@ -22,7 +22,7 @@ lib_ecore_wince_libecore_wince_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_wince \ -DEFL_ECORE_WINCE_BUILD \ -@EFL_CFLAGS@ \ +@ECORE_WINCE_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_ecore_wince_libecore_wince_la_LIBADD = \ diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am index eeb70b1..4628f17 100644 --- a/src/Makefile_Ecore_X.am +++ b/src/Makefile_Ecore_X.am @@ -104,7 +104,6 @@ lib_ecore_x_libecore_x_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_x \ -I$(top_builddir)/src/lib/ecore_x \ -DEFL_ECORE_X_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_X_CFLAGS@ diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am index b860da7..7c60464 100644 --- a/src/Makefile_Eet.am +++ b/src/Makefile_Eet.am @@ -31,7 +31,6 @@ lib_eet_libeet_la_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ -DEFL_EET_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EET_CFLAGS@ \ @USE_EVIL_CFLAGS@ @@ -59,7 +58,6 @@ bin_eet_eet_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EET_CFLAGS@ \ @USE_EVIL_CFLAGS@ @@ -68,7 +66,7 @@ bin_eet_eet_LDADD = \ lib/eet/libeet.la \ lib/eina/libeina.la \ @USE_EVIL_LIBS@ \ -@EET_LIBS@ \ +@EET_LDFLAGS@ \ @EFL_COV_LIBS@ ### Unit tests @@ -95,7 +93,7 @@ tests_eet_eet_suite_LDADD = \ lib/eet/libeet.la \ lib/eina/libeina.la \ @CHECK_LIBS@ \ -@EET_LIBS@ +@EET_LDFLAGS@ endif diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am index ed82767..1822713 100644 --- a/src/Makefile_Efreet.am +++ b/src/Makefile_Efreet.am @@ -25,7 +25,6 @@ EFREET_COMMON_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)\" \ -DLOCALE_DIR=\"@LOCALE_DIR@\" \ -DEFL_EFREET_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EFREET_CFLAGS@ \ @USE_EVIL_CFLAGS@ @@ -43,6 +42,18 @@ lib/edbus/libedbus2.la \ EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la +EFREET_COMMON_USER_LDADD = \ +lib/efreet/libefreet.la \ +lib/eina/libeina.la \ +lib/eo/libeo.la \ +lib/ecore/libecore.la \ +lib/ecore_file/libecore_file.la \ +lib/eet/libeet.la \ +lib/edbus/libedbus2.la \ +@USE_EVIL_LIBS@ \ +@EFREET_LDFLAGS@ \ +@EFL_COV_LIBS@ + installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ dist_installed_efreetmainheaders_DATA = \ lib/efreet/Efreet.h \ @@ -104,7 +115,7 @@ bin/efreet/efreetd_cache.h \ bin/efreet/efreetd_cache.c bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LIBADD) +bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD) efreetinternal_bindir=$(libdir)/efreet efreetinternal_bin_PROGRAMS = \ @@ -112,12 +123,12 @@ bin/efreet/efreet_desktop_cache_create \ bin/efreet/efreet_icon_cache_create bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) +bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) bin_efreet_efreet_desktop_cache_create_SOURCES = \ bin/efreet/efreet_desktop_cache_create.c bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) +bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) bin_efreet_efreet_icon_cache_create_SOURCES = \ bin/efreet/efreet_icon_cache_create.c @@ -138,7 +149,7 @@ tests/efreet/compare/efreet_menu_alloc # efreet_test tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) tests_efreet_efreet_test_LDADD = \ -$(EFREET_COMMON_USER_LIBADD) \ +$(EFREET_COMMON_USER_LDADD) \ lib/efreet/libefreet_mime.la tests_efreet_efreet_test_SOURCES = \ @@ -154,38 +165,38 @@ tests/efreet/main.c # efreet_spec_test tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LIBADD) +tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD) tests_efreet_efreet_spec_test_SOURCES = \ tests/efreet/efreet_spec_test.c # efreet_cache_test tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LIBADD) +tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD) tests_efreet_efreet_cache_test_SOURCES = \ tests/efreet/ef_cache.c # efreet_icon_cache_dump tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LIBADD) +tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD) tests_efreet_efreet_icon_cache_dump_SOURCES = \ tests/efreet/efreet_icon_cache_dump.c # efreet_user_dir tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LIBADD) +tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD) tests_efreet_efreet_user_dir_SOURCES = \ tests/efreet/efreet_user_dir.c # efreet_alloc tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) +tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) tests_efreet_compare_efreet_alloc_SOURCES = \ tests/efreet/compare/efreet_alloc.c \ tests/efreet/compare/comp.h # efreet_menu_alloc tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) -tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) +tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) tests_efreet_compare_efreet_menu_alloc_SOURCES = \ tests/efreet/compare/efreet_menu_alloc.c \ tests/efreet/compare/comp.h @@ -215,6 +226,6 @@ tests/efreet/efreet_test_efreet.c \ tests/efreet/efreet_test_efreet_cache.c tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ -tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LIBADD) @CHECK_LIBS@ +tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@ endif diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am index d457f18..ed8c80e 100644 --- a/src/Makefile_Eina.am +++ b/src/Makefile_Eina.am @@ -161,10 +161,10 @@ chained_pool_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \ -DEFL_EINA_BUILD -chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ +chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c chained_pool_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ -chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ +chained_pool_module_la_LDFLAGS = -no-undefined -module -avoid-version chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -178,10 +178,10 @@ one_big_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \ -DEFL_EINA_BUILD -one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @VALGRIND_CFLAGS@ +one_big_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c one_big_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ -one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version @EFL_PTHREAD_LIBS@ +one_big_module_la_LDFLAGS = -no-undefined -module -avoid-version one_big_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -209,14 +209,16 @@ lib_eina_libeina_la_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DEFL_EINA_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ -@EFL_PTHREAD_CFLAGS@ \ @EINA_CFLAGS@ \ @VALGRIND_CFLAGS@ \ @USE_EVIL_CFLAGS@ -lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ +lib_eina_libeina_la_LIBADD = \ +@EINA_LIBS@ \ +@EFL_COV_LIBS@ \ +@USE_EVIL_LIBS@ \ +@DL_LIBS@ lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Script @@ -279,7 +281,7 @@ tests_eina_eina_suite_CPPFLAGS = \ tests_eina_eina_suite_LDADD = \ lib/eina/libeina.la \ @CHECK_LIBS@ \ -@EINA_LIBS@ +@EINA_LDFLAGS@ tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx @@ -291,7 +293,7 @@ tests_eina_cxx_compile_test_CPPFLAGS = \ tests_eina_cxx_compile_test_LDADD = \ lib/eina/libeina.la \ -@EINA_LIBS@ +@EINA_LDFLAGS@ EXTRA_LTLIBRARIES = tests/eina/module_dummy.la diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am index 43cfe1c..40816e6 100644 --- a/src/Makefile_Eio.am +++ b/src/Makefile_Eio.am @@ -34,7 +34,7 @@ lib_eio_libeio_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/eio \ -DEFL_EIO_BUILD \ -@EFL_CFLAGS@ \ +@EIO_CFLAGS@ \ @EFL_COV_CFLAGS@ lib_eio_libeio_la_LIBADD = \ diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am index d8452f7..f5bb307 100644 --- a/src/Makefile_Embryo.am +++ b/src/Makefile_Embryo.am @@ -24,7 +24,6 @@ lib_embryo_libembryo_la_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ -DEFL_EMBRYO_BUILD \ @EMBRYO_CFLAGS@ \ -@EFL_CFLAGS@ \ @USE_EVIL_CFLAGS@ lib_embryo_libembryo_la_LIBADD = \ @@ -61,13 +60,13 @@ bin_embryo_embryo_cc_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ -@EFL_CFLAGS@ \ @EMBRYO_CFLAGS@ \ @USE_EVIL_CFLAGS@ bin_embryo_embryo_cc_LDADD = \ lib/embryo/libembryo.la \ lib/eina/libeina.la \ +@EMBRYO_LDFLAGS@ \ @USE_EVIL_LIBS@ EXTRA_DIST += \ diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index aa0fad6..9c5795d 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -17,7 +17,6 @@ lib_eo_libeo_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eo \ -DNDEBUG \ -DEFL_EO_BUILD \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EO_CFLAGS@ \ @USE_EVIL_CFLAGS@ @@ -57,7 +56,7 @@ tests_eo_test_access_CPPFLAGS = \ tests_eo_test_access_LDADD = \ lib/eo/libeo.la \ -@EO_LIBS@ +@EO_LDFLAGS@ tests_eo_test_composite_objects_SOURCES = \ tests/eo/composite_objects/composite_objects_comp.c \ @@ -75,7 +74,7 @@ tests_eo_test_composite_objects_CPPFLAGS = \ tests_eo_test_composite_objects_LDADD = \ lib/eo/libeo.la \ -@EO_LIBS@ +@EO_LDFLAGS@ tests_eo_test_constructors_SOURCES = \ tests/eo/constructors/constructors_main.c \ @@ -105,7 +104,7 @@ tests_eo_test_constructors_CPPFLAGS = \ tests_eo_test_constructors_LDADD = \ lib/eo/libeo.la \ -@EO_LIBS@ +@EO_LDFLAGS@ if EFL_ENABLE_TESTS @@ -129,7 +128,7 @@ tests_eo_eo_suite_CPPFLAGS = \ tests_eo_eo_suite_LDADD = \ lib/eo/libeo.la \ @CHECK_LIBS@ \ -@EO_LIBS@ +@EO_LDFLAGS@ endif @@ -153,7 +152,7 @@ tests_eo_test_function_overrides_CPPFLAGS = \ tests_eo_test_function_overrides_LDADD = \ lib/eo/libeo.la \ -@EO_LIBS@ +@EO_LDFLAGS@ tests_eo_test_interface_SOURCES = \ tests/eo/interface/interface_interface.c \ @@ -173,7 +172,7 @@ tests_eo_test_interface_CPPFLAGS = \ tests_eo_test_interface_LDADD = \ lib/eo/libeo.la \ -@EO_LIBS@ +@EO_LDFLAGS@ tests_eo_test_mixin_SOURCES = \ tests/eo/mixin/mixin_inherit.c \ @@ -199,7 +198,7 @@ tests_eo_test_mixin_CPPFLAGS = \ tests_eo_test_mixin_LDADD = \ lib/eo/libeo.la \ -@EO_LIBS@ +@EO_LDFLAGS@ tests_eo_test_signals_SOURCES = \ tests/eo/signals/signals_main.c \ @@ -215,6 +214,6 @@ tests_eo_test_signals_CPPFLAGS = \ tests_eo_test_signals_LDADD = \ lib/eo/libeo.la \ -@EO_LIBS@ +@EO_LDFLAGS@ EXTRA_DIST += tests/eo/eunit_tests.h diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 02d8a39..c50321b 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -204,7 +204,6 @@ lib_evas_libevas_la_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \ -@EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EVAS_CFLAGS@ \ @VALGRIND_CFLAGS@ \ @@ -377,9 +376,8 @@ modules_evas_engines_software_generic_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la +modules_evas_engines_software_generic_module_la_LIBADD = lib/evas/libevas.la modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -404,10 +402,9 @@ modules_evas_engines_buffer_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ \ @USE_EVIL_CFLAGS@ -modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ +modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -437,11 +434,9 @@ modules_evas_engines_fb_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ @evas_engine_fb_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_fb_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_engine_fb_libs@ modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version 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 = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ lib/eet/libeet.la \ -lib/evas/libevas.la \ -@EFL_LIBS@ +lib/evas/libevas.la modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -592,7 +585,6 @@ modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_cocoa_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_gl_cocoa_module_la_LIBADD = if ! EVAS_STATIC_BUILD_GL_COMMON @@ -602,7 +594,6 @@ endif modules_evas_engines_gl_cocoa_module_la_LIBADD += \ lib/eet/libeet.la \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_engine_gl_cocoa_libs@ modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -635,7 +626,6 @@ modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_sdl_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_gl_sdl_module_la_LIBADD = if ! EVAS_STATIC_BUILD_GL_COMMON @@ -644,7 +634,6 @@ modules/evas/engines/gl_common/libevas_engine_gl_common.la endif modules_evas_engines_gl_sdl_module_la_LIBADD += \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_engine_gl_sdl_libs@ modules_evas_engines_gl_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -678,7 +667,6 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_xlib_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_gl_x11_module_la_LIBADD = if ! EVAS_STATIC_BUILD_GL_COMMON @@ -688,7 +676,6 @@ endif modules_evas_engines_gl_x11_module_la_LIBADD += \ lib/eet/libeet.la \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_engine_gl_xlib_libs@ modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -718,12 +705,10 @@ modules_evas_engines_psl1ght_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ @evas_engine_psl1ght_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_psl1ght_module_la_LIBADD = \ lib/evas/libevas.la \ -@evas_engine_psl1ght_libs@ \ -@EFL_LIBS@ +@evas_engine_psl1ght_libs@ modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -755,14 +740,12 @@ modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @evas_engine_software_ddraw_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ \ @USE_EVIL_CFLAGS@ modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions modules_evas_engines_software_ddraw_module_la_LIBADD = \ lib/evas/libevas.la \ -@evas_engine_software_ddraw_libs@ \ -@EFL_LIBS@ +@evas_engine_software_ddraw_libs@ modules_evas_engines_software_ddraw_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -793,13 +776,11 @@ modules_evas_engines_software_gdi_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @evas_engine_software_gdi_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ \ @USE_EVIL_CFLAGS@ modules_evas_engines_software_gdi_module_la_LIBADD = \ lib/evas/libevas.la \ -@evas_engine_software_gdi_libs@ \ -@EFL_LIBS@ +@evas_engine_software_gdi_libs@ modules_evas_engines_software_gdi_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -819,7 +800,6 @@ SOFTWARE_X11_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ SOFTWARE_X11_LIBADD = if BUILD_ENGINE_SOFTWARE_XLIB @@ -861,7 +841,7 @@ enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_A enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES) modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS) -modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ $(SOFTWARE_X11_LIBADD) +modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la $(SOFTWARE_X11_LIBADD) modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -878,7 +858,7 @@ lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES) lib_evas_libevas_la_CPPFLAGS += \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ @evas_engine_wayland_egl_cflags@ -lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_egl_libs@ +lib_evas_libevas_la_LIBADD += @evas_engine_wayland_egl_libs@ else enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la @@ -893,13 +873,11 @@ modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ @evas_engine_wayland_egl_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_wayland_egl_module_la_LIBADD = \ modules/evas/engines/gl_common/libevas_engine_gl_common.la \ lib/eet/libeet.la \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_engine_wayland_egl_libs@ modules_evas_engines_wayland_egl_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -915,7 +893,7 @@ modules/evas/engines/wayland_shm/evas_engine.h if EVAS_STATIC_BUILD_WAYLAND_SHM lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES) lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@ -lib_evas_libevas_la_LIBADD += @EFL_LIBS@ @evas_engine_wayland_shm_libs@ +lib_evas_libevas_la_LIBADD += @evas_engine_wayland_shm_libs@ else enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la @@ -928,11 +906,9 @@ modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ @evas_engine_wayland_shm_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_wayland_shm_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_engine_wayland_shm_libs@ modules_evas_engines_wayland_shm_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -958,11 +934,9 @@ modules_evas_loaders_bmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_bmp_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_bmp_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_bmp_libs@ modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -987,7 +961,6 @@ modules_evas_loaders_eet_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_eet_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_eet_module_la_LIBADD = \ lib/evas/libevas.la \ @@ -1015,11 +988,9 @@ modules_evas_loaders_generic_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_generic_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_generic_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_generic_libs@ modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1043,11 +1014,9 @@ modules_evas_loaders_gif_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_gif_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_gif_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_gif_libs@ modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1071,11 +1040,9 @@ modules_evas_loaders_ico_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_ico_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_ico_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_ico_libs@ modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1102,11 +1069,9 @@ modules_evas_loaders_jpeg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_jpeg_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_jpeg_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_jpeg_libs@ modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1121,11 +1086,9 @@ modules_evas_savers_jpeg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ @evas_image_loader_jpeg_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_savers_jpeg_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_jpeg_libs@ modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1150,11 +1113,9 @@ modules_evas_loaders_pmaps_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_pmaps_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_pmaps_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_pmaps_libs@ modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1178,11 +1139,9 @@ modules_evas_loaders_png_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_png_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_png_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_png_libs@ modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1198,11 +1157,9 @@ modules_evas_savers_png_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_png_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_savers_png_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_png_libs@ modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1226,11 +1183,9 @@ modules_evas_loaders_psd_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_psd_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_psd_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_psd_libs@ modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1254,11 +1209,9 @@ modules_evas_loaders_svg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_svg_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_svg_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_svg_libs@ modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1282,11 +1235,9 @@ modules_evas_loaders_tga_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_tga_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_tga_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_tga_libs@ modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1310,12 +1261,10 @@ modules_evas_loaders_tiff_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_tiff_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ \ @USE_EVIL_CFLAGS@ modules_evas_loaders_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_tiff_libs@ modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1331,12 +1280,10 @@ modules_evas_savers_tiff_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_tiff_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ \ @USE_EVIL_CFLAGS@ modules_evas_savers_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_tiff_libs@ modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1360,11 +1307,9 @@ modules_evas_loaders_wbmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_wbmp_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_wbmp_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_wbmp_libs@ modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1388,11 +1333,9 @@ modules_evas_loaders_webp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_webp_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_webp_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_webp_libs@ modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1416,11 +1359,9 @@ modules_evas_loaders_xpm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_xpm_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_loaders_xpm_module_la_LIBADD = \ lib/evas/libevas.la \ -@EFL_LIBS@ \ @evas_image_loader_xpm_libs@ modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -1466,12 +1407,10 @@ bin_evas_evas_cserve2_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/lib/eet \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -@EVAS_CFLAGS@ \ -@EFL_CFLAGS@ +@EVAS_CFLAGS@ bin_evas_evas_cserve2_LDADD = \ -@EVAS_LIBS@ \ -@EFL_LIBS@ \ +@EVAS_LDFLAGS@ \ lib/eet/libeet.la \ lib/eina/libeina.la \ lib/evas/libevas.la @@ -1486,8 +1425,7 @@ bin_evas_evas_cserve2_client_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -@EVAS_CFLAGS@ \ -@EFL_CFLAGS@ +@EVAS_CFLAGS@ bin_evas_evas_cserve2_usage_SOURCES = \ bin/evas/evas_cserve2_usage.c @@ -1499,13 +1437,11 @@ bin_evas_evas_cserve2_usage_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -@EVAS_CFLAGS@ \ -@EFL_CFLAGS@ +@EVAS_CFLAGS@ bin_evas_evas_cserve2_usage_LDADD = \ lib/eina/libeina.la \ -@EFL_LIBS@ \ -@EVAS_LIBS@ +@EVAS_LDFLAGS@ bin_evas_evas_cserve2_debug_SOURCES = \ bin/evas/evas_cserve2_debug.c @@ -1517,13 +1453,11 @@ bin_evas_evas_cserve2_debug_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -@EVAS_CFLAGS@ \ -@EFL_CFLAGS@ +@EVAS_CFLAGS@ bin_evas_evas_cserve2_debug_LDADD = \ lib/eina/libeina.la \ -@EFL_LIBS@ \ -@EVAS_LIBS@ +@EVAS_LDFLAGS@ bin_evas_evas_cserve2_slave_SOURCES = \ bin/evas/evas_cserve2_slave.c \ @@ -1537,13 +1471,11 @@ bin_evas_evas_cserve2_slave_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -@EVAS_CFLAGS@ \ -@EFL_CFLAGS@ +@EVAS_CFLAGS@ bin_evas_evas_cserve2_slave_LDADD = \ lib/eina/libeina.la \ -@EFL_LIBS@ \ -@EVAS_LIBS@ +@EVAS_LDFLAGS@ bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic @@ -1557,11 +1489,9 @@ bin_evas_dummy_slave_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -@EVAS_CFLAGS@ \ -@EFL_CFLAGS@ +@EVAS_CFLAGS@ bin_evas_dummy_slave_LDADD = \ -@EFL_LIBS@ \ @EVAS_LIBS@ ### Cserve2 loaders @@ -1578,9 +1508,8 @@ bin_evas_loaders_bmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ +bin_evas_loaders_bmp_module_la_LIBADD = @EVAS_LIBS@ bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1599,9 +1528,8 @@ bin_evas_loaders_eet_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_eet_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_eet_module_la_LIBADD = @EFL_LIBS@ \ +bin_evas_loaders_eet_module_la_LIBADD = @EVAS_LIBS@ \ @evas_image_loader_eet_libs@ \ lib/eet/libeet.la bin_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version @@ -1621,9 +1549,8 @@ bin_evas_loaders_ico_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_ico_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_ico_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_ico_libs@ +bin_evas_loaders_ico_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_ico_libs@ bin_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1641,9 +1568,8 @@ bin_evas_loaders_jpeg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_jpeg_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_jpeg_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_jpeg_libs@ +bin_evas_loaders_jpeg_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_jpeg_libs@ bin_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1661,9 +1587,8 @@ bin_evas_loaders_pmaps_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_pmaps_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_pmaps_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_pmaps_libs@ +bin_evas_loaders_pmaps_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_pmaps_libs@ bin_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1681,9 +1606,8 @@ bin_evas_loaders_png_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_png_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_png_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_png_libs@ +bin_evas_loaders_png_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_png_libs@ bin_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1701,9 +1625,8 @@ bin_evas_loaders_psd_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_psd_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_psd_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_psd_libs@ +bin_evas_loaders_psd_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_psd_libs@ bin_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1721,9 +1644,8 @@ bin_evas_loaders_tga_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_tga_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_tga_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tga_libs@ +bin_evas_loaders_tga_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tga_libs@ bin_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1741,9 +1663,8 @@ bin_evas_loaders_tiff_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_tiff_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_tiff_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tiff_libs@ +bin_evas_loaders_tiff_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tiff_libs@ bin_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1761,9 +1682,8 @@ bin_evas_loaders_wbmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_wbmp_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_wbmp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_wbmp_libs@ +bin_evas_loaders_wbmp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_wbmp_libs@ bin_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1781,9 +1701,8 @@ bin_evas_loaders_webp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_webp_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_webp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_webp_libs@ +bin_evas_loaders_webp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_webp_libs@ bin_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1801,9 +1720,8 @@ bin_evas_loaders_xpm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_xpm_cflags@ \ -@EFL_CFLAGS@ \ @EVAS_CFLAGS@ -bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@ +bin_evas_loaders_xpm_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_xpm_libs@ bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1837,6 +1755,6 @@ tests_evas_evas_suite_LDADD = \ lib/evas/libevas.la \ lib/eina/libeina.la \ @CHECK_LIBS@ \ -@EVAS_CFLAGS@ +@EVAS_LDFLAGS@ endif diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am index 273d42b..b0ed2a8 100644 --- a/src/Makefile_Evil.am +++ b/src/Makefile_Evil.am @@ -157,14 +157,17 @@ endif bin_evil_evil_suite_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evil \ -@EFL_CFLAGS@ \ +@EVIL_CFLAGS@ \ @EVIL_CPPFLAGS@ bin_evil_evil_suite_LDADD = \ lib/evil/libevil.la \ lib/evil/libdl.la \ +@EVIL_LDFLAGS@ \ -lm bin_evil_test_evil_SOURCES = bin/evil/test_evil.c -bin_evil_test_evil_LDADD = lib/evil/libevil.la +bin_evil_test_evil_LDADD = \ +lib/evil/libevil.la \ +@EVIL_LDFLAGS@ diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am index 909a388..23e1341 100644 --- a/src/benchmarks/eina/Makefile.am +++ b/src/benchmarks/eina/Makefile.am @@ -42,7 +42,11 @@ EXTRA_LTLIBRARIES = libcity.la libcity_la_SOURCES = city.cc nodist_EXTRA_eina_bench_SOURCES = dummy.cc -eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/eina/libeina.la libcity.la @EINA_LIBS@ +eina_bench_LDADD = \ +$(top_builddir)/src/lib/eina/libeina.la \ +libcity.la \ +@GLIB_LIBS@ \ +@EINA_LDFLAGS@ EXTRA_DIST = strlog diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am index 052b445..c57c2e6 100644 --- a/src/benchmarks/eo/Makefile.am +++ b/src/benchmarks/eo/Makefile.am @@ -22,7 +22,7 @@ eo_bench_eo_do.c eo_bench_LDADD = \ $(top_builddir)/src/lib/eo/libeo.la \ $(top_builddir)/src/lib/eina/libeina.la \ -@EO_LIBS@ +@EO_LDFLAGS@ clean-local: rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am index b23dfeb..edcab2b 100644 --- a/src/examples/ecore/Makefile.am +++ b/src/examples/ecore/Makefile.am @@ -51,108 +51,127 @@ ecore_thread_example \ ecore_time_functions_example \ ecore_timer_example +ECORE_COMMON_LDADD = \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/eo/libeo.la \ +$(top_builddir)/src/lib/eina/libeina.la \ +@ECORE_LDFLAGS@ + if HAVE_ECORE_AUDIO EXTRA_PROGRAMS += \ ecore_audio_custom \ ecore_audio_playback \ ecore_audio_to_ogg +ECORE_AUDIO_COMMON_LDADD = \ +$(top_builddir)/src/lib/ecore_audio/libecore_audio.la \ +$(ECORE_COMMON_LDADD) + ecore_audio_custom_SOURCES = ecore_audio_custom.c -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@ +ecore_audio_custom_LDADD = $(ECORE_AUDIO_COMMON_LDADD) ecore_audio_playback_SOURCES = ecore_audio_playback.c -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@ +ecore_audio_playback_LDADD = $(ECORE_AUDIO_COMMON_LDADD) ecore_audio_to_ogg_SOURCES = ecore_audio_to_ogg.c -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@ +ecore_audio_to_ogg_LDADD = $(ECORE_AUDIO_COMMON_LDADD) endif +ECORE_EVAS_COMMON_LDADD = \ +$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \ +$(top_builddir)/src/lib/evas/libevas.la \ +$(ECORE_COMMON_LDADD) + +ECORE_CON_COMMON_LDADD = \ +$(top_builddir)/src/lib/ecore_con/libecore_con.la \ +$(ECORE_COMMON_LDADD) + ecore_animator_example_SOURCES = ecore_animator_example.c -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@ +ecore_animator_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_client_bench_SOURCES = ecore_client_bench.c -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@ +ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c -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@ +ecore_con_client_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c -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@ +ecore_con_lookup_example_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c -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@ +ecore_con_server_http_example_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_con_server_simple_example_SOURCES = ecore_con_server_simple_example.c -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@ +ecore_con_server_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_con_url_cookies_example_SOURCES = ecore_con_url_cookies_example.c -ecore_con_url_cookies_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_con_url_cookies_example_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_con_url_download_example_SOURCES = ecore_con_url_download_example.c -ecore_con_url_download_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_con_url_download_example_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_con_url_headers_example_SOURCES = ecore_con_url_headers_example.c -ecore_con_url_headers_example_LDADD = $(top_builddir)/src/lib/ecore_con/libecore_con.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_con_url_headers_example_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_evas_basics_example_SOURCES = ecore_evas_basics_example.c -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@ +ecore_evas_basics_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_evas_buffer_example_01_SOURCES = ecore_evas_buffer_example_01.c -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@ +ecore_evas_buffer_example_01_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_evas_buffer_example_02_SOURCES = ecore_evas_buffer_example_02.c -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@ +ecore_evas_buffer_example_02_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_evas_callbacks_SOURCES = ecore_evas_callbacks.c -ecore_evas_callbacks_LDADD = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_evas_callbacks_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_evas_ews_example_SOURCES = ecore_evas_ews_example.c -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@ +ecore_evas_ews_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_evas_object_example_SOURCES = ecore_evas_object_example.c -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@ +ecore_evas_object_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_evas_window_sizes_example_SOURCES = ecore_evas_window_sizes_example.c -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@ +ecore_evas_window_sizes_example_LDADD = $(ECORE_EVAS_COMMON_LDADD) ecore_event_example_01_SOURCES = ecore_event_example_01.c -ecore_event_example_01_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_event_example_01_LDADD = $(ECORE_COMMON_LDADD) ecore_event_example_02_SOURCES = ecore_event_example_02.c -ecore_event_example_02_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_event_example_02_LDADD = $(ECORE_COMMON_LDADD) ecore_exe_example_SOURCES = ecore_exe_example.c -ecore_exe_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_exe_example_LDADD = $(ECORE_COMMON_LDADD) ecore_exe_example_child_SOURCES = ecore_exe_example_child.c -ecore_exe_example_child_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_exe_example_child_LDADD = $(ECORE_COMMON_LDADD) ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c -ecore_fd_handler_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_fd_handler_example_LDADD = $(ECORE_COMMON_LDADD) ecore_idler_example_SOURCES = ecore_idler_example.c -ecore_idler_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eo/libeo.la @ECORE_LIBS@ +ecore_idler_example_LDADD = $(ECORE_COMMON_LDADD) ecore_job_example_SOURCES = ecore_job_example.c -ecore_job_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_job_example_LDADD = $(ECORE_COMMON_LDADD) ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c -ecore_pipe_simple_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_pipe_simple_example_LDADD = $(ECORE_COMMON_LDADD) ecore_poller_example_SOURCES = ecore_poller_example.c -ecore_poller_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eo/libeo.la @ECORE_LIBS@ +ecore_poller_example_LDADD = $(ECORE_COMMON_LDADD) ecore_server_bench_SOURCES = ecore_server_bench.c -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@ +ecore_server_bench_LDADD = $(ECORE_CON_COMMON_LDADD) ecore_thread_example_SOURCES = ecore_thread_example.c -ecore_thread_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la $(top_builddir)/src/lib/eina/libeina.la @ECORE_LIBS@ +ecore_thread_example_LDADD = $(ECORE_COMMON_LDADD) ecore_time_functions_example_SOURCES = ecore_time_functions_example.c -ecore_time_functions_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_time_functions_example_LDADD = $(ECORE_COMMON_LDADD) ecore_timer_example_SOURCES = ecore_timer_example.c -ecore_timer_example_LDADD = $(top_builddir)/src/lib/ecore/libecore.la @ECORE_LIBS@ +ecore_timer_example_LDADD = $(ECORE_COMMON_LDADD) SRCS = \ ecore_animator_example \ diff --git a/src/examples/edbus/Makefile.am b/src/examples/edbus/Makefile.am index 33e8e80..b91dcd8 100644 --- a/src/examples/edbus/Makefile.am +++ b/src/examples/edbus/Makefile.am @@ -12,9 +12,11 @@ AM_CPPFLAGS = \ @EDBUS_CFLAGS@ EXAMPLES_LIBS = \ +$(top_builddir)/src/lib/eo/libeo.la \ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/eina/libeina.la \ -$(top_builddir)/src/lib/edbus/libedbus2.la +$(top_builddir)/src/lib/edbus/libedbus2.la \ +@EDBUS_LDFLAGS@ EXTRA_PROGRAMS = \ connman-list-services \ diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am index 17756ba..f9e626f 100644 --- a/src/examples/eet/Makefile.am +++ b/src/examples/eet/Makefile.am @@ -10,25 +10,25 @@ AM_CPPFLAGS = \ 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 eet_basic_SOURCES = eet-basic.c -eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ +eet_basic_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@ eet_file_SOURCES = eet-file.c -eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ +eet_file_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@ eet_data_simple_SOURCES = eet-data-simple.c -eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ +eet_data_simple_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ eet_data_nested_SOURCES = eet-data-nested.c -eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ +eet_data_nested_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c -eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ +eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c -eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LIBS@ +eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/eet/libeet.la $(top_builddir)/src/lib/eina/libeina.la @EET_LDFLAGS@ eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c -eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ +eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LDFLAGS@ SRCS = \ eet-basic.c \ diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am index 0af0a55..5bb9e83 100644 --- a/src/examples/eina/Makefile.am +++ b/src/examples/eina/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina -LDADD = $(top_builddir)/src/lib/eina/libeina.la +LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LDFLAGS@ SRCS = \ eina_accessor_01.c \ @@ -100,11 +100,12 @@ eina_inarray_02 #eina_model_04_parrot.h \ #eina_model_04_whistler.h -if BUILD_TILER_EXAMPLE -AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ -EXTRA_PROGRAMS += eina_tiler_01 -eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LIBS@ -endif +# TODO: use ecore_evas from single tree +#if BUILD_TILER_EXAMPLE +#AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ +#EXTRA_PROGRAMS += eina_tiler_01 +#eina_tiler_01_LDADD = $(top_builddir)/src/lib/eina/libeina.la @ECORE_EVAS_LDFLAGS@ +#endif examples: $(EXTRA_PROGRAMS) diff --git a/src/examples/eio/Makefile.am b/src/examples/eio/Makefile.am index ee0db70..ad4f901 100644 --- a/src/examples/eio/Makefile.am +++ b/src/examples/eio/Makefile.am @@ -17,10 +17,11 @@ EXTRA_PROGRAMS = eio_file_ls eio_file_ls_SOURCES = eio_file_ls.c eio_file_ls_LDADD = \ $(top_builddir)/src/lib/eio/libeio.la \ +$(top_builddir)/src/lib/eo/libeo.la \ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/eet/libeet.la \ $(top_builddir)/src/lib/eina/libeina.la \ -@EIO_LIBS@ +@EIO_LDFLAGS@ SRCS = \ eio_file_ls diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am index ede96e0..eeca8cb 100644 --- a/src/examples/eo/Makefile.am +++ b/src/examples/eo/Makefile.am @@ -27,7 +27,7 @@ isa/eo_isa_mixin.h \ isa/eo_isa_simple.c \ isa/eo_isa_simple.h -eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ +eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ if EO_BUILD_EXAMPLE_EVAS @@ -46,7 +46,7 @@ evas/evas_evas_obj.c \ evas/evas_evas_obj.h \ evas/evas_test.c -eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LIBS@ +eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LDFLAGS@ endif @@ -59,7 +59,7 @@ simple/simple_mixin.h \ simple/simple_simple.c \ simple/simple_simple.h -eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@ +eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LDFLAGS@ examples: $(EXTRA_PROGRAMS) diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index dde2f77..4e2471b 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 EXTRA_PROGRAMS += evas_buffer_simple evas_buffer_simple_SOURCES = evas-buffer-simple.c -evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la +evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@ endif EXTRA_PROGRAMS += evas_init_shutdown evas_init_shutdown_SOURCES = evas-init-shutdown.c -evas_init_shutdown_LDADD = $(top_builddir)/src/lib/evas/libevas.la +evas_init_shutdown_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@ #the ones using ecore_evas follow #AM_CPPFLAGS += @ECORE_EVAS_CFLAGS@ -- 2.7.4