summaryrefslogtreecommitdiff
path: root/src/Makefile_Edje.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_Edje.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_Edje.am')
-rw-r--r--src/Makefile_Edje.am91
1 files changed, 21 insertions, 70 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index ce31a03..d46ae08 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -4,62 +4,12 @@
4lib_LTLIBRARIES += lib/edje/libedje.la 4lib_LTLIBRARIES += lib/edje/libedje.la
5 5
6EDJE_COMMON_CPPFLAGS = \ 6EDJE_COMMON_CPPFLAGS = \
7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib/eina \
9-I$(top_builddir)/src/lib/eina \
10-I$(top_srcdir)/src/lib/eo \
11-I$(top_builddir)/src/lib/eo \
12-I$(top_srcdir)/src/lib/eet \
13-I$(top_builddir)/src/lib/eet \
14-I$(top_srcdir)/src/lib/evas \
15-I$(top_builddir)/src/lib/evas \
16-I$(top_srcdir)/src/lib/ecore \
17-I$(top_builddir)/src/lib/ecore \
18-I$(top_srcdir)/src/lib/ecore_evas \
19-I$(top_builddir)/src/lib/ecore_evas \
20-I$(top_srcdir)/src/lib/ecore_file \
21-I$(top_builddir)/src/lib/ecore_file \
22-I$(top_srcdir)/src/lib/ecore_input \
23-I$(top_builddir)/src/lib/ecore_input \
24-I$(top_srcdir)/src/lib/ecore_imf \
25-I$(top_builddir)/src/lib/ecore_imf \
26-I$(top_srcdir)/src/lib/embryo \
27-I$(top_builddir)/src/lib/embryo \
28-I$(top_srcdir)/src/lib/eio \
29-I$(top_builddir)/src/lib/eio \
30-I$(top_srcdir)/src/lib/ephysics \
31-I$(top_builddir)/src/lib/ephysics \
32-I$(top_srcdir)/src/lib/edje \
33-I$(top_builddir)/src/lib/edje \
34-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
35-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
36-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
37-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 10-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
38-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 11-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
39-DEFL_EDJE_BUILD \ 12@EDJE_CFLAGS@
40@EFL_COV_CFLAGS@ \
41@EDJE_CFLAGS@ \
42@USE_EVIL_CFLAGS@
43
44EDJE_COMMON_LIBS = \
45lib/eina/libeina.la \
46lib/eo/libeo.la \
47lib/eet/libeet.la \
48lib/evas/libevas.la \
49lib/ecore/libecore.la \
50lib/ecore_evas/libecore_evas.la \
51lib/ecore_file/libecore_file.la \
52lib/ecore_input/libecore_input.la \
53lib/ecore_imf/libecore_imf.la \
54lib/ecore_imf/libecore_imf_evas.la \
55lib/embryo/libembryo.la \
56lib/eio/libeio.la \
57@USE_EVIL_LIBS@ \
58@EFL_COV_LIBS@
59
60if HAVE_EPHYSICS
61EDJE_COMMON_LIBS += lib/ephysics/libephysics.la
62endif
63 13
64installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@ 14installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@
65dist_installed_edjemainheaders_DATA = \ 15dist_installed_edjemainheaders_DATA = \
@@ -99,7 +49,8 @@ lib/edje/edje_util.c \
99lib/edje/edje_var.c 49lib/edje/edje_var.c
100 50
101lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 51lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
102lib_edje_libedje_la_LIBADD = $(EDJE_COMMON_LIBS) @EDJE_LIBS@ 52lib_edje_libedje_la_LIBADD = @EDJE_LIBS@
53lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@
103lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 54lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
104 55
105if ENABLE_MULTISENSE 56if ENABLE_MULTISENSE
@@ -130,11 +81,6 @@ endif
130 81
131### Binary 82### Binary
132 83
133EDJE_COMMON_USER_LDADD = \
134$(EDJE_COMMON_LIBS) \
135lib/edje/libedje.la \
136@EDJE_LDFLAGS@
137
138bin_PROGRAMS += \ 84bin_PROGRAMS += \
139bin/edje/edje_cc \ 85bin/edje/edje_cc \
140bin/edje/edje_decc \ 86bin/edje/edje_decc \
@@ -156,7 +102,8 @@ bin/edje/edje_cc_handlers.c \
156bin/edje/edje_cc_sources.c \ 102bin/edje/edje_cc_sources.c \
157bin/edje/edje_multisense_convert.c 103bin/edje/edje_multisense_convert.c
158bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 104bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
159bin_edje_edje_cc_LDADD = $(EDJE_COMMON_USER_LDADD) 105bin_edje_edje_cc_LDADD = @USE_EDJE_LIBS@
106bin_edje_edje_cc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
160 107
161bin_edje_edje_decc_SOURCES = \ 108bin_edje_edje_decc_SOURCES = \
162bin/edje/edje_decc.c \ 109bin/edje/edje_decc.c \
@@ -164,31 +111,38 @@ bin/edje/edje_decc.h \
164bin/edje/edje_cc_mem.c \ 111bin/edje/edje_cc_mem.c \
165bin/edje/edje_cc_sources.c 112bin/edje/edje_cc_sources.c
166bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 113bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
167bin_edje_edje_decc_LDADD = $(EDJE_COMMON_USER_LDADD) 114bin_edje_edje_decc_LDADD = @USE_EDJE_LIBS@
115bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
168 116
169bin_edje_edje_player_SOURCES = bin/edje/edje_player.c 117bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
170bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 118bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
171bin_edje_edje_player_LDADD = $(EDJE_COMMON_USER_LDADD) 119bin_edje_edje_player_LDADD = @USE_EDJE_LIBS@
120bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
172 121
173bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c 122bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
174bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 123bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
175bin_edje_edje_inspector_LDADD = $(EDJE_COMMON_USER_LDADD) 124bin_edje_edje_inspector_LDADD = @USE_EDJE_LIBS@
125bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
176 126
177bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c 127bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
178bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 128bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
179bin_edje_edje_external_inspector_LDADD = $(EDJE_COMMON_USER_LDADD) 129bin_edje_edje_external_inspector_LDADD = @USE_EDJE_LIBS@
130bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
180 131
181bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c 132bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
182bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 133bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
183bin_edje_edje_codegen_LDADD = $(EDJE_COMMON_USER_LDADD) 134bin_edje_edje_codegen_LDADD = @USE_EDJE_LIBS@
135bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
184 136
185bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c 137bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
186bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 138bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
187bin_edje_edje_pick_LDADD = $(EDJE_COMMON_USER_LDADD) 139bin_edje_edje_pick_LDADD = @USE_EDJE_LIBS@
140bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
188 141
189bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c 142bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
190bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 143bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
191bin_edje_edje_watch_LDADD = $(EDJE_COMMON_USER_LDADD) 144bin_edje_edje_watch_LDADD = @USE_EDJE_LIBS@
145bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
192 146
193# EPP (Edje's CPP) 147# EPP (Edje's CPP)
194eppdir = $(libdir)/edje/utils/$(MODULE_ARCH) 148eppdir = $(libdir)/edje/utils/$(MODULE_ARCH)
@@ -252,11 +206,8 @@ tests/edje/edje_suite.h
252tests_edje_edje_suite_CPPFLAGS = \ 206tests_edje_edje_suite_CPPFLAGS = \
253$(EDJE_COMMON_CPPFLAGS) \ 207$(EDJE_COMMON_CPPFLAGS) \
254@CHECK_CFLAGS@ 208@CHECK_CFLAGS@
255 209tests_edje_edje_suite_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@
256tests_edje_edje_suite_LDADD = \ 210tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
257$(EDJE_COMMON_USER_LDADD) \
258@CHECK_LIBS@
259
260endif 211endif
261 212
262# Useful to other modules that generate EDJ 213# Useful to other modules that generate EDJ