cedric pushed a commit to branch master.
commit 26e01c0ff6711114c4e3985d51e1208b77fa3fd8
Author: Jean-Philippe Andre <[email protected]>
Date: Thu Jun 27 15:31:20 2013 +0900
evas: build evas_module within cserve slave
Objective: use common loaders from cserve2
Ideally evas_module should be a static library but it would
then require static/dynamic linking to too many modules unused
by cserve2 (eg. engines & savers)
Signed-off-by: Cedric Bail <[email protected]>
---
src/Makefile_Evas.am | 275 +++++++++++++++++++++++++++++++++------------------
1 file changed, 178 insertions(+), 97 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index d4fe9aa..7850af6 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -109,12 +109,15 @@ lib/evas/cserve2/evas_cs2_utils.c
endif
# File
-lib_evas_libevas_la_SOURCES += \
-lib/evas/file/evas_path.c \
+lib_evas_file_SOURCES = \
lib/evas/file/evas_module.c \
lib/evas/file/evas_module.h \
+lib/evas/file/evas_path.c \
lib/evas/file/evas_path.h
+lib_evas_libevas_la_SOURCES += \
+$(lib_evas_file_SOURCES)
+
# Engine
lib_evas_libevas_la_SOURCES += \
lib/evas/common/evas_op_copy_main_.c \
@@ -981,6 +984,108 @@ endif
endif
+### Cserve2 binary
+
+if EVAS_CSERVE2
+
+evascserve2internal_bindir=$(libdir)/evas/cserve2/bin/$(MODULE_ARCH)
+evascserve2internal_bin_PROGRAMS = \
+bin/evas/evas_cserve2 \
+bin/evas/evas_cserve2_slave
+
+noinst_PROGRAMS += \
+bin/evas/dummy_slave
+
+bin_PROGRAMS += \
+bin/evas/evas_cserve2_client \
+bin/evas/evas_cserve2_usage \
+bin/evas/evas_cserve2_debug
+
+bin_evas_evas_cserve2_SOURCES = \
+bin/evas/evas_cserve2.h \
+bin/evas/evas_cserve2_slave.h \
+bin/evas/evas_cserve2_main.c \
+bin/evas/evas_cserve2_slaves.c \
+bin/evas/evas_cserve2_messages.c \
+bin/evas/evas_cserve2_shm.c \
+bin/evas/evas_cserve2_cache.c \
+bin/evas/evas_cserve2_requests.c \
+bin/evas/evas_cserve2_fonts.c \
+bin/evas/evas_cserve2_scale.c \
+bin/evas/evas_cserve2_main_loop_linux.c \
+lib/evas/cserve2/evas_cs2_utils.h \
+lib/evas/cserve2/evas_cs2_utils.c
+
+bin_evas_evas_cserve2_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-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_client_SOURCES = \
+bin/evas/evas_cserve2_client.c
+bin_evas_evas_cserve2_client_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EINA_CFLAGS@
+bin_evas_evas_cserve2_client_LDADD = @USE_EINA_LIBS@
+bin_evas_evas_cserve2_client_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+bin_evas_evas_cserve2_usage_SOURCES = \
+bin/evas/evas_cserve2_usage.c
+bin_evas_evas_cserve2_usage_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EINA_CFLAGS@
+bin_evas_evas_cserve2_usage_LDADD = @USE_EINA_LIBS@
+bin_evas_evas_cserve2_usage_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+bin_evas_evas_cserve2_debug_SOURCES = \
+bin/evas/evas_cserve2_debug.c
+bin_evas_evas_cserve2_debug_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EINA_CFLAGS@
+bin_evas_evas_cserve2_debug_LDADD = @USE_EINA_LIBS@
+bin_evas_evas_cserve2_debug_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+
+bin_evas_evas_cserve2_slave_SOURCES = \
+bin/evas/evas_cserve2_slave.c \
+bin/evas/evas_cserve2_utils.c \
+$(lib_evas_file_SOURCES)
+
+bin_evas_evas_cserve2_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+-DEVAS_MODULE_NO_ENGINES=1 \
+-DEVAS_MODULE_NO_IMAGE_SAVERS=1 \
+@EVAS_CFLAGS@
+
+bin_evas_evas_cserve2_slave_LDADD = @EVAS_CSERVE2_SLAVE_LIBS@ @USE_EINA_LIBS@
+bin_evas_evas_cserve2_slave_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
+bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic
+
+bin_evas_dummy_slave_SOURCES = \
+bin/evas/dummy_slave.c
+
+bin_evas_dummy_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EVAS_CFLAGS@
+
+bin_evas_dummy_slave_LDADD = \
+@EVAS_LDFLAGS@ \
+@EVAS_CSERVE2_SLAVE_LIBS@
+
+endif
+
+
### Loaders and savers
if BUILD_LOADER_BMP
@@ -988,6 +1093,11 @@ if EVAS_STATIC_BUILD_BMP
lib_evas_libevas_la_SOURCES += modules/evas/loaders/bmp/evas_image_load_bmp.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_bmp_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_bmp_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/bmp/evas_image_load_bmp.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_bmp_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_bmp_libs@
+endif
else
loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
@@ -1010,6 +1120,11 @@ if EVAS_STATIC_BUILD_EET
lib_evas_libevas_la_SOURCES += modules/evas/loaders/eet/evas_image_load_eet.c
modules/evas/savers/eet/evas_image_save_eet.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_eet_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_eet_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/eet/evas_image_load_eet.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_eet_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @USE_EET_LIBS@
@evas_image_loader_eet_libs@
+endif
else
loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la
@@ -1032,6 +1147,11 @@ if EVAS_STATIC_BUILD_GENERIC
lib_evas_libevas_la_SOURCES +=
modules/evas/loaders/generic/evas_image_load_generic.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_generic_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_generic_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/generic/evas_image_load_generic.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_generic_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_generic_libs@
+endif
else
loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la
@@ -1054,6 +1174,11 @@ if EVAS_STATIC_BUILD_GIF
lib_evas_libevas_la_SOURCES += modules/evas/loaders/gif/evas_image_load_gif.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_gif_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_gif_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/gif/evas_image_load_gif.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_gif_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_gif_libs@
+endif
else
loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la
@@ -1076,6 +1201,11 @@ if EVAS_STATIC_BUILD_ICO
lib_evas_libevas_la_SOURCES += modules/evas/loaders/ico/evas_image_load_ico.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_ico_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_ico_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/ico/evas_image_load_ico.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_ico_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_ico_libs@
+endif
else
loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH)
loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la
@@ -1101,6 +1231,11 @@ lib_evas_libevas_la_SOURCES +=
modules/evas/savers/jpeg/evas_image_save_jpeg.c
endif
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_jpeg_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_jpeg_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/jpeg/evas_image_load_jpeg.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_jpeg_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_jpeg_libs@
+endif
else
loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la
@@ -1138,6 +1273,11 @@ if EVAS_STATIC_BUILD_PMAPS
lib_evas_libevas_la_SOURCES +=
modules/evas/loaders/pmaps/evas_image_load_pmaps.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_pmaps_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_pmaps_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/pmaps/evas_image_load_pmaps.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_pmaps_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_pmaps_libs@
+endif
else
loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la
@@ -1160,6 +1300,12 @@ if EVAS_STATIC_BUILD_PNG
lib_evas_libevas_la_SOURCES += modules/evas/loaders/png/evas_image_load_png.c
modules/evas/savers/png/evas_image_save_png.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_png_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_png_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/png/evas_image_load_png.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_png_cflags@
+# FIXME: Problem here, forcing link to png12.
+bin_evas_evas_cserve2_slave_LDADD += -lpng12 @evas_image_loader_png_libs@
+endif
else
loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la
@@ -1196,6 +1342,11 @@ if EVAS_STATIC_BUILD_PSD
lib_evas_libevas_la_SOURCES += modules/evas/loaders/psd/evas_image_load_psd.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_psd_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_psd_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/psd/evas_image_load_psd.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_psd_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_psd_libs@
+endif
else
loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH)
loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la
@@ -1218,6 +1369,11 @@ if EVAS_STATIC_BUILD_TGA
lib_evas_libevas_la_SOURCES += modules/evas/loaders/tga/evas_image_load_tga.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tga_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_tga_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/tga/evas_image_load_tga.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_tga_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tga_libs@
+endif
else
loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH)
loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la
@@ -1240,6 +1396,11 @@ if EVAS_STATIC_BUILD_TIFF
lib_evas_libevas_la_SOURCES +=
modules/evas/loaders/tiff/evas_image_load_tiff.c
modules/evas/savers/tiff/evas_image_save_tiff.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tiff_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_tiff_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/tiff/evas_image_load_tiff.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_tiff_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tiff_libs@
+endif
else
loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la
@@ -1276,6 +1437,11 @@ if EVAS_STATIC_BUILD_WBMP
lib_evas_libevas_la_SOURCES += modules/evas/loaders/wbmp/evas_image_load_wbmp.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_wbmp_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_wbmp_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/wbmp/evas_image_load_wbmp.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_wbmp_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_wbmp_libs@
+endif
else
loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH)
loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la
@@ -1298,6 +1464,11 @@ if EVAS_STATIC_BUILD_WEBP
lib_evas_libevas_la_SOURCES +=
modules/evas/loaders/webp/evas_image_load_webp.c
modules/evas/savers/webp/evas_image_save_webp.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_webp_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_webp_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/webp/evas_image_load_webp.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_webp_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_webp_libs@
+endif
else
loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH)
loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la
@@ -1334,6 +1505,11 @@ if EVAS_STATIC_BUILD_XPM
lib_evas_libevas_la_SOURCES += modules/evas/loaders/xpm/evas_image_load_xpm.c
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_xpm_cflags@
lib_evas_libevas_la_LIBADD += @evas_image_loader_xpm_libs@
+if EVAS_CSERVE2
+bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/xpm/evas_image_load_xpm.c
+bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_xpm_cflags@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_xpm_libs@
+endif
else
loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la
@@ -1351,100 +1527,6 @@ modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS =
--tag=disable-static
endif
endif
-### binary (cserve2)
-
-if EVAS_CSERVE2
-
-evascserve2internal_bindir=$(libdir)/evas/cserve2/bin/$(MODULE_ARCH)
-evascserve2internal_bin_PROGRAMS = \
-bin/evas/evas_cserve2 \
-bin/evas/evas_cserve2_slave
-
-noinst_PROGRAMS += \
-bin/evas/dummy_slave
-
-bin_PROGRAMS += \
-bin/evas/evas_cserve2_client \
-bin/evas/evas_cserve2_usage \
-bin/evas/evas_cserve2_debug
-
-bin_evas_evas_cserve2_SOURCES = \
-bin/evas/evas_cserve2.h \
-bin/evas/evas_cserve2_slave.h \
-bin/evas/evas_cserve2_main.c \
-bin/evas/evas_cserve2_slaves.c \
-bin/evas/evas_cserve2_messages.c \
-bin/evas/evas_cserve2_shm.c \
-bin/evas/evas_cserve2_cache.c \
-bin/evas/evas_cserve2_requests.c \
-bin/evas/evas_cserve2_fonts.c \
-bin/evas/evas_cserve2_scale.c \
-bin/evas/evas_cserve2_main_loop_linux.c \
-lib/evas/cserve2/evas_cs2_utils.h \
-lib/evas/cserve2/evas_cs2_utils.c
-
-bin_evas_evas_cserve2_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_srcdir)/src/lib/evas/include \
--I$(top_srcdir)/src/lib/evas/cserve2 \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--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_client_SOURCES = \
-bin/evas/evas_cserve2_client.c
-bin_evas_evas_cserve2_client_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_srcdir)/src/lib/evas/cserve2 \
-@EINA_CFLAGS@
-bin_evas_evas_cserve2_client_LDADD = @USE_EINA_LIBS@
-bin_evas_evas_cserve2_client_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
-
-bin_evas_evas_cserve2_usage_SOURCES = \
-bin/evas/evas_cserve2_usage.c
-bin_evas_evas_cserve2_usage_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_srcdir)/src/lib/evas/cserve2 \
-@EINA_CFLAGS@
-bin_evas_evas_cserve2_usage_LDADD = @USE_EINA_LIBS@
-bin_evas_evas_cserve2_usage_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
-
-bin_evas_evas_cserve2_debug_SOURCES = \
-bin/evas/evas_cserve2_debug.c
-bin_evas_evas_cserve2_debug_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_srcdir)/src/lib/evas/cserve2 \
-@EINA_CFLAGS@
-bin_evas_evas_cserve2_debug_LDADD = @USE_EINA_LIBS@
-bin_evas_evas_cserve2_debug_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
-
-bin_evas_evas_cserve2_slave_SOURCES = \
-bin/evas/evas_cserve2_slave.c \
-bin/evas/evas_cserve2_utils.c
-
-bin_evas_evas_cserve2_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_srcdir)/src/lib/evas/include \
--I$(top_srcdir)/src/lib/evas/cserve2 \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
-@EVAS_CFLAGS@
-
-bin_evas_evas_cserve2_slave_LDADD = @EVAS_CSERVE2_SLAVE_LIBS@ @USE_EINA_LIBS@
-bin_evas_evas_cserve2_slave_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
-bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic
-
-bin_evas_dummy_slave_SOURCES = \
-bin/evas/dummy_slave.c
-
-bin_evas_dummy_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
--I$(top_srcdir)/src/lib/evas/include \
--I$(top_srcdir)/src/lib/evas/cserve2 \
-@EVAS_CFLAGS@
-
-bin_evas_dummy_slave_LDADD = \
-@EVAS_LDFLAGS@ \
-@EVAS_CSERVE2_SLAVE_LIBS@
### Cserve2 loaders
@@ -1639,7 +1721,6 @@ bin_evas_loaders_xpm_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
-endif
### Unit tests
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
