sorry - have to revert this as this brings the efl tree build to a

grinding halt - it wasn't great before.. but now it's totally broken. :(
e.g.:

/bin/bash ../libtool  --tag=CC   --mode=link ccache gcc -std=gnu99
-O2 -g -pipe -march=native -fvisibility=hidden -ffast-math -W -Wall
-Wextra -Wno-shadow -Wno-unused-but-set-parameter   -o bin/eet/eet
bin/eet/bin_eet_eet-eet_main.o -fvisibility=hidden -fdata-sections
-ffunction-sections -Wl,--gc-sections -fno-strict-aliasing
-Wl,--as-needed -Wl,--no-copy-dt-needed-entries    lib/eet/libeet.la

libtool: link: ccache gcc -std=gnu99 -O2 -g -pipe -march=native
-fvisibility=hidden -ffast-math -W -Wall -Wextra -Wno-shadow
-Wno-unused-but-set-parameter -o bin/eet/.libs/eet
bin/eet/bin_eet_eet-eet_main.o -fvisibility=hidden -fdata-sections
-ffunction-sections -Wl,--gc-sections -fno-strict-aliasing
-Wl,--as-needed -Wl,--no-copy-dt-needed-entries  lib/eet/.libs/libeet.so
/usr/bin/ld: bin/eet/bin_eet_eet-eet_main.o: undefined reference to
symbol 'eina_iterator_next'
/usr/bin/ld: note: 'eina_iterator_next' is defined in DSO
/usr/local/lib/libeina.so.1 so try adding it to the linker command line
/usr/local/lib/libeina.so.1: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

SVN revision: 83112

diff --git a/m4/efl.m4 b/m4/efl.m4
index 97b1583..cd730b3 100644 (file)
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -288,9 +288,9 @@ dnl     PKG_INTERNAL_LIBS: all other EFL as lib/name/libname.la that this
 dnl             package depend. Used in automake's _DEPENDENCIES.
 dnl
 dnl     USE_PKG_LIBS: what to use in automake's _LIBADD or _LDADD when using
-dnl             this PKG (libpkg.la and public dependencies)
+dnl             this PKG (PKG_LIBS + libpkg.la)
 dnl
-dnl     USE_PKG_INTERNAL_LIBS: lib/pkg/libpkg.la
+dnl     USE_PKG_INTERNAL_LIBS: extends PKG_INTERNAL_LIBS with lib/pkg/libpkg.la
 dnl
 dnl     requirements_pc_pkg: all pkg-config (pc) files used by this pkg,
 dnl             includes internal EFL (used in 'Requires.private' in pkg.pc)
@@ -366,8 +366,8 @@ esac
 m4_defn([UP])_LDFLAGS="${EFL_COV_LDFLAGS} ${EFL_LDFLAGS} ${m4_defn([UP])_LDFLAGS}"
 m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${m4_defn([UP])_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])} ${requirements_internal_deps_libs_[]m4_defn([DOWN])} ${requirements_public_libs_[]m4_defn([DOWN])} ${requirements_libs_[]m4_defn([DOWN])} ${requirements_libs_efl} "
 m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
-USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_public_libs_[]m4_defn([DOWN])} ${requirements_libs_efl}"
-USE_[]m4_defn([UP])_INTERNAL_LIBS="lib/${libdirname}/lib${libname}.la"
+USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
+USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la ${requirements_internal_deps_libs_[]m4_defn([DOWN])}"
 m4_defn([UP])_CFLAGS="${EFL_COV_CFLAGS} ${EFL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1"
 requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
 requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 900d3f6..9cd224a 100644 (file)
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1346,8 +1346,8 @@ bin_evas_loaders_bmp_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@
 
-bin_evas_loaders_bmp_module_la_LIBADD = @USE_EVAS_LIBS@
-bin_evas_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_bmp_module_la_LIBADD = @EVAS_LIBS@
+bin_evas_loaders_bmp_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1363,11 +1363,11 @@ bin_evas_loaders_eet_module_la_CPPFLAGS = \
 @EVAS_CFLAGS@ \
 @evas_image_loader_eet_cflags@
 bin_evas_loaders_eet_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@EVAS_LIBS@ \
 @USE_EET_LIBS@
 @evas_image_loader_eet_libs@
 bin_evas_loaders_eet_module_la_DEPENDENCIES = \
-@USE_EVAS_INTERNAL_LIBS@ \
+@EVAS_INTERNAL_LIBS@ \
 @USE_EET_INTERNAL_LIBS@
 bin_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1383,8 +1383,8 @@ bin_evas_loaders_ico_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_ico_cflags@
-bin_evas_loaders_ico_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_ico_libs@
-bin_evas_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_ico_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_ico_libs@
+bin_evas_loaders_ico_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1399,8 +1399,8 @@ bin_evas_loaders_jpeg_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_jpeg_cflags@
-bin_evas_loaders_jpeg_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_jpeg_libs@
-bin_evas_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_jpeg_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_jpeg_libs@
+bin_evas_loaders_jpeg_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1415,8 +1415,8 @@ bin_evas_loaders_pmaps_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 @EVAS_CFLAGS@ \
 @evas_image_loader_pmaps_cflags@
-bin_evas_loaders_pmaps_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_pmaps_libs@
-bin_evas_loaders_pmaps_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_pmaps_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_pmaps_libs@
+bin_evas_loaders_pmaps_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1431,8 +1431,8 @@ bin_evas_loaders_png_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_png_cflags@
-bin_evas_loaders_png_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_png_libs@
-bin_evas_loaders_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_png_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_png_libs@
+bin_evas_loaders_png_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1447,8 +1447,8 @@ bin_evas_loaders_psd_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_psd_cflags@
-bin_evas_loaders_psd_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_psd_libs@
-bin_evas_loaders_psd_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_psd_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_psd_libs@
+bin_evas_loaders_psd_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1463,8 +1463,8 @@ bin_evas_loaders_tga_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_tga_cflags@
-bin_evas_loaders_tga_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_tga_libs@
-bin_evas_loaders_tga_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_tga_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tga_libs@
+bin_evas_loaders_tga_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1479,8 +1479,8 @@ bin_evas_loaders_tiff_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_tiff_cflags@
-bin_evas_loaders_tiff_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_tiff_libs@
-bin_evas_loaders_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_tiff_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tiff_libs@
+bin_evas_loaders_tiff_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1495,8 +1495,8 @@ bin_evas_loaders_wbmp_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_wbmp_cflags@
-bin_evas_loaders_wbmp_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_wbmp_libs@
-bin_evas_loaders_wbmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_wbmp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_wbmp_libs@
+bin_evas_loaders_wbmp_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1511,8 +1511,8 @@ bin_evas_loaders_webp_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_webp_cflags@
-bin_evas_loaders_webp_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_webp_libs@
-bin_evas_loaders_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_webp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_webp_libs@
+bin_evas_loaders_webp_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif
@@ -1527,8 +1527,8 @@ bin_evas_loaders_xpm_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/bin/evas \
 @EVAS_CFLAGS@ \
 @evas_image_loader_xpm_cflags@
-bin_evas_loaders_xpm_module_la_LIBADD = @USE_EVAS_LIBS@ @evas_image_loader_xpm_libs@
-bin_evas_loaders_xpm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_loaders_xpm_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_xpm_libs@
+bin_evas_loaders_xpm_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
 bin_evas_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif