aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Ecore_X.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_Ecore_X.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_Ecore_X.am')
-rw-r--r--src/Makefile_Ecore_X.am22
1 files changed, 3 insertions, 19 deletions
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index eea0a17f3a..017658e05e 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -96,25 +96,9 @@ lib/ecore_x/xlib/ecore_x_gesture.c \
lib/ecore_x/xlib/ecore_x_private.h
endif
-lib_ecore_x_libecore_x_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--DEFL_ECORE_X_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_X_CFLAGS@
-
-lib_ecore_x_libecore_x_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_X_LIBS@
-
+lib_ecore_x_libecore_x_la_CPPFLAGS = @ECORE_X_CFLAGS@
+lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@
+lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@
lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
MAINTAINERCLEANFILES += \