summaryrefslogtreecommitdiff
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
parent283805237a9f5f194568667fc32586a3238cbde0 (diff)
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
95lib_evil_libevil_la_SOURCES += lib/evil/evil_link_xp.cpp 95lib_evil_libevil_la_SOURCES += lib/evil/evil_link_xp.cpp
96endif 96endif
97 97
98lib_evil_libevil_la_CPPFLAGS = \
99-I$(top_srcdir)/src/lib/evil \
100@EVIL_CPPFLAGS@
101lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ 98lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@
102lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ 99lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
103lib_evil_libevil_la_LIBADD = @EVIL_LIBS@ 100lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
101lib_evil_libevil_la_DEPENDENCIES = @EVIL_INTERNAL_LIBS@
104lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 102lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
105 103
106if HAVE_WINCE 104if HAVE_WINCE
@@ -112,12 +110,12 @@ endif
112lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c 110lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
113 111
114lib_evil_libdl_la_CPPFLAGS = \ 112lib_evil_libdl_la_CPPFLAGS = \
115-I$(top_srcdir)/src/lib/evil \ 113@EVIL_CFLAGS@ \
116@EVIL_DLFCN_CPPFLAGS@ 114@EVIL_DLFCN_CPPFLAGS@
117 115lib_evil_libdl_la_LIBADD = \
118lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@ 116@USE_EVIL_LIBS@ \
119 117@EVIL_DLFCN_LIBS@
120lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@ 118lib_evil_libdl_la_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
121lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 119lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
122 120
123### Binary 121### Binary
@@ -154,22 +152,13 @@ bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S
154#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below! 152#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
155endif 153endif
156 154
157bin_evil_evil_suite_CPPFLAGS = \ 155bin_evil_evil_suite_CPPFLAGS = @EVIL_CFLAGS@
158-I$(top_srcdir)/src/lib/evil \ 156bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm
159@EVIL_CFLAGS@ \ 157bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_LIBS@
160@EVIL_CPPFLAGS@
161
162bin_evil_evil_suite_LDADD = \
163lib/evil/libevil.la \
164lib/evil/libdl.la \
165@EVIL_LDFLAGS@ \
166-lm
167 158
168bin_evil_test_evil_SOURCES = bin/evil/test_evil.c 159bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
169 160bin_evil_test_evil_LDADD = @USE_EVIL_LIBS@
170bin_evil_test_evil_LDADD = \ 161bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_LIBS@
171lib/evil/libevil.la \
172@EVIL_LDFLAGS@
173 162
174endif 163endif
175EXTRA_DIST += \ 164EXTRA_DIST += \