aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-21 08:15:58 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-21 08:15:58 +0000
commitab144cb47475bface1ece6fc9869b135cd4a8ab7 (patch)
tree714691a2f49a9a1f1b2ff14e2640c6b5bf74d2a5 /src/bin
parent1bc1eaaba3699bd23f5334ab31b9c84cefc77681 (diff)
downloadefl-ab144cb47475bface1ece6fc9869b135cd4a8ab7.tar.gz
efl-ab144cb47475bface1ece6fc9869b135cd4a8ab7.tar.xz
efl-ab144cb47475bface1ece6fc9869b135cd4a8ab7.zip
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
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/eet/Makefile.am20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
index af5fa844c..eb536c451 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@