aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Escape.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_Escape.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_Escape.am')
-rw-r--r--src/Makefile_Escape.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index e3934a2ab8..c9399c9c2e 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -19,9 +19,9 @@ lib/escape/escape_libgen.c \
lib/escape/escape_mman.c \
lib/escape/escape_unistd.c
-lib_escape_libescape_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/escape
+lib_escape_libescape_la_CPPFLAGS = @ESCAPE_CFLAGS@
lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
+lib_escape_libescape_la_DEPENDENCIES = @ESCAPE_INTERNAL_LIBS@
lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif