efl: fix compilation on Windows when no Evil library is installed.

configure.ac

@@ -823,6 +823,9 @@ EFL_LIB_START([Eo])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EO] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EO], [eina])
 
@@ -2030,6 +2033,9 @@ EFL_LIB_START([Ecore_Ipc])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_IPC] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore])
@@ -2066,6 +2072,9 @@ EFL_LIB_START([Ecore_File])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_FILE] [evil])
+
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([ECORE_FILE], [escape])
 EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con])
@@ -2098,6 +2107,9 @@ EFL_LIB_START([Ecore_Input])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_INPUT] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eo])
@@ -2128,6 +2140,9 @@ EFL_LIB_START([Ecore_Input_Evas])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_INPUT_EVAS] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore])
@@ -2391,6 +2406,9 @@ AC_ARG_ENABLE([pulseaudio],
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_AUDIO] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet])
@@ -2749,6 +2767,9 @@ fi
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_IMF] [evil])
+
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([ECORE_IMF], [escape])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore])
@@ -2835,6 +2856,9 @@ EFL_LIB_START([Ecore_Imf_Evas])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS] [evil])
+
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf])
@@ -2880,6 +2904,9 @@ fi
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ECORE_EVAS] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input-evas])
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input])
@@ -3024,6 +3051,9 @@ EFL_LIB_START([Eio])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EIO] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EIO], [ecore])
 EFL_INTERNAL_DEPEND_PKG([EIO], [eet])
@@ -3059,6 +3089,9 @@ EFL_LIB_START([EDBus])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EDBUS] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EDBUS], [ecore])
 EFL_INTERNAL_DEPEND_PKG([EDBUS], [eo])
@@ -3095,6 +3128,9 @@ AC_DEFINE([SLOPPY_SPEC], [1], [Sloppy Spec Compliance])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([EFREET] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([EFREET], [eet])
 EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore])
@@ -3477,6 +3513,9 @@ EFL_LIB_START([Ethumb])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ETHUMB] [evil])
+
 ### Checks for libraries
 EFL_PLATFORM_DEPEND([EINA], [evil])
 
@@ -3518,6 +3557,9 @@ EFL_LIB_START([Ethumb_Client])
 
 ### Checks for programs
 
+## Compatibility layers
+EFL_PLATFORM_DEPEND([ETHUMB_CLIENT] [evil])
+
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo])

src/Makefile_EDBus.am

@@ -56,7 +56,12 @@ bin_edbus_edbus_codegen_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/edbus\" \
 @EDBUS_CFLAGS@
+
+if HAVE_WIN32
+bin_edbus_edbus_codegen_LDADD = -L$(top_builddir)/src/lib/evil @USE_EDBUS_LIBS@
+else
 bin_edbus_edbus_codegen_LDADD = @USE_EDBUS_LIBS@
+endif
 bin_edbus_edbus_codegen_DEPENDENCIES = @USE_EDBUS_INTERNAL_LIBS@
 
 ### Unit tests

src/Makefile_Edje.am

@@ -82,6 +82,12 @@ endif
 
 ### Binary
 
+if HAVE_WIN32
+USE_EDJE_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_EDJE_LIBS@
+else
+USE_EDJE_BIN_LIBS = @USE_EDJE_LIBS@
+endif         
+
 bin_PROGRAMS += \
 bin/edje/edje_cc \
 bin/edje/edje_decc \
@@ -103,7 +109,7 @@ bin/edje/edje_cc_handlers.c \
 bin/edje/edje_cc_sources.c \
 bin/edje/edje_multisense_convert.c
 bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_cc_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_cc_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_cc_DEPENDENCIES = \
 @USE_EDJE_INTERNAL_LIBS@ \
 bin/edje/epp/epp # epp is an artificial dependency because edje_cc will use it at runtime, so we be sure if we depend on edje_cc we get epp.
@@ -114,37 +120,37 @@ bin/edje/edje_decc.h \
 bin/edje/edje_cc_mem.c \
 bin/edje/edje_cc_sources.c
 bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_decc_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_decc_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
 bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_player_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_player_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
 bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_inspector_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_inspector_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
 bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_external_inspector_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_external_inspector_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
 bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_codegen_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_codegen_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
 bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_pick_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_pick_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
 bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_watch_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_watch_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 # EPP (Edje's CPP)
@@ -226,7 +232,7 @@ tests_edje_edje_suite_CPPFLAGS = \
 $(EDJE_COMMON_CPPFLAGS) \
 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \
 @CHECK_CFLAGS@
-tests_edje_edje_suite_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@
+tests_edje_edje_suite_LDADD = @CHECK_LIBS@  $(USE_EDJE_BIN_LIBS)
 tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
 tests/edje/data/test_layout.edj: tests/edje/data/test_layout.edc bin/edje/edje_cc

src/Makefile_Eet.am

@@ -46,7 +46,11 @@ bin_eet_eet_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
 @EET_CFLAGS@
 
+if HAVE_WIN32
+bin_eet_eet_LDADD = -L$(top_builddir)/src/lib/evil @USE_EET_LIBS@
+else
 bin_eet_eet_LDADD = @USE_EET_LIBS@
+endif
 bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
 
 ### Unit tests

src/Makefile_Efreet.am

@@ -67,6 +67,12 @@ lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 ### Binary
 
+if HAVE_WIN32
+USE_EFREET_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_EFREET_LIBS@
+else
+USE_EFREET_BIN_LIBS = @USE_EFREET_LIBS@
+endif
+
 bin_PROGRAMS += bin/efreet/efreetd
 
 bin_efreet_efreetd_SOURCES = \
@@ -78,7 +84,7 @@ bin/efreet/efreetd_cache.h \
 bin/efreet/efreetd_cache.c
 
 bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreetd_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreetd_LDADD = $(USE_EFREET_BIN_LIBS)
 bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 
 efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH)
@@ -87,12 +93,12 @@ bin/efreet/efreet_desktop_cache_create \
 bin/efreet/efreet_icon_cache_create
 
 bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreet_desktop_cache_create_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreet_desktop_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
 bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
 
 bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreet_icon_cache_create_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreet_icon_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
 bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
 bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
 

src/Makefile_Embryo.am

@@ -53,7 +53,11 @@ bin_embryo_embryo_cc_CPPFLAGS = \
 -DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
 @EMBRYO_CFLAGS@
 
+if HAVE_WIN32
+bin_embryo_embryo_cc_LDADD = -L$(top_builddir)/src/lib/evil @USE_EMBRYO_LIBS@
+else
 bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@
+endif
 bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
 
 EXTRA_DIST += \

src/Makefile_Ethumb.am

@@ -66,5 +66,9 @@ bin/ethumb/ethumb
 
 bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
 bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
+if HAVE_WIN32
+bin_ethumb_ethumb_LDADD = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_LIBS@
+else
 bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
+endif
 bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@

src/Makefile_Ethumb_Client.am

@@ -17,6 +17,12 @@ lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 ### Binary
 
+if HAVE_WIN32
+USE_ETHUMB_CLIENT_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_CLIENT_LIBS@
+else
+USE_ETHUMB_CLIENT_BIN_LIBS = @USE_ETHUMB_CLIENT_LIBS@
+endif
+
 bin_PROGRAMS += \
 bin/ethumb_client/ethumbd \
 bin/ethumb_client/ethumbd_client
@@ -34,12 +40,12 @@ bin_ethumb_client_ethumbd_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
 @ETHUMB_CLIENT_CFLAGS@
-bin_ethumb_client_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
+bin_ethumb_client_ethumbd_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
 bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
 
 bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c
 bin_ethumb_client_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
-bin_ethumb_client_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
+bin_ethumb_client_ethumbd_client_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
 bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
 
 # slave does not use dbus, it's a simple ethumb application
@@ -47,5 +53,5 @@ bin_ethumb_client_ethumbd_slave_SOURCES = \
 bin/ethumb_client/ethumbd_private.h \
 bin/ethumb_client/ethumbd_slave.c
 bin_ethumb_client_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
-bin_ethumb_client_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
+bin_ethumb_client_ethumbd_slave_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
 bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@