From: Enlightenment S. <no-...@en...> - 2012-12-05 23:19:06
|
Log: efl: turn cpu extensions detection into generic section, simplify a bit. * remove EVAS_ prefix as it may be used by other libs some day. * SSE3 is detected at runtime if x86. * remove AC_SUBST([altivec_cflags]) as it was not being used anywhere. * moved to top of file (maybe position is not optimal, let's wait vtorri to review) * simplified single-line summary that is as informative as before. Author: barbieri Date: 2012-12-05 15:18:59 -0800 (Wed, 05 Dec 2012) New Revision: 80284 Trac: http://trac.enlightenment.org/e/changeset/80284 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Evas.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-05 23:11:46 UTC (rev 80283) +++ trunk/efl/configure.ac 2012-12-05 23:18:59 UTC (rev 80284) @@ -485,6 +485,96 @@ EFL_LIBS= AC_SUBST([EFL_LIBS]) +## CPU architecture specific assembly + +build_cpu_mmx="no" +build_cpu_sse3="no" +build_cpu_altivec="no" +build_cpu_neon="no" + +SSE3_CFLAGS="" +ALTIVEC_CFLAGS="" + +case $host_cpu in + i*86|x86_64|amd64) + AC_DEFINE([BUILD_MMX], [1], [Build MMX Code]) + build_cpu_mmx="yes" + AC_CHECK_HEADER([immintrin.h], + [ + AC_DEFINE(BUILD_SSE3, 1, [Build SSE3 Code]) + build_cpu_sse3="yes" + ], + [build_cpu_sse3="no"]) + AC_MSG_CHECKING([whether to build SSE3 code]) + AC_MSG_RESULT([${build_cpu_sse3}]) + + if test "x$build_cpu_sse3" = "xyes" ; then + SSE3_CFLAGS="-msse3" + fi + ;; + *power* | *ppc*) + build_cpu_altivec="yes" + AC_CHECK_HEADER([altivec.h], + [ + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file]) + build_cpu_altivec="yes" + ], + [ + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$CFLAGS" -maltivec" + CPPFLAGS=$CPPFLAGS" -maltivec" + unset ac_cv_header_altivec_h + AC_CHECK_HEADER([altivec.h], + [ + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file]) + build_cpu_altivec="yes" + ], + [build_cpu_altivec="no"] + ) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS + ] + ) + if test "x${build_cpu_altivec}" = "xyes"; then + AC_MSG_CHECKING([whether to use altivec compiler flag]) + if test "x$GCC" = "xyes"; then + if echo "int main(){return 0;}" | ${CPP} -faltivec - > /dev/null 2>&1; then + altivec_cflags="-faltivec" + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + elif echo "int main(){return 0;}" | ${CPP} -maltivec - > /dev/null 2>&1; then + altivec_cflags="-maltivec" + AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) + fi + fi + AC_MSG_RESULT([${altivec_cflags}]) + CFLAGS="$CFLAGS ${altivec_cflags}" + ALTIVEC_CFLAGS="-maltivec" + fi + ;; + arm*) + build_cpu_neon="yes" + AC_MSG_CHECKING([whether to use NEON instructions]) + AC_TRY_COMPILE([#include <arm_neon.h>], + [asm volatile ("vqadd.u8 d0, d1, d0\n")], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE([BUILD_NEON], [1], [Build NEON Code]) + build_cpu_neon="yes" + ], + [ + AC_MSG_RESULT([no]) + build_cpu_neon="no" + ]) + ;; +esac + +AC_SUBST([CFLAGS]) +AC_SUBST([ALTIVEC_CFLAGS]) +AC_SUBST([SSE3_CFLAGS]) + #### Checks for linker characteristics @@ -1173,18 +1263,6 @@ ], [have_tile_rotate="no"]) -# SSE3 -AC_ARG_ENABLE([cpu-sse3], - [AC_HELP_STRING([--enable-cpu-sse3], - [enable SSE3 code. @<:@default=enabled@:>@])], - [ - if test "x${enableval}" = "xyes" ; then - want_sse3="yes" - else - want_sse3="no" - fi - ], - [want_sse3="yes"]) # Engines @@ -1796,106 +1874,7 @@ AC_DEFINE(TILE_ROTATE, 1, [Enable tiled rotate algorithm]) fi -## CPU architecture specific assembly -build_cpu_mmx="no" -build_cpu_sse3="no" -build_cpu_altivec="no" -build_cpu_neon="no" - -case $host_cpu in - i*86|x86_64|amd64) - AC_DEFINE([BUILD_MMX], [1], [Build MMX Code]) - build_cpu_mmx="yes" - build_cpu_sse3="yes" - ;; - *power* | *ppc*) - build_cpu_altivec="yes" - AC_CHECK_HEADER([altivec.h], - [ - AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) - AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file]) - build_cpu_altivec="yes" - ], - [ - save_CFLAGS=$CFLAGS - save_CPPFLAGS=$CPPFLAGS - CFLAGS=$CFLAGS" -maltivec" - CPPFLAGS=$CPPFLAGS" -maltivec" - unset ac_cv_header_altivec_h - AC_CHECK_HEADER([altivec.h], - [ - AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) - AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file]) - build_cpu_altivec="yes" - ], - [build_cpu_altivec="no"] - ) - CFLAGS=$save_CFLAGS - CPPFLAGS=$save_CPPFLAGS - ] - ) - if test "x${build_cpu_altivec}" = "xyes"; then - AC_MSG_CHECKING([whether to use altivec compiler flag]) - if test "x$GCC" = "xyes"; then - if echo "int main(){return 0;}" | ${CPP} -faltivec - > /dev/null 2>&1; then - altivec_cflags="-faltivec" - AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) - elif echo "int main(){return 0;}" | ${CPP} -maltivec - > /dev/null 2>&1; then - altivec_cflags="-maltivec" - AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code]) - fi - fi - AC_MSG_RESULT([${altivec_cflags}]) - CFLAGS="$CFLAGS ${altivec_cflags}" - fi - ;; - arm*) - build_cpu_neon="yes" - AC_MSG_CHECKING([whether to use NEON instructions]) - AC_TRY_COMPILE([#include <arm_neon.h>], - [asm volatile ("vqadd.u8 d0, d1, d0\n")], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE([BUILD_NEON], [1], [Build NEON Code]) - build_cpu_neon="yes" - ], - [ - AC_MSG_RESULT([no]) - build_cpu_neon="no" - ]) - ;; -esac - -AC_SUBST([altivec_cflags]) - -# SSE3 - -if test "x${want_sse3}" = "xyes" && test "x${build_cpu_sse3}" = "xyes" ; then - AC_CHECK_HEADER([immintrin.h], - [AC_DEFINE(BUILD_SSE3, 1, [Build SSE3 Code])], - [build_cpu_sse3="no"]) -else - build_cpu_sse3="no" -fi - -AC_MSG_CHECKING([whether to build sse3 code]) -AC_MSG_RESULT([${build_cpu_sse3}]) - -EVAS_SSE3_CFLAGS=" " -EVAS_ALTIVEC_CFLAGS=" " - -if test "x$build_cpu_sse3" = "xyes" ; then - EVAS_SSE3_CFLAGS="-msse3" -fi -if test "x$build_cpu_altivec" = "xyes" ; then - EVAS_ALTIVEC_CFLAGS="-maltivec" -fi - -AC_SUBST([CFLAGS]) -AC_SUBST([EVAS_ALTIVEC_CFLAGS]) -AC_SUBST([EVAS_SSE3_CFLAGS]) - ## dither options # Small dither mask instead of big one (lower quality) @@ -4171,6 +4150,40 @@ #### Info +cpu_summary="$host_cpu (" +case $host_cpu in + i*86|x86_64|amd64) + if test "x${build_cpu_mmx}" = "xyes"; then + cpu_summary="${cpu_summary}+mmx" + else + cpu_summary="${cpu_summary}-mmx" + fi + + cpu_summary="${cpu_summary} " + + if test "x${build_cpu_sse3}" = "xyes"; then + cpu_summary="${cpu_summary}+sse3" + else + cpu_summary="${cpu_summary}-sse3" + fi + ;; + *power* | *ppc*) + if test "x${build_cpu_altivec}" = "xyes"; then + cpu_summary="${cpu_summary}+altivec" + else + cpu_summary="${cpu_summary}-altivec" + fi + ;; + arm*) + if test "x${build_cpu_neon}" = "xyes"; then + cpu_summary="${cpu_summary}+neon" + else + cpu_summary="${cpu_summary}-neon" + fi + ;; +esac +cpu_summary="${cpu_summary})" + echo echo echo @@ -4185,6 +4198,7 @@ echo " Windows version......: ${_efl_windows_version}" fi echo " Build Profile........: ${build_profile}" +echo " CPU Extensions.......: ${cpu_summary}" echo " Threads Type.........: ${efl_have_threads}" echo " spinlocks..........: ${efl_have_posix_threads_spinlock}" echo " barrier............: ${efl_have_pthread_barrier}" @@ -4233,11 +4247,6 @@ # FIXME: add non freetype2 font engine support # FIXME: make freetype2 optional echo -echo " CPU Specific Extensions:" -echo " MMX/SSE.................: $build_cpu_mmx" -echo " SSE3....................: $build_cpu_sse3" -echo " ALTIVEC.................: $build_cpu_altivec" -echo " NEON....................: $build_cpu_neon" echo echo " Features:" echo " Cache Server 2..........: $want_evas_cserve2" Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2012-12-05 23:11:46 UTC (rev 80283) +++ trunk/efl/src/Makefile_Evas.am 2012-12-05 23:18:59 UTC (rev 80284) @@ -215,7 +215,7 @@ @EFL_COV_CFLAGS@ \ @EVAS_CFLAGS@ \ @VALGRIND_CFLAGS@ \ -@EVAS_ALTIVEC_CFLAGS@ +@ALTIVEC_CFLAGS@ # SSE3 noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la @@ -226,7 +226,7 @@ lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = \ $(lib_evas_libevas_la_CPPFLAGS) \ @EFL_COV_CFLAGS@ \ -@EVAS_SSE3_CFLAGS@ +@SSE3_CFLAGS@ lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@ |
From: Enlightenment S. <no-...@en...> - 2012-12-07 14:11:04
|
Log: efl: simplify valgrind handling Author: barbieri Date: 2012-12-07 06:10:55 -0800 (Fri, 07 Dec 2012) New Revision: 80460 Trac: http://trac.enlightenment.org/e/changeset/80460 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Eina.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-07 14:04:54 UTC (rev 80459) +++ trunk/efl/configure.ac 2012-12-07 14:10:55 UTC (rev 80460) @@ -841,15 +841,9 @@ # Valgrind -if test "x${want_valgrind}" = "xyes" ; then - PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0], - [ - have_valgrind="yes" - requirements_pc_eina="valgrind >= 2.4.0 ${requirements_pc_eina}" - requirements_pc_deps_eina="valgrind ${requirements_pc_deps_eina}" - ], - [AC_MSG_ERROR([Valgrind >= 2.4.0 is required])]) -else +EFL_OPTIONAL_DEPEND_PKG([eina], [${want_valgrind}], + [VALGRIND], [valgrind >= 2.4.0]) +if test "x${have_valgrind}" = "xno"; then AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled]) fi Modified: trunk/efl/src/Makefile_Eina.am =================================================================== --- trunk/efl/src/Makefile_Eina.am 2012-12-07 14:04:54 UTC (rev 80459) +++ trunk/efl/src/Makefile_Eina.am 2012-12-07 14:10:55 UTC (rev 80460) @@ -160,8 +160,7 @@ chained_pool_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \ --DEFL_EINA_BUILD \ -@VALGRIND_CFLAGS@ +-DEFL_EINA_BUILD chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_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@ @@ -178,8 +177,7 @@ one_big_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \ --DEFL_EINA_BUILD \ -@VALGRIND_CFLAGS@ +-DEFL_EINA_BUILD one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_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@ @@ -196,8 +194,7 @@ pass_through_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \ --DEFL_EINA_BUILD \ -@VALGRIND_CFLAGS@ +-DEFL_EINA_BUILD pass_through_module_la_CFLAGS = @EINA_CFLAGS@ pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ @@ -215,8 +212,7 @@ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EFL_PTHREAD_CFLAGS@ \ -@EINA_CFLAGS@ \ -@VALGRIND_CFLAGS@ +@EINA_CFLAGS@ if HAVE_WINDOWS lib_eina_libeina_la_CPPFLAGS += \ |
From: Enlightenment S. <no-...@en...> - 2012-12-07 14:17:19
|
Log: efl: valgrind is also in evas Author: barbieri Date: 2012-12-07 06:17:09 -0800 (Fri, 07 Dec 2012) New Revision: 80463 Trac: http://trac.enlightenment.org/e/changeset/80463 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Evas.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-07 14:15:23 UTC (rev 80462) +++ trunk/efl/configure.ac 2012-12-07 14:17:09 UTC (rev 80463) @@ -1411,6 +1411,9 @@ EFL_DEPEND_PKG([evas], [FREETYPE], [freetype2 >= 9.3.0]) ## optional dependencies +# Valgrind +EFL_OPTIONAL_DEPEND_PKG([evas], [${want_valgrind}], + [VALGRIND], [valgrind >= 2.4.0]) # FontConfig EFL_OPTIONAL_DEPEND_PKG([evas], [${want_fontconfig}], Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2012-12-07 14:15:23 UTC (rev 80462) +++ trunk/efl/src/Makefile_Evas.am 2012-12-07 14:17:09 UTC (rev 80463) @@ -214,7 +214,6 @@ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EVAS_CFLAGS@ \ -@VALGRIND_CFLAGS@ \ @ALTIVEC_CFLAGS@ # SSE3 |
From: Enlightenment S. <no-...@en...> - 2012-12-20 19:26:06
|
Log: efl: simplify linkage/usage of evil on windows. instead of spreading it all around, just define 2 AC_SUBST() that will do the work. Author: barbieri Date: 2012-12-20 11:25:51 -0800 (Thu, 20 Dec 2012) New Revision: 81477 Trac: http://trac.enlightenment.org/e/changeset/81477 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Ecore.am trunk/efl/src/Makefile_Ecore_Con.am trunk/efl/src/Makefile_Ecore_Evas.am trunk/efl/src/Makefile_Eet.am trunk/efl/src/Makefile_Eina.am trunk/efl/src/Makefile_Embryo.am trunk/efl/src/Makefile_Eo.am trunk/efl/src/Makefile_Evas.am trunk/efl/src/Makefile_Evil.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/configure.ac 2012-12-20 19:25:51 UTC (rev 81477) @@ -677,9 +677,14 @@ ###################### EFL ###################### +#### Platform-dependent +DL_LIBS="" #### Evil +USE_EVIL_CFLAGS="" +USE_EVIL_LIBS="" + if test "x${have_windows}" = "xyes" ; then AC_MSG_NOTICE([Evil checks]) @@ -747,8 +752,14 @@ fi platform_libs="${platform_libs} ${platform_libs_evil}" +USE_EVIL_CFLAGS="-I\$(top_srcdir)/src/lib/evil" +USE_EVIL_LIBS="lib/evil/libevil.la" +DL_LIBS="lib/evil/libdl.la" fi +AC_SUBST([USE_EVIL_CFLAGS]) +AC_SUBST([USE_EVIL_LIBS]) + #### End of Evil @@ -789,7 +800,10 @@ #### End of Escape +AC_SUBST([DL_LIBS]) +#### End of Platform-dependent + #### Eina AC_MSG_NOTICE([Eina checks]) Modified: trunk/efl/src/Makefile_Ecore.am =================================================================== --- trunk/efl/src/Makefile_Ecore.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Ecore.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -55,13 +55,9 @@ -DEFL_ECORE_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ -@ECORE_CFLAGS@ +@ECORE_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -lib_ecore_libecore_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - if HAVE_PS3 lib_ecore_libecore_la_CPPFLAGS += \ -I$(top_srcdir)/src/lib/escape @@ -69,12 +65,9 @@ lib_ecore_libecore_la_LIBADD = \ lib/eo/libeo.la \ -lib/eina/libeina.la +lib/eina/libeina.la \ +@USE_EVIL_LIBS@ -if HAVE_WINDOWS -lib_ecore_libecore_la_LIBADD += lib/evil/libevil.la -endif - if HAVE_PS3 lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la endif Modified: trunk/efl/src/Makefile_Ecore_Con.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Con.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Ecore_Con.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -43,23 +43,16 @@ -DEFL_ECORE_CON_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ -@ECORE_CON_CFLAGS@ +@ECORE_CON_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -lib_ecore_con_libecore_con_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - lib_ecore_con_libecore_con_la_LIBADD = \ lib/ecore/libecore.la \ lib/eet/libeet.la \ lib/eo/libeo.la \ -lib/eina/libeina.la +lib/eina/libeina.la \ +@USE_EVIL_LIBS@ -if HAVE_WINDOWS -lib_ecore_con_libecore_con_la_LIBADD += lib/evil/libevil.la -endif - lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm lib_ecore_con_libecore_con_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ Modified: trunk/efl/src/Makefile_Ecore_Evas.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -30,13 +30,9 @@ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DEFL_ECORE_EVAS_BUILD \ @EFL_CFLAGS@ \ -@EFL_COV_CFLAGS@ +@EFL_COV_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - lib_ecore_evas_libecore_evas_la_LIBADD = \ lib/ecore_input/libecore_input_evas.la \ lib/ecore_input/libecore_input.la \ Modified: trunk/efl/src/Makefile_Eet.am =================================================================== --- trunk/efl/src/Makefile_Eet.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Eet.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -33,21 +33,16 @@ -DEFL_EET_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ -@EET_CFLAGS@ +@EET_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -lib_eet_libeet_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +lib_eet_libeet_la_LIBADD = \ +lib/eina/libeina.la \ +@USE_EVIL_LIBS@ \ +@EET_LIBS@ \ +@EFL_COV_LIBS@ \ +-lm -lib_eet_libeet_la_LIBADD = lib/eina/libeina.la - -if HAVE_WINDOWS -lib_eet_libeet_la_LIBADD += lib/evil/libevil.la -endif - -lib_eet_libeet_la_LIBADD += @EET_LIBS@ @EFL_COV_LIBS@ -lm - lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ EXTRA_DIST += static_libs/lz4/README @@ -67,23 +62,16 @@ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ -@EET_CFLAGS@ +@EET_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -bin_eet_eet_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - bin_eet_eet_LDADD = \ lib/eet/libeet.la \ -lib/eina/libeina.la +lib/eina/libeina.la \ +@USE_EVIL_LIBS@ \ +@EET_LIBS@ \ +@EFL_COV_LIBS@ -if HAVE_WINDOWS -bin_eet_eet_LDADD += lib/evil/libevil.la -endif - -bin_eet_eet_LDADD += @EET_LIBS@ @EFL_COV_LIBS@ - ### Unit tests if EFL_ENABLE_TESTS Modified: trunk/efl/src/Makefile_Eina.am =================================================================== --- trunk/efl/src/Makefile_Eina.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Eina.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -212,23 +212,11 @@ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EFL_PTHREAD_CFLAGS@ \ -@EINA_CFLAGS@ +@EINA_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -lib_eina_libeina_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ -lm -lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ - -if HAVE_WINDOWS -lib_eina_libeina_la_LIBADD += \ -lib/evil/libevil.la \ -lib/evil/libdl.la -endif - -lib_eina_libeina_la_LIBADD += -lm - lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ ### Script Modified: trunk/efl/src/Makefile_Embryo.am =================================================================== --- trunk/efl/src/Makefile_Embryo.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Embryo.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -23,21 +23,11 @@ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ -DEFL_EMBRYO_BUILD \ -@EFL_CFLAGS@ +@EFL_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -lib_embryo_libembryo_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la @USE_EVIL_LIBS@ -lm -lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la - -if HAVE_WINDOWS -lib_embryo_libembryo_la_LIBADD += lib/evil/libevil.la -endif - -lib_embryo_libembryo_la_LIBADD += -lm - lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ ### Binary @@ -67,23 +57,15 @@ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ -@EFL_CFLAGS@ +@EFL_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -bin_embryo_embryo_cc_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - bin_embryo_embryo_cc_LDADD = \ lib/embryo/libembryo.la \ -lib/eina/libeina.la +lib/eina/libeina.la \ +@USE_EVIL_LIBS@ \ +-lm -if HAVE_WINDOWS -bin_embryo_embryo_cc_LDADD += lib/evil/libevil.la -endif - -bin_embryo_embryo_cc_LDADD += -lm - EXTRA_DIST += \ bin/embryo/embryo_cc_sc5.scp \ bin/embryo/embryo_cc_sc7.scp Modified: trunk/efl/src/Makefile_Eo.am =================================================================== --- trunk/efl/src/Makefile_Eo.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Eo.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -19,13 +19,9 @@ -DEFL_EO_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ -@EO_CFLAGS@ +@EO_CFLAGS@ \ +@USE_EVIL_CFLAGS@ -if HAVE_WINDOWS -lib_eo_libeo_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Evas.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -207,7 +207,8 @@ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EVAS_CFLAGS@ \ -@ALTIVEC_CFLAGS@ +@ALTIVEC_CFLAGS@ \ +@USE_EVIL_CFLAGS@ # SSE3 noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la @@ -222,11 +223,6 @@ lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@ -if HAVE_WINDOWS -lib_evas_libevas_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - lib_evas_libevas_la_CXXFLAGS = lib_evas_libevas_la_LIBADD = \ @@ -409,11 +405,8 @@ -I$(top_srcdir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @EFL_CFLAGS@ \ -@EVAS_CFLAGS@ -if HAVE_WINDOWS -modules_evas_engines_buffer_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +@EVAS_CFLAGS@ \ +@USE_EVIL_CFLAGS@ modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static @@ -763,11 +756,8 @@ -DEFL_EVAS_BUILD \ @evas_engine_software_ddraw_cflags@ \ @EFL_CFLAGS@ \ -@EVAS_CFLAGS@ -if HAVE_WINDOWS -modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +@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 \ @@ -804,11 +794,8 @@ -DEFL_EVAS_BUILD \ @evas_engine_software_gdi_cflags@ \ @EFL_CFLAGS@ \ -@EVAS_CFLAGS@ -if HAVE_WINDOWS -modules_evas_engines_software_gdi_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +@EVAS_CFLAGS@ \ +@USE_EVIL_CFLAGS@ modules_evas_engines_software_gdi_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_software_gdi_libs@ \ @@ -1325,11 +1312,8 @@ -DEFL_EVAS_BUILD \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ -@EVAS_CFLAGS@ -if HAVE_WINDOWS -modules_evas_loaders_tiff_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +@EVAS_CFLAGS@ \ +@USE_EVIL_CFLAGS@ modules_evas_loaders_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @EFL_LIBS@ \ @@ -1349,11 +1333,8 @@ -DEFL_EVAS_BUILD \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ -@EVAS_CFLAGS@ -if HAVE_WINDOWS -modules_evas_savers_tiff_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif +@EVAS_CFLAGS@ \ +@USE_EVIL_CFLAGS@ modules_evas_savers_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @EFL_LIBS@ \ Modified: trunk/efl/src/Makefile_Evil.am =================================================================== --- trunk/efl/src/Makefile_Evil.am 2012-12-20 19:02:42 UTC (rev 81476) +++ trunk/efl/src/Makefile_Evil.am 2012-12-20 19:25:51 UTC (rev 81477) @@ -161,11 +161,6 @@ @EFL_CFLAGS@ \ @EVIL_CPPFLAGS@ -if HAVE_WINDOWS -bin_evil_evil_suite_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil -endif - bin_evil_evil_suite_LDADD = \ lib/evil/libevil.la \ lib/evil/libdl.la \ |
From: Enlightenment S. <no-...@en...> - 2012-12-20 19:41:11
|
Log: efl/escape: simplify linkage/usage of escape on ps3. Author: barbieri Date: 2012-12-20 11:41:00 -0800 (Thu, 20 Dec 2012) New Revision: 81478 Trac: http://trac.enlightenment.org/e/changeset/81478 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Ecore.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-20 19:25:51 UTC (rev 81477) +++ trunk/efl/configure.ac 2012-12-20 19:41:00 UTC (rev 81478) @@ -765,6 +765,9 @@ #### Escape +USE_ESCAPE_CFLAGS="" +USE_ESCAPE_LIBS="" + if test "x${have_ps3}" = "xyes" ; then AC_MSG_NOTICE([Escape checks]) @@ -796,8 +799,14 @@ platform_pc_escape="escape >= ${PACKAGE_VERSION}" platform_pc="${platform_pc} ${platform_pc_escape}" + +USE_ESCAPE_CFLAGS="-I\$(top_srcdir)/src/lib/escape" +USE_ESCAPE_LIBS="lib/escape/libescape.la" fi +AC_SUBST([USE_ESCAPE_CFLAGS]) +AC_SUBST([USE_ESCAPE_LIBS]) + #### End of Escape AC_SUBST([DL_LIBS]) Modified: trunk/efl/src/Makefile_Ecore.am =================================================================== --- trunk/efl/src/Makefile_Ecore.am 2012-12-20 19:25:51 UTC (rev 81477) +++ trunk/efl/src/Makefile_Ecore.am 2012-12-20 19:41:00 UTC (rev 81478) @@ -56,24 +56,18 @@ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_CFLAGS@ \ -@USE_EVIL_CFLAGS@ +@USE_EVIL_CFLAGS@ \ +@USE_ESCAPE_CFLAGS@ -if HAVE_PS3 -lib_ecore_libecore_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/escape -endif - lib_ecore_libecore_la_LIBADD = \ lib/eo/libeo.la \ lib/eina/libeina.la \ -@USE_EVIL_LIBS@ +@USE_EVIL_LIBS@ \ +@USE_ESCAPE_LIBS@ \ +@ECORE_LIBS@ \ +@EFL_COV_LIBS@ \ +-lm -if HAVE_PS3 -lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la -endif - -lib_ecore_libecore_la_LIBADD += @ECORE_LIBS@ @EFL_COV_LIBS@ -lm - lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ ### Unit tests |
From: Enlightenment S. <no-...@en...> - 2012-12-30 13:30:25
|
Log: efl: fix valgrind build. weird enough to build with memcheck.h you just need valgrind's CFLAGS, not its libraries as they are not supposed to be used like that, throwing many bgPlain_ errors (vgPlain_tl_pre_clo_init, vgPlain_free...) from libcoregrind-x86-linux.a Author: barbieri Date: 2012-12-30 05:30:13 -0800 (Sun, 30 Dec 2012) New Revision: 81901 Trac: http://trac.enlightenment.org/e/changeset/81901 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Eina.am trunk/efl/src/Makefile_Evas.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-30 12:29:39 UTC (rev 81900) +++ trunk/efl/configure.ac 2012-12-30 13:30:13 UTC (rev 81901) @@ -849,7 +849,7 @@ dev) with_max_log_level="" have_stringshare_usage="no" - want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC + want_valgrind="yes" want_debug_malloc="no" want_debug_threads="no" want_default_mempool="no" @@ -858,7 +858,7 @@ debug) with_max_log_level="" have_stringshare_usage="yes" - want_valgrind="no" # TODO: "yes" is not working: relocation R_X86_64_32S against `vgPlain_interim_stack' can not be used when making a shared object; recompile with -fPIC + want_valgrind="yes" want_debug_malloc="yes" want_debug_threads="yes" want_default_mempool="yes" @@ -899,11 +899,11 @@ ## Options # Valgrind - -EFL_OPTIONAL_DEPEND_PKG([eina], [${want_valgrind}], - [VALGRIND], [valgrind >= 2.4.0]) if test "x${have_valgrind}" = "xno"; then AC_DEFINE([NVALGRIND], [1], [Valgrind support disabled]) +else + PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0]) + AC_DEFINE([HAVE_VALGRIND], [1], [Valgrind support enabled]) fi AC_DEFINE_IF([EINA_DEBUG_MALLOC], @@ -1502,9 +1502,6 @@ EFL_DEPEND_PKG([evas], [FREETYPE], [freetype2 >= 9.3.0]) ## optional dependencies -# Valgrind -EFL_OPTIONAL_DEPEND_PKG([evas], [${want_valgrind}], - [VALGRIND], [valgrind >= 2.4.0]) # FontConfig EFL_OPTIONAL_DEPEND_PKG([evas], [${want_fontconfig}], Modified: trunk/efl/src/Makefile_Eina.am =================================================================== --- trunk/efl/src/Makefile_Eina.am 2012-12-30 12:29:39 UTC (rev 81900) +++ trunk/efl/src/Makefile_Eina.am 2012-12-30 13:30:13 UTC (rev 81901) @@ -161,7 +161,7 @@ -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@ +chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_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@ @@ -178,7 +178,7 @@ -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@ +one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_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@ @@ -195,7 +195,7 @@ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \ -DEFL_EINA_BUILD -pass_through_module_la_CFLAGS = @EINA_CFLAGS@ +pass_through_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ pass_through_module_la_LDFLAGS = -no-undefined -module -avoid-version @@ -213,6 +213,7 @@ @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@ -lm Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2012-12-30 12:29:39 UTC (rev 81900) +++ trunk/efl/src/Makefile_Evas.am 2012-12-30 13:30:13 UTC (rev 81901) @@ -207,6 +207,7 @@ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @EVAS_CFLAGS@ \ +@VALGRIND_CFLAGS@ \ @ALTIVEC_CFLAGS@ \ @USE_EVIL_CFLAGS@ |
From: Enlightenment S. <no-...@en...> - 2012-12-30 22:15:39
|
Log: efl: unify LDFLAGS for LTLIBRARIES Author: barbieri Date: 2012-12-30 14:15:29 -0800 (Sun, 30 Dec 2012) New Revision: 81911 Trac: http://trac.enlightenment.org/e/changeset/81911 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_EDBus.am trunk/efl/src/Makefile_Ecore.am trunk/efl/src/Makefile_Ecore_Audio.am trunk/efl/src/Makefile_Ecore_Cocoa.am trunk/efl/src/Makefile_Ecore_Con.am trunk/efl/src/Makefile_Ecore_Evas.am trunk/efl/src/Makefile_Ecore_FB.am trunk/efl/src/Makefile_Ecore_File.am trunk/efl/src/Makefile_Ecore_Imf.am trunk/efl/src/Makefile_Ecore_Input.am trunk/efl/src/Makefile_Ecore_Ipc.am trunk/efl/src/Makefile_Ecore_Psl1ght.am trunk/efl/src/Makefile_Ecore_SDL.am trunk/efl/src/Makefile_Ecore_Wayland.am trunk/efl/src/Makefile_Ecore_Win32.am trunk/efl/src/Makefile_Ecore_WinCE.am trunk/efl/src/Makefile_Ecore_X.am trunk/efl/src/Makefile_Eet.am trunk/efl/src/Makefile_Efreet.am trunk/efl/src/Makefile_Eina.am trunk/efl/src/Makefile_Eio.am trunk/efl/src/Makefile_Embryo.am trunk/efl/src/Makefile_Eo.am trunk/efl/src/Makefile_Escape.am trunk/efl/src/Makefile_Evas.am trunk/efl/src/Makefile_Evil.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/configure.ac 2012-12-30 22:15:29 UTC (rev 81911) @@ -10,6 +10,7 @@ ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) +m4_define([v_rel], []) ##-- When doing snapshots - change soname. remove dnl on below line dnl m4_define([relname], [ver-pre-svn-07]) dnl m4_define([v_rel], [-release relname]) @@ -223,10 +224,8 @@ lt_cv_deplibs_check_method='pass_all' fi LT_INIT([win32-dll disable-static disable-fast-install pic-only]) -version_info="lt_cur:lt_rev:lt_age" -AC_SUBST([version_info]) -release_info="v_rel" -AC_SUBST([release_info]) +EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel" +AC_SUBST(EFL_LTLIBRARY_FLAGS) ### gettext Modified: trunk/efl/src/Makefile_EDBus.am =================================================================== --- trunk/efl/src/Makefile_EDBus.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_EDBus.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -51,7 +51,7 @@ @EDBUS_LIBS@ \ @EFL_COV_LIBS@ -lib_edbus_libedbus2_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_edbus_libedbus2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Binary Modified: trunk/efl/src/Makefile_Ecore.am =================================================================== --- trunk/efl/src/Makefile_Ecore.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -67,7 +67,7 @@ @ECORE_LIBS@ \ @EFL_COV_LIBS@ -lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Unit tests Modified: trunk/efl/src/Makefile_Ecore_Audio.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Audio.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Audio.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -35,4 +35,4 @@ @ECORE_AUDIO_LIBS@ \ @EFL_COV_LIBS@ -lib_ecore_audio_libecore_audio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Cocoa.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Cocoa.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Cocoa.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -30,4 +30,4 @@ lib/eina/libeina.la \ @ECORE_COCOA_LIBS@ -lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Con.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Con.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Con.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -54,5 +54,4 @@ @USE_EVIL_LIBS@ lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ - -lib_ecore_con_libecore_con_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Evas.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -45,7 +45,7 @@ @EFL_COV_LIBS@ lib_ecore_evas_libecore_evas_la_LIBADD += @EFL_COV_LIBS@ -lib_ecore_evas_libecore_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # Engines Modified: trunk/efl/src/Makefile_Ecore_FB.am =================================================================== --- trunk/efl/src/Makefile_Ecore_FB.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_FB.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -36,4 +36,4 @@ lib/eina/libeina.la \ @ECORE_FB_LIBS@ -lib_ecore_fb_libecore_fb_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_File.am =================================================================== --- trunk/efl/src/Makefile_Ecore_File.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_File.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -42,8 +42,6 @@ lib/ecore_con/libecore_con.la \ lib/ecore/libecore.la \ lib/eo/libeo.la \ -lib/eina/libeina.la - -lib_ecore_file_libecore_file_la_LIBADD += @EFL_COV_LIBS@ - -lib_ecore_file_libecore_file_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib/eina/libeina.la \ +@EFL_COV_LIBS@ +lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Imf.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Imf.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Imf.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -31,7 +31,7 @@ lib/eo/libeo.la \ lib/eina/libeina.la -lib_ecore_imf_libecore_imf_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@ dist_installed_ecoreimfevasmainheaders_DATA = \ @@ -59,7 +59,7 @@ lib/eo/libeo.la \ lib/eina/libeina.la -lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Modules Modified: trunk/efl/src/Makefile_Ecore_Input.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Input.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Input.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -32,7 +32,7 @@ @EFL_COV_LIBS@ lib_ecore_input_libecore_input_la_LIBADD += @EFL_COV_LIBS@ -lib_ecore_input_libecore_input_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@ dist_installed_ecoreinputevasmainheaders_DATA = \ @@ -62,4 +62,4 @@ lib/eina/libeina.la \ @EFL_COV_LIBS@ -lib_ecore_input_libecore_input_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_input_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Ipc.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Ipc.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Ipc.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -31,4 +31,4 @@ @EFL_COV_LIBS@ \ @ECORE_IPC_LIBS@ -lib_ecore_ipc_libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Psl1ght.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Psl1ght.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Psl1ght.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -31,4 +31,4 @@ lib/eo/libeo.la \ lib/eina/libeina.la -lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_SDL.am =================================================================== --- trunk/efl/src/Makefile_Ecore_SDL.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_SDL.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -31,4 +31,4 @@ lib/eina/libeina.la \ @ECORE_SDL_LIBS@ -lib_ecore_sdl_libecore_sdl_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Wayland.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Wayland.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Wayland.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -33,4 +33,4 @@ lib/eina/libeina.la \ @ECORE_WAYLAND_LIBS@ -lib_ecore_wayland_libecore_wayland_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_Win32.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Win32.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_Win32.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -43,4 +43,4 @@ lib/evil/libevil.la \ @ECORE_WIN32_LIBS@ -lib_ecore_win32_libecore_win32_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_WinCE.am =================================================================== --- trunk/efl/src/Makefile_Ecore_WinCE.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_WinCE.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -33,4 +33,4 @@ lib/evil/libevil.la \ @ECORE_WINCE_LIBS@ -lib_ecore_wince_libecore_wince_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Ecore_X.am =================================================================== --- trunk/efl/src/Makefile_Ecore_X.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Ecore_X.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -115,7 +115,7 @@ lib/eina/libeina.la \ @ECORE_X_LIBS@ -lib_ecore_x_libecore_x_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ MAINTAINERCLEANFILES += \ $(top_builddir)/src/lib/ecore_x/ecore_x_version.h Modified: trunk/efl/src/Makefile_Eet.am =================================================================== --- trunk/efl/src/Makefile_Eet.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Eet.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -42,7 +42,7 @@ @EET_LIBS@ \ @EFL_COV_LIBS@ -lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ EXTRA_DIST += static_libs/lz4/README Modified: trunk/efl/src/Makefile_Efreet.am =================================================================== --- trunk/efl/src/Makefile_Efreet.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Efreet.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -43,8 +43,6 @@ EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la -EFREET_COMMON_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ - installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ dist_installed_efreetmainheaders_DATA = \ lib/efreet/Efreet.h \ @@ -78,19 +76,19 @@ lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) lib_efreet_libefreet_la_LIBADD = $(EFREET_COMMON_LIBADD) -lib_efreet_libefreet_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS) +lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # libefreet_mime.la lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) lib_efreet_libefreet_mime_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) -lib_efreet_libefreet_mime_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS) +lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # libefreet_trash.la lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) lib_efreet_libefreet_trash_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) -lib_efreet_libefreet_trash_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS) +lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Binary Modified: trunk/efl/src/Makefile_Eina.am =================================================================== --- trunk/efl/src/Makefile_Eina.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Eina.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -217,9 +217,8 @@ @USE_EVIL_CFLAGS@ lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ +lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ -lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ - ### Script bin_SCRIPTS = scripts/eina/eina-bench-cmp Modified: trunk/efl/src/Makefile_Eio.am =================================================================== --- trunk/efl/src/Makefile_Eio.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Eio.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -45,4 +45,4 @@ @EIO_LIBS@ \ @EFL_COV_LIBS@ -lib_eio_libeio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Embryo.am =================================================================== --- trunk/efl/src/Makefile_Embryo.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Embryo.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -32,7 +32,7 @@ @EMBRYO_LIBS@ \ @USE_EVIL_LIBS@ -lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Binary Modified: trunk/efl/src/Makefile_Eo.am =================================================================== --- trunk/efl/src/Makefile_Eo.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Eo.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -23,9 +23,8 @@ @USE_EVIL_CFLAGS@ lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ +lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ -lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ - ### Unit tests check_PROGRAMS += \ Modified: trunk/efl/src/Makefile_Escape.am =================================================================== --- trunk/efl/src/Makefile_Escape.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Escape.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -21,4 +21,4 @@ lib_escape_libescape_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/escape lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ -lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@ +lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Evas.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -234,7 +234,7 @@ @EVAS_LIBS@ \ @EFL_COV_LIBS@ -lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # Linebreak Modified: trunk/efl/src/Makefile_Evil.am =================================================================== --- trunk/efl/src/Makefile_Evil.am 2012-12-30 21:52:34 UTC (rev 81910) +++ trunk/efl/src/Makefile_Evil.am 2012-12-30 22:15:29 UTC (rev 81911) @@ -100,7 +100,7 @@ lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ lib_evil_libevil_la_LIBADD = @EVIL_LIBS@ -lib_evil_libevil_la_LDFLAGS = -no-undefined -version-info @version_info@ +lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ if HAVE_WINCE lib_evil_libevil_la_LINK = $(LINK) $(lib_evil_libevil_la_LDFLAGS) @@ -117,9 +117,8 @@ lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@ lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@ +lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ -lib_evil_libdl_la_LDFLAGS = -no-undefined -version-info @version_info@ - EXTRA_DIST += lib/evil/gdtoa/README lib/evil/gdtoa/README.mingw ### Binary |
From: Enlightenment S. <no-...@en...> - 2012-12-31 00:54:58
|
Log: efl: create macro to simplify libtool module declaration. Author: barbieri Date: 2012-12-30 16:54:48 -0800 (Sun, 30 Dec 2012) New Revision: 81916 Trac: http://trac.enlightenment.org/e/changeset/81916 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Ecore_Evas.am trunk/efl/src/Makefile_Ecore_Imf.am trunk/efl/src/Makefile_Eina.am trunk/efl/src/Makefile_Evas.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-31 00:46:14 UTC (rev 81915) +++ trunk/efl/configure.ac 2012-12-31 00:54:48 UTC (rev 81916) @@ -232,6 +232,9 @@ EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel" AC_SUBST(EFL_LTLIBRARY_FLAGS) +EFL_LTMODULE_FLAGS="-no-undefined -module -avoid-version" +AC_SUBST([EFL_LTMODULE_FLAGS]) + ### gettext AM_GNU_GETTEXT_VERSION([0.17]) Modified: trunk/efl/src/Makefile_Ecore_Evas.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-31 00:46:14 UTC (rev 81915) +++ trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-31 00:54:48 UTC (rev 81916) @@ -59,7 +59,7 @@ 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 -modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_ecore_evas_engines_buffer_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -77,7 +77,7 @@ modules_ecore_evas_engines_x_module_la_LIBADD = \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -93,7 +93,7 @@ modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -109,7 +109,7 @@ modules_ecore_evas_engines_fb_module_la_LIBADD = \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -125,7 +125,7 @@ modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -147,7 +147,7 @@ modules_ecore_evas_engines_wayland_module_la_LIBADD = \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -164,7 +164,7 @@ modules_ecore_evas_engines_sdl_module_la_LIBADD = \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -182,6 +182,6 @@ modules_ecore_evas_engines_win32_module_la_LIBADD = \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static endif Modified: trunk/efl/src/Makefile_Ecore_Imf.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Imf.am 2012-12-31 00:46:14 UTC (rev 81915) +++ trunk/efl/src/Makefile_Ecore_Imf.am 2012-12-31 00:54:48 UTC (rev 81916) @@ -95,7 +95,7 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @IBUS_LIBS@ -modules_ecore_immodules_ibus_ibus_la_LDFLAGS = -no-undefined -module -avoid-version +modules_ecore_immodules_ibus_ibus_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_immodules_ibus_ibus_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -130,7 +130,7 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @SCIM_LIBS@ -modules_ecore_immodules_scim_scim_la_LDFLAGS = -no-undefined -module -avoid-version +modules_ecore_immodules_scim_scim_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_immodules_scim_scim_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -158,6 +158,6 @@ lib/ecore/libecore.la \ lib/eo/libeo.la \ lib/eina/libeina.la -modules_ecore_immodules_xim_xim_la_LDFLAGS = -no-undefined -module -avoid-version +modules_ecore_immodules_xim_xim_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_ecore_immodules_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static endif Modified: trunk/efl/src/Makefile_Eina.am =================================================================== --- trunk/efl/src/Makefile_Eina.am 2012-12-31 00:46:14 UTC (rev 81915) +++ trunk/efl/src/Makefile_Eina.am 2012-12-31 00:54:48 UTC (rev 81916) @@ -164,7 +164,7 @@ 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 +chained_pool_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -181,7 +181,7 @@ 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 +one_big_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ one_big_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -198,7 +198,7 @@ pass_through_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ -pass_through_module_la_LDFLAGS = -no-undefined -module -avoid-version +pass_through_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -313,7 +313,7 @@ lib/eina/libeina.la \ @EINA_LIBS@ -tests_eina_module_dummy_la_LDFLAGS = -no-undefined -module -avoid-version +tests_eina_module_dummy_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2012-12-31 00:46:14 UTC (rev 81915) +++ trunk/efl/src/Makefile_Evas.am 2012-12-31 00:54:48 UTC (rev 81916) @@ -378,7 +378,7 @@ -DEFL_EVAS_BUILD \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -405,7 +405,7 @@ @EVAS_CFLAGS@ \ @USE_EVIL_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -438,7 +438,7 @@ modules_evas_engines_fb_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_fb_libs@ -modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_fb_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -553,7 +553,7 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ lib/eet/libeet.la \ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -595,7 +595,7 @@ lib/eet/libeet.la \ lib/evas/libevas.la \ @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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -635,7 +635,7 @@ modules_evas_engines_gl_sdl_module_la_LIBADD += \ lib/evas/libevas.la \ @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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -677,7 +677,7 @@ lib/eet/libeet.la \ lib/evas/libevas.la \ @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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -709,7 +709,7 @@ modules_evas_engines_psl1ght_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_psl1ght_libs@ -modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_psl1ght_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -746,7 +746,7 @@ modules_evas_engines_software_ddraw_module_la_LIBADD = \ lib/evas/libevas.la \ @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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -781,7 +781,7 @@ modules_evas_engines_software_gdi_module_la_LIBADD = \ lib/evas/libevas.la \ @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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -842,7 +842,7 @@ 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 $(SOFTWARE_X11_LIBADD) -modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_engines_software_x11_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -879,7 +879,7 @@ lib/eet/libeet.la \ lib/evas/libevas.la \ @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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -910,7 +910,7 @@ modules_evas_engines_wayland_shm_module_la_LIBADD = \ lib/evas/libevas.la \ @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_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -938,7 +938,7 @@ modules_evas_loaders_bmp_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_bmp_libs@ -modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_bmp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -966,7 +966,7 @@ lib/evas/libevas.la \ lib/evas/libeet.la \ @evas_image_loader_eet_libs@ -modules_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_eet_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -992,7 +992,7 @@ modules_evas_loaders_generic_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_generic_libs@ -modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_generic_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1018,7 +1018,7 @@ modules_evas_loaders_gif_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_gif_libs@ -modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_gif_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1044,7 +1044,7 @@ modules_evas_loaders_ico_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_ico_libs@ -modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_ico_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1073,7 +1073,7 @@ modules_evas_loaders_jpeg_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_jpeg_libs@ -modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_jpeg_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static if BUILD_SAVER_JPEG saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) @@ -1090,7 +1090,7 @@ modules_evas_savers_jpeg_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_jpeg_libs@ -modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_savers_jpeg_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1117,7 +1117,7 @@ modules_evas_loaders_pmaps_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_pmaps_libs@ -modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_pmaps_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1143,7 +1143,7 @@ modules_evas_loaders_png_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_png_libs@ -modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_png_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) @@ -1161,7 +1161,7 @@ modules_evas_savers_png_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_png_libs@ -modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_savers_png_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1187,7 +1187,7 @@ modules_evas_loaders_psd_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_psd_libs@ -modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_psd_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1213,7 +1213,7 @@ modules_evas_loaders_svg_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_svg_libs@ -modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_svg_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1239,7 +1239,7 @@ modules_evas_loaders_tga_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_tga_libs@ -modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_tga_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1266,7 +1266,7 @@ modules_evas_loaders_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_tiff_libs@ -modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_tiff_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) @@ -1285,7 +1285,7 @@ modules_evas_savers_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_tiff_libs@ -modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_savers_tiff_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1311,7 +1311,7 @@ modules_evas_loaders_wbmp_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_wbmp_libs@ -modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_wbmp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1337,7 +1337,7 @@ modules_evas_loaders_webp_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_webp_libs@ -modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_webp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1363,7 +1363,7 @@ modules_evas_loaders_xpm_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_xpm_libs@ -modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version +modules_evas_loaders_xpm_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1510,7 +1510,7 @@ -I$(top_srcdir)/src/bin/evas \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1532,7 +1532,7 @@ 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 +bin_evas_loaders_eet_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1551,7 +1551,7 @@ @evas_image_loader_ico_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1570,7 +1570,7 @@ @evas_image_loader_jpeg_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1589,7 +1589,7 @@ @evas_image_loader_pmaps_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1608,7 +1608,7 @@ @evas_image_loader_png_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1627,7 +1627,7 @@ @evas_image_loader_psd_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1646,7 +1646,7 @@ @evas_image_loader_tga_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1665,7 +1665,7 @@ @evas_image_loader_tiff_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1684,7 +1684,7 @@ @evas_image_loader_wbmp_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1703,7 +1703,7 @@ @evas_image_loader_webp_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1722,7 +1722,7 @@ @evas_image_loader_xpm_cflags@ \ @EVAS_CFLAGS@ 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_LDFLAGS = @EFL_LTMODULE_FLAGS@ bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static endif |
From: Enlightenment S. <no-...@en...> - 2012-12-31 01:13:56
|
Log: efl: unbreak last commit. seems that automake will parse LDFLAGS for -module and if it's not present it will complain about name not starting with 'lib'. seems my last try was without NOCONFIGURE=1 and autogen continued to the old ./configure, that printed lots of messages and the error went unnoticed Author: barbieri Date: 2012-12-30 17:13:47 -0800 (Sun, 30 Dec 2012) New Revision: 81917 Trac: http://trac.enlightenment.org/e/changeset/81917 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Ecore_Evas.am trunk/efl/src/Makefile_Ecore_Imf.am trunk/efl/src/Makefile_Eina.am trunk/efl/src/Makefile_Evas.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2012-12-31 00:54:48 UTC (rev 81916) +++ trunk/efl/configure.ac 2012-12-31 01:13:47 UTC (rev 81917) @@ -232,7 +232,7 @@ EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel" AC_SUBST(EFL_LTLIBRARY_FLAGS) -EFL_LTMODULE_FLAGS="-no-undefined -module -avoid-version" +EFL_LTMODULE_FLAGS="-no-undefined -avoid-version" AC_SUBST([EFL_LTMODULE_FLAGS]) ### gettext @@ -593,7 +593,6 @@ ### Checks for libraries -# TODO: are these needed here? parts of this are replicated for EVERY LIB :-( EVIL_LIBS="" EVIL_DLFCN_LIBS="" if test "${have_wince}" = "xyes"; then @@ -776,14 +775,6 @@ ## Examples -# TODO: add once ecore-evas is merged: -#PKG_CHECK_MODULES([ECORE_EVAS], -# [ecore-evas ecore evas], -# [build_tiler_example="yes"], -# [build_tiler_example="no"]) - -AM_CONDITIONAL([BUILD_TILER_EXAMPLE], [test "x${build_tiler_example}" = "xyes"]) - ## Benchmarks PKG_CHECK_MODULES([GLIB], Modified: trunk/efl/src/Makefile_Ecore_Evas.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-31 00:54:48 UTC (rev 81916) +++ trunk/efl/src/Makefile_Ecore_Evas.am 2012-12-31 01:13:47 UTC (rev 81917) @@ -59,7 +59,7 @@ 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 -modules_ecore_evas_engines_buffer_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -77,7 +77,7 @@ modules_ecore_evas_engines_x_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la \ lib/ecore_x/libecore_x.la -modules_ecore_evas_engines_x_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_x_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -93,7 +93,7 @@ modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la \ lib/ecore_cocoa/libecore_cocoa.la -modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -109,7 +109,7 @@ modules_ecore_evas_engines_fb_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la \ lib/ecore_fb/libecore_fb.la -modules_ecore_evas_engines_fb_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -125,7 +125,7 @@ modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la \ lib/ecore_psl1ght/libecore_psl1ght.la -modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -147,7 +147,7 @@ modules_ecore_evas_engines_wayland_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la \ lib/ecore_wayland/libecore_wayland.la -modules_ecore_evas_engines_wayland_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -164,7 +164,7 @@ modules_ecore_evas_engines_sdl_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la \ lib/ecore_sdl/libecore_sdl.la -modules_ecore_evas_engines_sdl_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -182,6 +182,6 @@ modules_ecore_evas_engines_win32_module_la_LIBADD = \ lib/ecore/libecore_evas.la \ lib/ecore_win32/libecore_win32.la -modules_ecore_evas_engines_win32_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_evas_engines_win32_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static endif Modified: trunk/efl/src/Makefile_Ecore_Imf.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Imf.am 2012-12-31 00:54:48 UTC (rev 81916) +++ trunk/efl/src/Makefile_Ecore_Imf.am 2012-12-31 01:13:47 UTC (rev 81917) @@ -95,7 +95,7 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @IBUS_LIBS@ -modules_ecore_immodules_ibus_ibus_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_immodules_ibus_ibus_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_immodules_ibus_ibus_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -130,7 +130,7 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @SCIM_LIBS@ -modules_ecore_immodules_scim_scim_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_immodules_scim_scim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_immodules_scim_scim_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -158,6 +158,6 @@ lib/ecore/libecore.la \ lib/eo/libeo.la \ lib/eina/libeina.la -modules_ecore_immodules_xim_xim_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_ecore_immodules_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_immodules_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static endif Modified: trunk/efl/src/Makefile_Eina.am =================================================================== --- trunk/efl/src/Makefile_Eina.am 2012-12-31 00:54:48 UTC (rev 81916) +++ trunk/efl/src/Makefile_Eina.am 2012-12-31 01:13:47 UTC (rev 81917) @@ -164,7 +164,7 @@ 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 = @EFL_LTMODULE_FLAGS@ +chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -181,7 +181,7 @@ 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 = @EFL_LTMODULE_FLAGS@ +one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ one_big_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -198,7 +198,7 @@ pass_through_module_la_CFLAGS = @EINA_CFLAGS@ @VALGRIND_CFLAGS@ pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c pass_through_module_la_LIBADD = lib/eina/libeina.la @EINA_LIBS@ -pass_through_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -313,7 +313,7 @@ lib/eina/libeina.la \ @EINA_LIBS@ -tests_eina_module_dummy_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +tests_eina_module_dummy_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2012-12-31 00:54:48 UTC (rev 81916) +++ trunk/efl/src/Makefile_Evas.am 2012-12-31 01:13:47 UTC (rev 81917) @@ -378,7 +378,7 @@ -DEFL_EVAS_BUILD \ @EVAS_CFLAGS@ modules_evas_engines_software_generic_module_la_LIBADD = lib/evas/libevas.la -modules_evas_engines_software_generic_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_software_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -405,7 +405,7 @@ @EVAS_CFLAGS@ \ @USE_EVIL_CFLAGS@ modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la -modules_evas_engines_buffer_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -438,7 +438,7 @@ modules_evas_engines_fb_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_fb_libs@ -modules_evas_engines_fb_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -553,7 +553,7 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ lib/eet/libeet.la \ lib/evas/libevas.la -modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -595,7 +595,7 @@ lib/eet/libeet.la \ lib/evas/libevas.la \ @evas_engine_gl_cocoa_libs@ -modules_evas_engines_gl_cocoa_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -635,7 +635,7 @@ modules_evas_engines_gl_sdl_module_la_LIBADD += \ lib/evas/libevas.la \ @evas_engine_gl_sdl_libs@ -modules_evas_engines_gl_sdl_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_gl_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -677,7 +677,7 @@ lib/eet/libeet.la \ lib/evas/libevas.la \ @evas_engine_gl_xlib_libs@ -modules_evas_engines_gl_x11_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -709,7 +709,7 @@ modules_evas_engines_psl1ght_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_psl1ght_libs@ -modules_evas_engines_psl1ght_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -746,7 +746,7 @@ modules_evas_engines_software_ddraw_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_software_ddraw_libs@ -modules_evas_engines_software_ddraw_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_software_ddraw_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -781,7 +781,7 @@ modules_evas_engines_software_gdi_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_software_gdi_libs@ -modules_evas_engines_software_gdi_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_software_gdi_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -842,7 +842,7 @@ 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 $(SOFTWARE_X11_LIBADD) -modules_evas_engines_software_x11_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -879,7 +879,7 @@ lib/eet/libeet.la \ lib/evas/libevas.la \ @evas_engine_wayland_egl_libs@ -modules_evas_engines_wayland_egl_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_wayland_egl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -910,7 +910,7 @@ modules_evas_engines_wayland_shm_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_engine_wayland_shm_libs@ -modules_evas_engines_wayland_shm_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_engines_wayland_shm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -938,7 +938,7 @@ modules_evas_loaders_bmp_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_bmp_libs@ -modules_evas_loaders_bmp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -966,7 +966,7 @@ lib/evas/libevas.la \ lib/evas/libeet.la \ @evas_image_loader_eet_libs@ -modules_evas_loaders_eet_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -992,7 +992,7 @@ modules_evas_loaders_generic_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_generic_libs@ -modules_evas_loaders_generic_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1018,7 +1018,7 @@ modules_evas_loaders_gif_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_gif_libs@ -modules_evas_loaders_gif_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1044,7 +1044,7 @@ modules_evas_loaders_ico_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_ico_libs@ -modules_evas_loaders_ico_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1073,7 +1073,7 @@ modules_evas_loaders_jpeg_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_jpeg_libs@ -modules_evas_loaders_jpeg_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static if BUILD_SAVER_JPEG saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) @@ -1090,7 +1090,7 @@ modules_evas_savers_jpeg_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_jpeg_libs@ -modules_evas_savers_jpeg_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_savers_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1117,7 +1117,7 @@ modules_evas_loaders_pmaps_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_pmaps_libs@ -modules_evas_loaders_pmaps_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1143,7 +1143,7 @@ modules_evas_loaders_png_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_png_libs@ -modules_evas_loaders_png_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) @@ -1161,7 +1161,7 @@ modules_evas_savers_png_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_png_libs@ -modules_evas_savers_png_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_savers_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1187,7 +1187,7 @@ modules_evas_loaders_psd_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_psd_libs@ -modules_evas_loaders_psd_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1213,7 +1213,7 @@ modules_evas_loaders_svg_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_svg_libs@ -modules_evas_loaders_svg_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_svg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1239,7 +1239,7 @@ modules_evas_loaders_tga_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_tga_libs@ -modules_evas_loaders_tga_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1266,7 +1266,7 @@ modules_evas_loaders_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_tiff_libs@ -modules_evas_loaders_tiff_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) @@ -1285,7 +1285,7 @@ modules_evas_savers_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_tiff_libs@ -modules_evas_savers_tiff_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_savers_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1311,7 +1311,7 @@ modules_evas_loaders_wbmp_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_wbmp_libs@ -modules_evas_loaders_wbmp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1337,7 +1337,7 @@ modules_evas_loaders_webp_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_webp_libs@ -modules_evas_loaders_webp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1363,7 +1363,7 @@ modules_evas_loaders_xpm_module_la_LIBADD = \ lib/evas/libevas.la \ @evas_image_loader_xpm_libs@ -modules_evas_loaders_xpm_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +modules_evas_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1509,8 +1509,9 @@ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @EVAS_CFLAGS@ + bin_evas_loaders_bmp_module_la_LIBADD = @EVAS_LIBS@ -bin_evas_loaders_bmp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1532,7 +1533,7 @@ 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 = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1551,7 +1552,7 @@ @evas_image_loader_ico_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_ico_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_ico_libs@ -bin_evas_loaders_ico_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1570,7 +1571,7 @@ @evas_image_loader_jpeg_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_jpeg_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_jpeg_libs@ -bin_evas_loaders_jpeg_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1589,7 +1590,7 @@ @evas_image_loader_pmaps_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_pmaps_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_pmaps_libs@ -bin_evas_loaders_pmaps_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1608,7 +1609,7 @@ @evas_image_loader_png_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_png_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_png_libs@ -bin_evas_loaders_png_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1627,7 +1628,7 @@ @evas_image_loader_psd_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_psd_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_psd_libs@ -bin_evas_loaders_psd_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1646,7 +1647,7 @@ @evas_image_loader_tga_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_tga_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tga_libs@ -bin_evas_loaders_tga_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1665,7 +1666,7 @@ @evas_image_loader_tiff_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_tiff_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tiff_libs@ -bin_evas_loaders_tiff_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1684,7 +1685,7 @@ @evas_image_loader_wbmp_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_wbmp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_wbmp_libs@ -bin_evas_loaders_wbmp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1703,7 +1704,7 @@ @evas_image_loader_webp_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_webp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_webp_libs@ -bin_evas_loaders_webp_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -1722,7 +1723,7 @@ @evas_image_loader_xpm_cflags@ \ @EVAS_CFLAGS@ bin_evas_loaders_xpm_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_xpm_libs@ -bin_evas_loaders_xpm_module_la_LDFLAGS = @EFL_LTMODULE_FLAGS@ +bin_evas_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static endif |
From: Enlightenment S. <no-...@en...> - 2013-01-13 23:12:55
|
Log: efl/evas_cserve2 slave just need -lrt, not whole evas deps/libs Author: barbieri Date: 2013-01-13 15:12:40 -0800 (Sun, 13 Jan 2013) New Revision: 82732 Trac: http://trac.enlightenment.org/e/changeset/82732 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Evas.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2013-01-13 22:43:13 UTC (rev 82731) +++ trunk/efl/configure.ac 2013-01-13 23:12:40 UTC (rev 82732) @@ -1623,6 +1623,10 @@ if test "x${want_evas_cserve2}" = "xyes"; then if test "x${ac_cv_header_sys_epoll_h}" = "xno" || test "x${ac_cv_header_sys_inotify_h}" = "xno" || test "x${ac_cv_header_sys_signalfd_h}" = "xno"; then want_evas_cserve2="no" + else + EFL_CHECK_FUNC([EVAS_CSERVE2_SLAVE], [shm_open]) + EVAS_CSERVE2_SLAVE_LIBS="${requirements_libs_evas_cserve2_slave}" + AC_SUBST([EVAS_CSERVE2_SLAVE_LIBS]) fi fi Modified: trunk/efl/src/Makefile_Evas.am =================================================================== --- trunk/efl/src/Makefile_Evas.am 2013-01-13 22:43:13 UTC (rev 82731) +++ trunk/efl/src/Makefile_Evas.am 2013-01-13 23:12:40 UTC (rev 82732) @@ -1490,7 +1490,7 @@ bin_evas_evas_cserve2_slave_LDADD = \ lib/eina/libeina.la \ @EVAS_LDFLAGS@ \ -@EVAS_LIBS@ +@EVAS_CSERVE2_SLAVE_LIBS@ bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic @@ -1507,7 +1507,8 @@ @EVAS_CFLAGS@ bin_evas_dummy_slave_LDADD = \ -@EVAS_LIBS@ +@EVAS_LDFLAGS@ \ +@EVAS_CSERVE2_SLAVE_LIBS@ ### Cserve2 loaders |
From: Enlightenment S. <no-...@en...> - 2013-01-15 16:55:26
|
Log: fix scim and ibus imf dependencies. we must not use PKG_CHECK_MODULES() for internal dependencies, as their pc were not installed at the time of configure. Author: barbieri Date: 2013-01-15 08:55:14 -0800 (Tue, 15 Jan 2013) New Revision: 82825 Trac: http://trac.enlightenment.org/e/changeset/82825 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Ecore_Imf.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2013-01-15 16:17:36 UTC (rev 82824) +++ trunk/efl/configure.ac 2013-01-15 16:55:14 UTC (rev 82825) @@ -2708,7 +2708,7 @@ have_ecore_imf_ibus="no" if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then PKG_CHECK_MODULES([IBUS], - [ibus-1.0 >= 1.4 glib-2.0 evas ecore-x ecore-evas], + [ibus-1.0 >= 1.4 glib-2.0], [ have_ecore_imf_ibus="yes" AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support]) @@ -2722,7 +2722,7 @@ if test "x${want_ecore_imf_scim}" = "xyes" ; then PKG_CHECK_MODULES([SCIM], - [scim ecore-x ecore-evas], + [scim], [ have_ecore_imf_scim="yes" AC_DEFINE([BUILD_ECORE_IMF_SCIM], [1], [Ecore Imf SCIM Support]) Modified: trunk/efl/src/Makefile_Ecore_Imf.am =================================================================== --- trunk/efl/src/Makefile_Ecore_Imf.am 2013-01-15 16:17:36 UTC (rev 82824) +++ trunk/efl/src/Makefile_Ecore_Imf.am 2013-01-15 16:55:14 UTC (rev 82825) @@ -49,11 +49,18 @@ modules/ecore_imf/ibus/ibus_imcontext.h modules_ecore_imf_ibus_module_la_CPPFLAGS = \ @ECORE_IMF_CFLAGS@ \ +@ECORE_EVAS_CFLAGS@ \ +@ECORE_X_CFLAGS@ \ @IBUS_CFLAGS@ modules_ecore_imf_ibus_module_la_LIBADD = \ @USE_ECORE_IMF_LIBS@ \ +@USE_ECORE_EVAS_LIBS@ \ +@USE_ECORE_X_LIBS@ \ @IBUS_LIBS@ -modules_ecore_imf_ibus_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@ +modules_ecore_imf_ibus_module_la_DEPENDENCIES = \ +@USE_ECORE_IMF_INTERNAL_LIBS@ \ +@USE_ECORE_EVAS_INTERNAL_LIBS@ \ +@USE_ECORE_X_INTERNAL_LIBS@ modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static endif @@ -69,11 +76,18 @@ modules/ecore_imf/scim/scim_imcontext.h modules_ecore_imf_scim_module_la_CPPFLAGS = \ @ECORE_IMF_CFLAGS@ \ +@ECORE_EVAS_CFLAGS@ \ +@ECORE_X_CFLAGS@ \ @SCIM_CFLAGS@ modules_ecore_imf_scim_module_la_LIBADD = \ @USE_ECORE_IMF_LIBS@ \ +@USE_ECORE_EVAS_LIBS@ \ +@USE_ECORE_X_LIBS@ \ @SCIM_LIBS@ -modules_ecore_imf_scim_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@ +modules_ecore_imf_scim_module_la_DEPENDENCIES = \ +@USE_ECORE_IMF_INTERNAL_LIBS@ \ +@USE_ECORE_EVAS_INTERNAL_LIBS@ \ +@USE_ECORE_X_INTERNAL_LIBS@ modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static endif |
From: Enlightenment S. <no-...@en...> - 2013-01-16 21:05:28
|
Log: eeze's mount shouldn't be optional. eeze is just used on linux, where libmount exists and then we shouldn't make this an option so we can rely on eeze's mount being there. (the code keeps the #ifdef's for a while, in case we need to revert that later) Author: barbieri Date: 2013-01-16 13:05:19 -0800 (Wed, 16 Jan 2013) New Revision: 82901 Trac: http://trac.enlightenment.org/e/changeset/82901 Modified: trunk/efl/configure.ac trunk/efl/src/Makefile_Eeze.am Modified: trunk/efl/configure.ac =================================================================== --- trunk/efl/configure.ac 2013-01-16 20:53:35 UTC (rev 82900) +++ trunk/efl/configure.ac 2013-01-16 21:05:19 UTC (rev 82901) @@ -2987,18 +2987,6 @@ ], [want_tizen="no"]) -AC_ARG_ENABLE([mount], - [AC_HELP_STRING([--disable-mount], - [disable mount support (libmount). @<:@default=enabled@:>@])], - [ - if test "x${enableval}" = "xyes" ; then - want_mount="yes" - else - want_mount="no" - fi - ], - [want_mount="yes"]) - AC_ARG_WITH([mount], [AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@])], [with_eeze_mount=$withval], [with_eeze_mount="detect"]) @@ -3017,12 +3005,12 @@ EFL_INTERNAL_DEPEND_PKG([EEZE], [eina]) EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore]) EFL_INTERNAL_DEPEND_PKG([EEZE], [eo]) -EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-file]) -EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-con]) -EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [eet]) +EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-file]) +EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-con]) +EFL_INTERNAL_DEPEND_PKG([EEZE], [eet]) EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148]) -EFL_OPTIONAL_DEPEND_PKG([EEZE], [${want_mount}], [EEZE_MOUNT], [mount >= 2.20.0]) +EFL_DEPEND_PKG([EEZE], [EEZE_MOUNT], [mount >= 2.20.0]) ## modules if test "${want_tizen}" = "yes"; then @@ -3061,7 +3049,6 @@ EFL_LIB_END_OPTIONAL([Eeze]) -AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${want_mount}" = "xyes"]) AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"]) #### End of Eeze Modified: trunk/efl/src/Makefile_Eeze.am =================================================================== --- trunk/efl/src/Makefile_Eeze.am 2013-01-16 20:53:35 UTC (rev 82900) +++ trunk/efl/src/Makefile_Eeze.am 2013-01-16 21:05:19 UTC (rev 82901) @@ -9,32 +9,28 @@ dist_installed_eezemainheaders_DATA = \ lib/eeze/Eeze.h \ lib/eeze/Eeze_Net.h \ -lib/eeze/Eeze_Sensor.h +lib/eeze/Eeze_Sensor.h \ +lib/eeze/Eeze_Disk.h # libeeze.la lib_eeze_libeeze_la_SOURCES = \ +lib/eeze/eeze_disk.c \ +lib/eeze/eeze_disk_libmount_new.c \ +lib/eeze/eeze_disk_mount.c \ +lib/eeze/eeze_disk_private.h \ +lib/eeze/eeze_disk_udev.c \ lib/eeze/eeze_main.c \ lib/eeze/eeze_net.c \ lib/eeze/eeze_net_private.h \ +lib/eeze/eeze_sensor.c \ +lib/eeze/eeze_sensor_private.h \ lib/eeze/eeze_udev_find.c \ -lib/eeze/eeze_udev_private.h \ lib/eeze/eeze_udev_private.c \ +lib/eeze/eeze_udev_private.h \ lib/eeze/eeze_udev_syspath.c \ lib/eeze/eeze_udev_walk.c \ -lib/eeze/eeze_udev_watch.c \ -lib/eeze/eeze_sensor_private.h \ -lib/eeze/eeze_sensor.c +lib/eeze/eeze_udev_watch.c -if HAVE_EEZE_MOUNT -dist_installed_eezemainheaders_DATA += lib/eeze/Eeze_Disk.h -lib_eeze_libeeze_la_SOURCES += \ -lib/eeze/eeze_disk.c \ -lib/eeze/eeze_disk_udev.c \ -lib/eeze/eeze_disk_mount.c \ -lib/eeze/eeze_disk_private.h \ -lib/eeze/eeze_disk_libmount_new.c -endif - lib_eeze_libeeze_la_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @@ -86,7 +82,6 @@ bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@ bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ -if HAVE_EEZE_MOUNT bin_PROGRAMS += \ bin/eeze/eeze_mount \ bin/eeze/eeze_umount \ @@ -114,7 +109,6 @@ bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@ bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@ bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@ -endif setuid_root_mode = a=rx,u+xs install-data-hook:: |