aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Ecore_Input.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_Input.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_Input.am')
-rw-r--r--src/Makefile_Ecore_Input.am43
1 files changed, 6 insertions, 37 deletions
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index 765616aa09..d07a895d5a 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -15,23 +15,9 @@ lib/ecore_input/ecore_input_compose.c \
lib/ecore_input/ecore_input_compose.h \
lib/ecore_input/ecore_input_private.h
-lib_ecore_input_libecore_input_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 \
--DEFL_ECORE_INPUT_BUILD \
-@ECORE_INPUT_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_input_libecore_input_la_LIBADD = \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@
-
-lib_ecore_input_libecore_input_la_LIBADD += @EFL_COV_LIBS@
+lib_ecore_input_libecore_input_la_CPPFLAGS = @ECORE_INPUT_CFLAGS@
+lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@
+lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@
lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@
@@ -42,24 +28,7 @@ lib_ecore_input_libecore_input_evas_la_SOURCES = \
lib/ecore_input/ecore_input_evas.c \
lib/ecore_input/ecore_input_evas_private.h
-lib_ecore_input_libecore_input_evas_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/evas \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_input_evas \
--DEFL_ECORE_INPUT_EVAS_BUILD \
-@ECORE_INPUT_EVAS_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_input_libecore_input_evas_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/evas/libevas.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@
-
+lib_ecore_input_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@
+lib_ecore_input_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
+lib_ecore_input_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
lib_ecore_input_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@