aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Eet.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-14 22:36:23 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-14 22:36:23 +0000
commitb1bc5aeb24d6dd0faf97c2d1d6c6781798a7fbe9 (patch)
treeebffce52ddbab71c6da6c2e07eeca7382abf15f6 /src/Makefile_Eet.am
parentedbus: Dont call dispatch_name_owner_change() if we get a error message (diff)
downloadefl-b1bc5aeb24d6dd0faf97c2d1d6c6781798a7fbe9.tar.gz
efl: simplify automake.
Instead of -I$(top_srcdir)... -I$(top_builddir)... and then do it for the .la, use the EFL_ macros to generate the contents to be used in automake files. There is a nasty bit that libtool will parse Makefile*.am and will not get _DEPENDENCIES from _LIBADD and _LDADD if these are in @REPLACEMENT@. To solve this we must explicitly set _DEPENDENCIES. The contents of this is almost the same as _LIBADD or _LDADD with the "_INTERNAL_" replacement name. I hope the code will be result will be shorter and consistent as there is less places to change when we add/remove dependencies. Statistics are quite impressive (diffstat): {{{ 37 files changed, 663 insertions(+), 1599 deletions(-) }}} SVN revision: 82785
Diffstat (limited to 'src/Makefile_Eet.am')
-rw-r--r--src/Makefile_Eet.am44
1 files changed, 8 insertions, 36 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 0b238debd0..63142dc366 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -23,24 +23,13 @@ static_libs/lz4/lz4hc.c \
static_libs/lz4/lz4hc.h
lib_eet_libeet_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
-I$(top_srcdir)/src/static_libs/lz4 \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
--DEFL_EET_BUILD \
-@EFL_COV_CFLAGS@ \
-@EET_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-lib_eet_libeet_la_LIBADD = \
-lib/eina/libeina.la \
-@USE_EVIL_LIBS@ \
-@EET_LIBS@ \
-@EFL_COV_LIBS@
-
+@EET_CFLAGS@
+lib_eet_libeet_la_LIBADD = @EET_LIBS@
+lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
EXTRA_DIST += static_libs/lz4/README
@@ -52,22 +41,13 @@ bin_PROGRAMS += bin/eet/eet
bin_eet_eet_SOURCES = bin/eet/eet_main.c
bin_eet_eet_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
-@EFL_COV_CFLAGS@ \
-@EET_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@EET_CFLAGS@
-bin_eet_eet_LDADD = \
-lib/eet/libeet.la \
-lib/eina/libeina.la \
-@USE_EVIL_LIBS@ \
-@EET_LDFLAGS@ \
-@EFL_COV_LIBS@
+bin_eet_eet_LDADD = @USE_EET_LIBS@
+bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
### Unit tests
@@ -81,20 +61,12 @@ tests/eet/eet_data_suite.c \
tests/eet/eet_suite.h
tests_eet_eet_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
@CHECK_CFLAGS@ \
@EET_CFLAGS@
-
-tests_eet_eet_suite_LDADD = \
-lib/eet/libeet.la \
-lib/eina/libeina.la \
-@CHECK_LIBS@ \
-@EET_LDFLAGS@
-
+tests_eet_eet_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
+tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
endif
EXTRA_DIST += \