summaryrefslogtreecommitdiff
path: root/src/lib/eet
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/lib/eet
parent1bc1eaaba3699bd23f5334ab31b9c84cefc77681 (diff)
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/lib/eet')
-rw-r--r--src/lib/eet/Makefile.am19
1 files changed, 16 insertions, 3 deletions
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 @@
1
2MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
3 2
4AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
5-I. \ 4-I$(top_srcdir)/src/include/eina \
6-I$(top_srcdir)/src/lib/eet \ 5-I$(top_srcdir)/src/lib/eet \
7-I$(top_srcdir)/src/lib/eet/lz4 \ 6-I$(top_srcdir)/src/lib/eet/lz4 \
7-I$(top_builddir)/src/include/eina \
8-I$(top_builddir)/src/lib/eet \ 8-I$(top_builddir)/src/lib/eet \
9-I$(top_builddir)/src/lib/eet/lz4 \ 9-I$(top_builddir)/src/lib/eet/lz4 \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -13,6 +13,12 @@ AM_CPPFLAGS = \
13@EET_CFLAGS@ \ 13@EET_CFLAGS@ \
14@EFL_EET_BUILD@ 14@EFL_EET_BUILD@
15 15
16if HAVE_WINDOWS
17AM_CPPFLAGS += \
18-I$(top_srcdir)/src/lib/evil \
19-I$(top_builddir)/src/lib/evil
20endif
21
16includes_HEADERS = Eet.h 22includes_HEADERS = Eet.h
17includesdir = $(includedir)/eet-@VMAJ@ 23includesdir = $(includedir)/eet-@VMAJ@
18 24
@@ -34,7 +40,14 @@ lz4/lz4.h \
34lz4/lz4hc.c \ 40lz4/lz4hc.c \
35lz4/lz4hc.h 41lz4/lz4hc.h
36 42
37libeet_la_LIBADD = @EET_LIBS@ -lm 43libeet_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
44
45if HAVE_WINDOWS
46libeet_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
47endif
48
49libeet_la_LIBADD += @EET_LIBS@ -lm
50
38libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 51libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
39 52
40EXTRA_DIST = lz4/README 53EXTRA_DIST = lz4/README