summaryrefslogtreecommitdiff
path: root/src
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
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')
-rw-r--r--src/bin/eet/Makefile.am20
-rw-r--r--src/lib/eet/Makefile.am19
-rw-r--r--src/lib/eina/Makefile.am17
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 @@
1
2MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
3 2
4AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/include/eina \
5-I$(top_srcdir)/src/lib/eet \ 5-I$(top_srcdir)/src/lib/eet \
6-I$(top_builddir)/src/include/eina \
6-I$(top_builddir)/src/lib/eet \ 7-I$(top_builddir)/src/lib/eet \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 8-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 9-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EET_CFLAGS@ 11@EET_CFLAGS@
11 12
13if HAVE_WINDOWS
14AM_CPPFLAGS += \
15-I$(top_srcdir)/src/lib/evil \
16-I$(top_builddir)/src/lib/evil
17endif
18
12bin_PROGRAMS = @EET_PRG@ 19bin_PROGRAMS = @EET_PRG@
13EXTRA_PROGRAMS = eet 20EXTRA_PROGRAMS = eet
14 21
15eet_SOURCES = eet_main.c 22eet_SOURCES = eet_main.c
16eet_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ 23eet_LDADD = \
24$(top_builddir)/src/lib/eet/libeet.la \
25$(top_builddir)/src/lib/eina/libeina.la
26
27if HAVE_WINDOWS
28eet_LDADD += $(top_builddir)/src/lib/evil/libdl.la
29endif
30
31eet_LDADD += @EET_LIBS@
32
17eet_LDFLAGS = @lt_enable_auto_import@ 33eet_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 @@
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
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 = \
11@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
12@VALGRIND_CFLAGS@ 12@VALGRIND_CFLAGS@
13 13
14if HAVE_WINDOWS
15AM_CPPFLAGS += \
16-I$(top_srcdir)/src/lib/evil \
17-I$(top_builddir)/src/lib/evil
18endif
19
14lib_LTLIBRARIES = libeina.la 20lib_LTLIBRARIES = libeina.la
15 21
16libeina_la_SOURCES = \ 22libeina_la_SOURCES = \
@@ -104,7 +110,16 @@ if EINA_STATIC_BUILD_PASS_THROUGH
104libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c 110libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c
105endif 111endif
106 112
107libeina_la_LIBADD = @EINA_LIBS@ -lm 113libeina_la_LIBADD = @EINA_LIBS@
114
115if HAVE_WINDOWS
116libeina_la_LIBADD += \
117$(top_builddir)/src/lib/evil/libevil.la \
118$(top_builddir)/src/lib/evil/libdl.la
119endif
120
121libeina_la_LIBADD += -lm
122
108libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ 123libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
109 124
110clean-local: 125clean-local: