tasn pushed a commit to branch devs/tasn/jenkins.
commit bbcff2eb6a4a9a062b4d1d0da4500fc32714f649
Author: Tom Hacohen <[email protected]>
Date: Fri Mar 8 17:21:01 2013 +0000
Attempt to fix jenkins. Just a spray fix, will not be merged to master.
---
src/Makefile_Evas.am | 132 +++++++++++++++++++++++++--------------------------
1 file changed, 66 insertions(+), 66 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index e6ecfd4..62f51b8 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -363,8 +363,8 @@ modules_evas_engines_software_generic_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
-modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
-modules_evas_engines_software_generic_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
@EVAS_LIBS@ @EVAS_LIBS@
+modules_evas_engines_software_generic_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@
modules_evas_engines_software_generic_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS =
--tag=disable-static
endif
@@ -385,8 +385,8 @@ modules_evas_engines_buffer_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
-modules_evas_engines_buffer_module_la_LIBADD = @USE_EVAS_LIBS@
-modules_evas_engines_buffer_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_buffer_module_la_LIBADD = @USE_EVAS_LIBS@ @EVAS_LIBS@
@EVAS_LIBS@
+modules_evas_engines_buffer_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -414,9 +414,9 @@ modules_evas_engines_fb_module_la_CPPFLAGS = \
@evas_engine_fb_cflags@ \
@EVAS_CFLAGS@
modules_evas_engines_fb_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_fb_libs@
-modules_evas_engines_fb_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_fb_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -592,8 +592,8 @@
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
if BUILD_ENGINE_GL_X11
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS +=
@evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
endif
-modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD =
@USE_EVAS_LIBS@
-modules_evas_engines_gl_common_libevas_engine_gl_common_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD =
@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@
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
@@ -627,9 +627,9 @@ modules_evas_engines_gl_cocoa_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_cocoa_module_la_LIBADD += \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_gl_cocoa_libs@
-modules_evas_engines_gl_cocoa_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_gl_cocoa_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@
modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -662,10 +662,10 @@ modules_evas_engines_gl_sdl_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_sdl_module_la_LIBADD += \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_gl_sdl_libs@
modules_evas_engines_gl_sdl_module_la_DEPENDENCIES = \
-@USE_EVAS_INTERNAL_LIBS@ \
+@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@ \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_gl_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -702,11 +702,11 @@ modules_evas_engines_gl_x11_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_x11_module_la_LIBADD += \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_gl_xlib_libs@ \
@evas_engine_gl_xcb_libs@
modules_evas_engines_gl_x11_module_la_DEPENDENCIES = \
-@USE_EVAS_INTERNAL_LIBS@ \
+@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@ \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -734,9 +734,9 @@ modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_engine_psl1ght_cflags@
modules_evas_engines_psl1ght_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_psl1ght_libs@
-modules_evas_engines_psl1ght_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_psl1ght_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -766,9 +766,9 @@ modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
@evas_engine_software_ddraw_cflags@
modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti
-fno-exceptions
modules_evas_engines_software_ddraw_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_software_ddraw_libs@
-modules_evas_engines_software_ddraw_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_ddraw_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@
modules_evas_engines_software_ddraw_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS =
--tag=disable-static
endif
@@ -796,9 +796,9 @@ modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_engine_software_gdi_cflags@
modules_evas_engines_software_gdi_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_software_gdi_libs@
-modules_evas_engines_software_gdi_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_gdi_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@
modules_evas_engines_software_gdi_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -855,8 +855,8 @@ enginesoftwarex11pkgdir =
$(libdir)/evas/modules/engines/software_x11/$(MODULE_A
enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS)
-modules_evas_engines_software_x11_module_la_LIBADD = @USE_EVAS_LIBS@
$(SOFTWARE_X11_LIBADD)
-modules_evas_engines_software_x11_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_software_x11_module_la_LIBADD = @USE_EVAS_LIBS@
@EVAS_LIBS@ @EVAS_LIBS@ $(SOFTWARE_X11_LIBADD)
+modules_evas_engines_software_x11_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@
modules_evas_engines_software_x11_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -885,11 +885,11 @@ modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_engine_wayland_egl_cflags@
modules_evas_engines_wayland_egl_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@evas_engine_wayland_egl_libs@
modules_evas_engines_wayland_egl_module_la_DEPENDENCIES = \
-@USE_EVAS_INTERNAL_LIBS@ \
+@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@ \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_wayland_egl_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -920,9 +920,9 @@ modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_engine_wayland_shm_cflags@
modules_evas_engines_wayland_shm_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_engine_wayland_shm_libs@
-modules_evas_engines_wayland_shm_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@
+modules_evas_engines_wayland_shm_module_la_DEPENDENCIES =
@USE_EVAS_INTERNAL_LIBS@ @EVAS_INTERNALLIBS@
modules_evas_engines_wayland_shm_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -944,9 +944,9 @@ modules_evas_loaders_bmp_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_bmp_cflags@
modules_evas_loaders_bmp_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_bmp_libs@
-modules_evas_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -966,9 +966,9 @@ modules_evas_loaders_eet_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_eet_cflags@
modules_evas_loaders_eet_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_eet_libs@
-modules_evas_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -988,9 +988,9 @@ modules_evas_loaders_generic_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_generic_cflags@
modules_evas_loaders_generic_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_generic_libs@
-modules_evas_loaders_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1010,9 +1010,9 @@ modules_evas_loaders_gif_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_gif_cflags@
modules_evas_loaders_gif_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_gif_libs@
-modules_evas_loaders_gif_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_gif_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1032,9 +1032,9 @@ modules_evas_loaders_ico_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_ico_cflags@
modules_evas_loaders_ico_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_ico_libs@
-modules_evas_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1057,9 +1057,9 @@ modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_jpeg_cflags@
modules_evas_loaders_jpeg_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_jpeg_libs@
-modules_evas_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
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
@@ -1071,9 +1071,9 @@ modules_evas_savers_jpeg_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_jpeg_cflags@
modules_evas_savers_jpeg_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_jpeg_libs@
-modules_evas_savers_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_savers_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_savers_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1094,9 +1094,9 @@ modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_pmaps_cflags@
modules_evas_loaders_pmaps_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_pmaps_libs@
-modules_evas_loaders_pmaps_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_pmaps_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1116,9 +1116,9 @@ modules_evas_loaders_png_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_png_cflags@
modules_evas_loaders_png_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_png_libs@
-modules_evas_loaders_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1130,9 +1130,9 @@ modules_evas_savers_png_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_png_cflags@
modules_evas_savers_png_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_png_libs@
-modules_evas_savers_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_savers_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_savers_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1152,9 +1152,9 @@ modules_evas_loaders_psd_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_psd_cflags@
modules_evas_loaders_psd_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_psd_libs@
-modules_evas_loaders_psd_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_psd_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1174,9 +1174,9 @@ modules_evas_loaders_svg_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_svg_cflags@
modules_evas_loaders_svg_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_svg_libs@
-modules_evas_loaders_svg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_svg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_svg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1196,9 +1196,9 @@ modules_evas_loaders_tga_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_tga_cflags@
modules_evas_loaders_tga_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_tga_libs@
-modules_evas_loaders_tga_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_tga_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1218,9 +1218,9 @@ modules_evas_loaders_tiff_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_tiff_cflags@
modules_evas_loaders_tiff_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_tiff_libs@
-modules_evas_loaders_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1232,9 +1232,9 @@ modules_evas_savers_tiff_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_tiff_cflags@
modules_evas_savers_tiff_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_tiff_libs@
-modules_evas_savers_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_savers_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_savers_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1254,9 +1254,9 @@ modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_wbmp_cflags@
modules_evas_loaders_wbmp_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_wbmp_libs@
-modules_evas_loaders_wbmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_wbmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1276,9 +1276,9 @@ modules_evas_loaders_webp_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_webp_cflags@
modules_evas_loaders_webp_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_webp_libs@
-modules_evas_loaders_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1298,9 +1298,9 @@ modules_evas_loaders_xpm_module_la_CPPFLAGS = \
@EVAS_CFLAGS@ \
@evas_image_loader_xpm_cflags@
modules_evas_loaders_xpm_module_la_LIBADD = \
-@USE_EVAS_LIBS@ \
+@USE_EVAS_LIBS@ @EVAS_LIBS@ \
@evas_image_loader_xpm_libs@
-modules_evas_loaders_xpm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+modules_evas_loaders_xpm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
modules_evas_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1346,8 +1346,8 @@ bin_evas_evas_cserve2_CPPFLAGS = \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
@EVAS_CFLAGS@
-bin_evas_evas_cserve2_LDADD = @USE_EVAS_LIBS@
-bin_evas_evas_cserve2_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+bin_evas_evas_cserve2_LDADD = @USE_EVAS_LIBS@ @EVAS_LIBS@
+bin_evas_evas_cserve2_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
bin_evas_evas_cserve2_client_SOURCES = \
bin/evas/evas_cserve2_client.c
@@ -1624,8 +1624,8 @@ tests_evas_evas_suite_CPPFLAGS = \
@CHECK_CFLAGS@ \
@EVAS_CFLAGS@
-tests_evas_evas_suite_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@
-tests_evas_evas_suite_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
+tests_evas_evas_suite_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@ @EVAS_LIBS@
+tests_evas_evas_suite_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@EVAS_INTERNALLIBS@
endif
EXTRA_DIST += \
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
