summaryrefslogtreecommitdiff
path: root/src/Makefile_Eo.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_Eo.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_Eo.am')
-rw-r--r--src/Makefile_Eo.am122
1 files changed, 26 insertions, 96 deletions
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 9c5795d47f..f2dd3c4eb1 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -11,17 +11,9 @@ lib/eo/eo.c \
11lib/eo/eo_base_class.c \ 11lib/eo/eo_base_class.c \
12lib/eo/eo_private.h 12lib/eo/eo_private.h
13 13
14lib_eo_libeo_la_CPPFLAGS = \ 14lib_eo_libeo_la_CPPFLAGS = -DNDEBUG @EO_CFLAGS@
15-I$(top_srcdir)/src/lib/eina \ 15lib_eo_libeo_la_LIBADD = @EO_LIBS@
16-I$(top_builddir)/src/lib/eina \ 16lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
17-I$(top_srcdir)/src/lib/eo \
18-DNDEBUG \
19-DEFL_EO_BUILD \
20@EFL_COV_CFLAGS@ \
21@EO_CFLAGS@ \
22@USE_EVIL_CFLAGS@
23
24lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@
25lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 17lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
26 18
27### Unit tests 19### Unit tests
@@ -46,17 +38,9 @@ tests/eo/access/access_main.c \
46tests/eo/access/access_simple.c \ 38tests/eo/access/access_simple.c \
47tests/eo/access/access_simple.h \ 39tests/eo/access/access_simple.h \
48tests/eo/access/access_simple_protected.h 40tests/eo/access/access_simple_protected.h
49 41tests_eo_test_access_CPPFLAGS = @EO_CFLAGS@
50tests_eo_test_access_CPPFLAGS = \ 42tests_eo_test_access_LDADD = @USE_EO_LIBS@
51-I$(top_srcdir)/src/lib/eina \ 43tests_eo_test_access_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
52-I$(top_builddir)/src/lib/eina \
53-I$(top_srcdir)/src/lib/eo \
54@CHECK_CFLAGS@ \
55@EO_CFLAGS@
56
57tests_eo_test_access_LDADD = \
58lib/eo/libeo.la \
59@EO_LDFLAGS@
60 44
61tests_eo_test_composite_objects_SOURCES = \ 45tests_eo_test_composite_objects_SOURCES = \
62tests/eo/composite_objects/composite_objects_comp.c \ 46tests/eo/composite_objects/composite_objects_comp.c \
@@ -64,17 +48,9 @@ tests/eo/composite_objects/composite_objects_comp.h \
64tests/eo/composite_objects/composite_objects_main.c \ 48tests/eo/composite_objects/composite_objects_main.c \
65tests/eo/composite_objects/composite_objects_simple.c \ 49tests/eo/composite_objects/composite_objects_simple.c \
66tests/eo/composite_objects/composite_objects_simple.h 50tests/eo/composite_objects/composite_objects_simple.h
67 51tests_eo_test_composite_objects_CPPFLAGS = @EO_CFLAGS@
68tests_eo_test_composite_objects_CPPFLAGS = \ 52tests_eo_test_composite_objects_LDADD = @USE_EO_LIBS@
69-I$(top_srcdir)/src/lib/eina \ 53tests_eo_test_composite_objects_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
70-I$(top_builddir)/src/lib/eina \
71-I$(top_srcdir)/src/lib/eo \
72@CHECK_CFLAGS@ \
73@EO_CFLAGS@
74
75tests_eo_test_composite_objects_LDADD = \
76lib/eo/libeo.la \
77@EO_LDFLAGS@
78 54
79tests_eo_test_constructors_SOURCES = \ 55tests_eo_test_constructors_SOURCES = \
80tests/eo/constructors/constructors_main.c \ 56tests/eo/constructors/constructors_main.c \
@@ -94,17 +70,9 @@ tests/eo/constructors/constructors_simple6.c \
94tests/eo/constructors/constructors_simple6.h \ 70tests/eo/constructors/constructors_simple6.h \
95tests/eo/constructors/constructors_simple7.c \ 71tests/eo/constructors/constructors_simple7.c \
96tests/eo/constructors/constructors_simple7.h 72tests/eo/constructors/constructors_simple7.h
97 73tests_eo_test_constructors_CPPFLAGS = @EO_CFLAGS@
98tests_eo_test_constructors_CPPFLAGS = \ 74tests_eo_test_constructors_LDADD = @USE_EO_LIBS@
99-I$(top_srcdir)/src/lib/eina \ 75tests_eo_test_constructors_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
100-I$(top_builddir)/src/lib/eina \
101-I$(top_srcdir)/src/lib/eo \
102@CHECK_CFLAGS@ \
103@EO_CFLAGS@
104
105tests_eo_test_constructors_LDADD = \
106lib/eo/libeo.la \
107@EO_LDFLAGS@
108 76
109if EFL_ENABLE_TESTS 77if EFL_ENABLE_TESTS
110 78
@@ -116,19 +84,13 @@ tests/eo/suite/eo_suite.h \
116tests/eo/suite/eo_test_class_errors.c \ 84tests/eo/suite/eo_test_class_errors.c \
117tests/eo/suite/eo_test_general.c \ 85tests/eo/suite/eo_test_general.c \
118tests/eo/suite/eo_test_init.c 86tests/eo/suite/eo_test_init.c
119
120tests_eo_eo_suite_CPPFLAGS = \ 87tests_eo_eo_suite_CPPFLAGS = \
121-I$(top_srcdir)/src/lib/eina \
122-I$(top_builddir)/src/lib/eina \
123-I$(top_srcdir)/src/lib/eo \
124-DNDEBUG \ 88-DNDEBUG \
125@CHECK_CFLAGS@ \ 89@CHECK_CFLAGS@ \
126@EO_CFLAGS@ 90@EO_CFLAGS@
127 91
128tests_eo_eo_suite_LDADD = \ 92tests_eo_eo_suite_LDADD = @CHECK_LIBS@ @USE_EO_LIBS@
129lib/eo/libeo.la \ 93tests_eo_eo_suite_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
130@CHECK_LIBS@ \
131@EO_LDFLAGS@
132 94
133endif 95endif
134 96
@@ -142,17 +104,9 @@ tests/eo/function_overrides/function_overrides_inherit3.h \
142tests/eo/function_overrides/function_overrides_main.c \ 104tests/eo/function_overrides/function_overrides_main.c \
143tests/eo/function_overrides/function_overrides_simple.c \ 105tests/eo/function_overrides/function_overrides_simple.c \
144tests/eo/function_overrides/function_overrides_simple.h 106tests/eo/function_overrides/function_overrides_simple.h
145 107tests_eo_test_function_overrides_CPPFLAGS = @EO_CFLAGS@
146tests_eo_test_function_overrides_CPPFLAGS = \ 108tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@
147-I$(top_srcdir)/src/lib/eina \ 109tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
148-I$(top_builddir)/src/lib/eina \
149-I$(top_srcdir)/src/lib/eo \
150@CHECK_CFLAGS@ \
151@EO_CFLAGS@
152
153tests_eo_test_function_overrides_LDADD = \
154lib/eo/libeo.la \
155@EO_LDFLAGS@
156 110
157tests_eo_test_interface_SOURCES = \ 111tests_eo_test_interface_SOURCES = \
158tests/eo/interface/interface_interface.c \ 112tests/eo/interface/interface_interface.c \
@@ -162,17 +116,9 @@ tests/eo/interface/interface_interface2.h \
162tests/eo/interface/interface_main.c \ 116tests/eo/interface/interface_main.c \
163tests/eo/interface/interface_simple.c \ 117tests/eo/interface/interface_simple.c \
164tests/eo/interface/interface_simple.h 118tests/eo/interface/interface_simple.h
165 119tests_eo_test_interface_CPPFLAGS = @EO_CFLAGS@
166tests_eo_test_interface_CPPFLAGS = \ 120tests_eo_test_interface_LDADD = @USE_EO_LIBS@
167-I$(top_srcdir)/src/lib/eina \ 121tests_eo_test_interface_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
168-I$(top_builddir)/src/lib/eina \
169-I$(top_srcdir)/src/lib/eo \
170@CHECK_CFLAGS@ \
171@EO_CFLAGS@
172
173tests_eo_test_interface_LDADD = \
174lib/eo/libeo.la \
175@EO_LDFLAGS@
176 122
177tests_eo_test_mixin_SOURCES = \ 123tests_eo_test_mixin_SOURCES = \
178tests/eo/mixin/mixin_inherit.c \ 124tests/eo/mixin/mixin_inherit.c \
@@ -188,32 +134,16 @@ tests/eo/mixin/mixin_mixin4.c \
188tests/eo/mixin/mixin_mixin4.h \ 134tests/eo/mixin/mixin_mixin4.h \
189tests/eo/mixin/mixin_simple.c \ 135tests/eo/mixin/mixin_simple.c \
190tests/eo/mixin/mixin_simple.h 136tests/eo/mixin/mixin_simple.h
191 137tests_eo_test_mixin_CPPFLAGS = @EO_CFLAGS@
192tests_eo_test_mixin_CPPFLAGS = \ 138tests_eo_test_mixin_LDADD = @USE_EO_LIBS@
193-I$(top_srcdir)/src/lib/eina \ 139tests_eo_test_mixin_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
194-I$(top_builddir)/src/lib/eina \
195-I$(top_srcdir)/src/lib/eo \
196@CHECK_CFLAGS@ \
197@EO_CFLAGS@
198
199tests_eo_test_mixin_LDADD = \
200lib/eo/libeo.la \
201@EO_LDFLAGS@
202 140
203tests_eo_test_signals_SOURCES = \ 141tests_eo_test_signals_SOURCES = \
204tests/eo/signals/signals_main.c \ 142tests/eo/signals/signals_main.c \
205tests/eo/signals/signals_simple.c \ 143tests/eo/signals/signals_simple.c \
206tests/eo/signals/signals_simple.h 144tests/eo/signals/signals_simple.h
207 145tests_eo_test_signals_CPPFLAGS = @EO_CFLAGS@
208tests_eo_test_signals_CPPFLAGS = \ 146tests_eo_test_signals_LDADD = @USE_EO_LIBS@
209-I$(top_srcdir)/src/lib/eina \ 147tests_eo_test_signals_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
210-I$(top_builddir)/src/lib/eina \
211-I$(top_srcdir)/src/lib/eo \
212@CHECK_CFLAGS@ \
213@EO_CFLAGS@
214
215tests_eo_test_signals_LDADD = \
216lib/eo/libeo.la \
217@EO_LDFLAGS@
218 148
219EXTRA_DIST += tests/eo/eunit_tests.h 149EXTRA_DIST += tests/eo/eunit_tests.h