From 22544113db21e21d7657e35d1c04d47a3a31b530 Mon Sep 17 00:00:00 2001 From: caro Date: Sat, 5 May 2012 09:11:31 +0000 Subject: [PATCH] Ecore: fix linking on Windows git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@70788 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_con/Makefile.am | 3 ++- src/lib/ecore_ipc/Makefile.am | 9 +++++++-- src/lib/ecore_win32/Makefile.am | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_con/Makefile.am b/src/lib/ecore_con/Makefile.am index 929b30e..460a271 100644 --- a/src/lib/ecore_con/Makefile.am +++ b/src/lib/ecore_con/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ @EFL_ECORE_CON_BUILD@ \ @SSL_CFLAGS@ \ @CURL_CFLAGS@ \ +@EVIL_CFLAGS@ \ @EINA_CFLAGS@ \ @TLS_CFLAGS@ \ @CARES_CFLAGS@ \ @@ -39,7 +40,7 @@ endif libecore_con_la_CFLAGS = @WIN32_CFLAGS@ libecore_con_la_LIBADD = \ $(top_builddir)/src/lib/ecore/libecore.la \ -@SSL_LIBS@ @CURL_LIBS@ @EINA_LIBS@ @TLS_LIBS@ @CARES_LIBS@ @WIN32_LIBS@ +@SSL_LIBS@ @CURL_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ @TLS_LIBS@ @CARES_LIBS@ @WIN32_LIBS@ libecore_con_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ diff --git a/src/lib/ecore_ipc/Makefile.am b/src/lib/ecore_ipc/Makefile.am index 9cbed43..60e32d3 100644 --- a/src/lib/ecore_ipc/Makefile.am +++ b/src/lib/ecore_ipc/Makefile.am @@ -9,7 +9,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_ipc \ @EFL_ECORE_IPC_BUILD@ \ @SSL_CFLAGS@ \ -@EINA_CFLAGS@ +@EVIL_CFLAGS@ \ +@EINA_CFLAGS@ \ +@WIN32_CPPFLAGS@ lib_LTLIBRARIES = libecore_ipc.la includes_HEADERS = Ecore_Ipc.h @@ -18,11 +20,14 @@ includesdir = $(includedir)/ecore-@VMAJ@ libecore_ipc_la_SOURCES = \ ecore_ipc.c +libecore_ipc_la_CFLAGS = @WIN32_CFLAGS@ libecore_ipc_la_LIBADD = \ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/ecore_con/libecore_con.la \ @SSL_LIBS@ \ -@EINA_LIBS@ +@EINA_LIBS@ \ +@EVIL_LIBS@ \ +@WIN32_LIBS@ libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ diff --git a/src/lib/ecore_win32/Makefile.am b/src/lib/ecore_win32/Makefile.am index ce317c7..7031fa5 100644 --- a/src/lib/ecore_win32/Makefile.am +++ b/src/lib/ecore_win32/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore_input \ @EFL_ECORE_WIN32_BUILD@ \ +@EVIL_CFLAGS@ \ @EINA_CFLAGS@ \ @WIN32_CPPFLAGS@ @@ -30,7 +31,8 @@ libecore_win32_la_LIBADD = \ @WIN32_LIBS@ \ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/ecore_input/libecore_input.la \ -@EINA_LIBS@ +@EINA_LIBS@ \ +@EVIL_LIBS@ libecore_win32_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ -- 2.7.4