aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Evil.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_Evil.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_Evil.am')
-rw-r--r--src/Makefile_Evil.am33
1 files changed, 11 insertions, 22 deletions
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 6f7184ffc7..c60edcfa23 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -95,12 +95,10 @@ else
lib_evil_libevil_la_SOURCES += lib/evil/evil_link_xp.cpp
endif
-lib_evil_libevil_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
-@EVIL_CPPFLAGS@
lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@
lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
+lib_evil_libevil_la_DEPENDENCIES = @EVIL_INTERNAL_LIBS@
lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if HAVE_WINCE
@@ -112,12 +110,12 @@ endif
lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
lib_evil_libdl_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
+@EVIL_CFLAGS@ \
@EVIL_DLFCN_CPPFLAGS@
-
-lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
-
-lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@
+lib_evil_libdl_la_LIBADD = \
+@USE_EVIL_LIBS@ \
+@EVIL_DLFCN_LIBS@
+lib_evil_libdl_la_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Binary
@@ -154,22 +152,13 @@ bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S
#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
endif
-bin_evil_evil_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
-@EVIL_CFLAGS@ \
-@EVIL_CPPFLAGS@
-
-bin_evil_evil_suite_LDADD = \
-lib/evil/libevil.la \
-lib/evil/libdl.la \
-@EVIL_LDFLAGS@ \
--lm
+bin_evil_evil_suite_CPPFLAGS = @EVIL_CFLAGS@
+bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm
+bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_LIBS@
bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
-
-bin_evil_test_evil_LDADD = \
-lib/evil/libevil.la \
-@EVIL_LDFLAGS@
+bin_evil_test_evil_LDADD = @USE_EVIL_LIBS@
+bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_LIBS@
endif
EXTRA_DIST += \