summaryrefslogtreecommitdiff
path: root/src/Makefile_Eo.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
commitdf1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c (patch)
treee26086071ac285910d3e162c39819f3a2c3affea /src/Makefile_Eo.am
parent51f8fe26fc4774e69be3547d49ae902c287c8b61 (diff)
efl: refactor CFLAGS, LIBS, LIBADD and LDADD usage.
- remove EFL_LIBS and EFL_CFLAGS, use per-lib values that inherit from EFL (general) - add NAME_LDFLAGS and EFL_LDFLAGS for linker flags. - LDADD (binaries) now use NAME_LDFLAGS instead of NAME_LIBS, as they link to libname.la and that will pull in the libtool dependencies SVN revision: 81915
Diffstat (limited to 'src/Makefile_Eo.am')
-rw-r--r--src/Makefile_Eo.am17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index aa0fad66cc..9c5795d47f 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -17,7 +17,6 @@ lib_eo_libeo_la_CPPFLAGS = \
17-I$(top_srcdir)/src/lib/eo \ 17-I$(top_srcdir)/src/lib/eo \
18-DNDEBUG \ 18-DNDEBUG \
19-DEFL_EO_BUILD \ 19-DEFL_EO_BUILD \
20@EFL_CFLAGS@ \
21@EFL_COV_CFLAGS@ \ 20@EFL_COV_CFLAGS@ \
22@EO_CFLAGS@ \ 21@EO_CFLAGS@ \
23@USE_EVIL_CFLAGS@ 22@USE_EVIL_CFLAGS@
@@ -57,7 +56,7 @@ tests_eo_test_access_CPPFLAGS = \
57 56
58tests_eo_test_access_LDADD = \ 57tests_eo_test_access_LDADD = \
59lib/eo/libeo.la \ 58lib/eo/libeo.la \
60@EO_LIBS@ 59@EO_LDFLAGS@
61 60
62tests_eo_test_composite_objects_SOURCES = \ 61tests_eo_test_composite_objects_SOURCES = \
63tests/eo/composite_objects/composite_objects_comp.c \ 62tests/eo/composite_objects/composite_objects_comp.c \
@@ -75,7 +74,7 @@ tests_eo_test_composite_objects_CPPFLAGS = \
75 74
76tests_eo_test_composite_objects_LDADD = \ 75tests_eo_test_composite_objects_LDADD = \
77lib/eo/libeo.la \ 76lib/eo/libeo.la \
78@EO_LIBS@ 77@EO_LDFLAGS@
79 78
80tests_eo_test_constructors_SOURCES = \ 79tests_eo_test_constructors_SOURCES = \
81tests/eo/constructors/constructors_main.c \ 80tests/eo/constructors/constructors_main.c \
@@ -105,7 +104,7 @@ tests_eo_test_constructors_CPPFLAGS = \
105 104
106tests_eo_test_constructors_LDADD = \ 105tests_eo_test_constructors_LDADD = \
107lib/eo/libeo.la \ 106lib/eo/libeo.la \
108@EO_LIBS@ 107@EO_LDFLAGS@
109 108
110if EFL_ENABLE_TESTS 109if EFL_ENABLE_TESTS
111 110
@@ -129,7 +128,7 @@ tests_eo_eo_suite_CPPFLAGS = \
129tests_eo_eo_suite_LDADD = \ 128tests_eo_eo_suite_LDADD = \
130lib/eo/libeo.la \ 129lib/eo/libeo.la \
131@CHECK_LIBS@ \ 130@CHECK_LIBS@ \
132@EO_LIBS@ 131@EO_LDFLAGS@
133 132
134endif 133endif
135 134
@@ -153,7 +152,7 @@ tests_eo_test_function_overrides_CPPFLAGS = \
153 152
154tests_eo_test_function_overrides_LDADD = \ 153tests_eo_test_function_overrides_LDADD = \
155lib/eo/libeo.la \ 154lib/eo/libeo.la \
156@EO_LIBS@ 155@EO_LDFLAGS@
157 156
158tests_eo_test_interface_SOURCES = \ 157tests_eo_test_interface_SOURCES = \
159tests/eo/interface/interface_interface.c \ 158tests/eo/interface/interface_interface.c \
@@ -173,7 +172,7 @@ tests_eo_test_interface_CPPFLAGS = \
173 172
174tests_eo_test_interface_LDADD = \ 173tests_eo_test_interface_LDADD = \
175lib/eo/libeo.la \ 174lib/eo/libeo.la \
176@EO_LIBS@ 175@EO_LDFLAGS@
177 176
178tests_eo_test_mixin_SOURCES = \ 177tests_eo_test_mixin_SOURCES = \
179tests/eo/mixin/mixin_inherit.c \ 178tests/eo/mixin/mixin_inherit.c \
@@ -199,7 +198,7 @@ tests_eo_test_mixin_CPPFLAGS = \
199 198
200tests_eo_test_mixin_LDADD = \ 199tests_eo_test_mixin_LDADD = \
201lib/eo/libeo.la \ 200lib/eo/libeo.la \
202@EO_LIBS@ 201@EO_LDFLAGS@
203 202
204tests_eo_test_signals_SOURCES = \ 203tests_eo_test_signals_SOURCES = \
205tests/eo/signals/signals_main.c \ 204tests/eo/signals/signals_main.c \
@@ -215,6 +214,6 @@ tests_eo_test_signals_CPPFLAGS = \
215 214
216tests_eo_test_signals_LDADD = \ 215tests_eo_test_signals_LDADD = \
217lib/eo/libeo.la \ 216lib/eo/libeo.la \
218@EO_LIBS@ 217@EO_LDFLAGS@
219 218
220EXTRA_DIST += tests/eo/eunit_tests.h 219EXTRA_DIST += tests/eo/eunit_tests.h