aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Ecore.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.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.am')
-rw-r--r--src/Makefile_Ecore.am63
1 files changed, 24 insertions, 39 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 1d3a6a72cd..97bb235519 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -48,25 +48,9 @@ lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_signal.c lib/ecore/ecore_exe.c
endif
endif
-lib_ecore_libecore_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 \
--DEFL_ECORE_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_CFLAGS@ \
-@USE_EVIL_CFLAGS@ \
-@USE_ESCAPE_CFLAGS@
-
-lib_ecore_libecore_la_LIBADD = \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@USE_EVIL_LIBS@ \
-@USE_ESCAPE_LIBS@ \
-@ECORE_LIBS@ \
-@EFL_COV_LIBS@
-
+lib_ecore_libecore_la_CPPFLAGS = @ECORE_CFLAGS@
+lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
+lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Unit tests
@@ -84,32 +68,33 @@ tests/ecore/ecore_test_ecore_imf.c \
tests/ecore/ecore_suite.h
tests_ecore_ecore_suite_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_audio \
--I$(top_srcdir)/src/lib/ecore_con \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--I$(top_srcdir)/src/lib/ecore_imf \
--I$(top_builddir)/src/lib/ecore_imf \
-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
-@CHECK_CFLAGS@
+@CHECK_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_AUDIO_CFLAGS@ \
+@ECORE_CON_CFLAGS@ \
+@ECORE_FILE_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@ECORE_IMF_CFLAGS@
tests_ecore_ecore_suite_LDADD = \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore_con/libecore_con.la \
-lib/ecore_file/libecore_file.la \
-lib/ecore/libecore.la \
-lib/eina/libeina.la \
-@ECORE_LDFLAGS@ \
-@CHECK_LIBS@
+@CHECK_LIBS@ \
+@USE_ECORE_LIBS@ \
+@USE_ECORE_AUDIO_LIBS@ \
+@USE_ECORE_CON_LIBS@ \
+@USE_ECORE_FILE_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@USE_ECORE_IMF_LIBS@
+tests_ecore_ecore_suite_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@ \
+@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
+@USE_ECORE_CON_INTERNAL_LIBS@ \
+@USE_ECORE_FILE_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@ \
+@USE_ECORE_IMF_INTERNAL_LIBS@
if HAVE_ECORE_AUDIO
tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c
-tests_ecore_ecore_suite_LDADD += lib/ecore_audio/libecore_audio.la
endif
endif