merge: fix compilation when no EFL is installed...

tested on linux and windows.
And disable valgrind as there's a link problem in eet binary,
i'll check that later


SVN revision: 76938

3 files changed, 50 insertions, 6 deletions

diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
index af5fa844c8..eb536c4514 100644
--- a/src/bin/eet/Makefile.am
+++ b/src/bin/eet/Makefile.am
@@ -1,17 +1,33 @@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include/eina \
 -I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/include/eina \
 -I$(top_builddir)/src/lib/eet \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EET_CFLAGS@
 
+if HAVE_WINDOWS
+AM_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
 bin_PROGRAMS = @EET_PRG@
 EXTRA_PROGRAMS = eet
 
 eet_SOURCES = eet_main.c
-eet_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@
+eet_LDADD = \
+$(top_builddir)/src/lib/eet/libeet.la \
+$(top_builddir)/src/lib/eina/libeina.la
+
+if HAVE_WINDOWS
+eet_LDADD += $(top_builddir)/src/lib/evil/libdl.la
+endif
+
+eet_LDADD += @EET_LIBS@
+
 eet_LDFLAGS = @lt_enable_auto_import@
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
index e4d1c3b823..9460528da9 100644
--- a/src/lib/eet/Makefile.am
+++ b/src/lib/eet/Makefile.am
@@ -1,10 +1,10 @@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I. \
+-I$(top_srcdir)/src/include/eina \
 -I$(top_srcdir)/src/lib/eet \
 -I$(top_srcdir)/src/lib/eet/lz4 \
+-I$(top_builddir)/src/include/eina \
 -I$(top_builddir)/src/lib/eet \
 -I$(top_builddir)/src/lib/eet/lz4 \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -13,6 +13,12 @@ AM_CPPFLAGS = \
 @EET_CFLAGS@ \
 @EFL_EET_BUILD@
 
+if HAVE_WINDOWS
+AM_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
 includes_HEADERS = Eet.h
 includesdir = $(includedir)/eet-@VMAJ@
 
@@ -34,7 +40,14 @@ lz4/lz4.h \
 lz4/lz4hc.c \
 lz4/lz4hc.h
 
-libeet_la_LIBADD = @EET_LIBS@ -lm
+libeet_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
+
+if HAVE_WINDOWS
+libeet_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
+endif
+
+libeet_la_LIBADD += @EET_LIBS@ -lm
+
 libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
 EXTRA_DIST = lz4/README
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index 7b1901238f..747eda8617 100644
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -11,6 +11,12 @@ AM_CPPFLAGS = \
 @EINA_CFLAGS@ \
 @VALGRIND_CFLAGS@
 
+if HAVE_WINDOWS
+AM_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
 lib_LTLIBRARIES = libeina.la
 
 libeina_la_SOURCES = \
@@ -104,7 +110,16 @@ if EINA_STATIC_BUILD_PASS_THROUGH
 libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c
 endif
 
-libeina_la_LIBADD = @EINA_LIBS@ -lm
+libeina_la_LIBADD = @EINA_LIBS@
+
+if HAVE_WINDOWS
+libeina_la_LIBADD += \
+$(top_builddir)/src/lib/evil/libevil.la \
+$(top_builddir)/src/lib/evil/libdl.la
+endif
+
+libeina_la_LIBADD += -lm
+
 libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
 
 clean-local: