summaryrefslogtreecommitdiff
path: root/src/Makefile_Efreet.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_Efreet.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_Efreet.am')
-rw-r--r--src/Makefile_Efreet.am106
1 files changed, 37 insertions, 69 deletions
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 3ca667bdf9..bcddfd4293 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -7,55 +7,13 @@ lib/efreet/libefreet_mime.la \
7lib/efreet/libefreet_trash.la 7lib/efreet/libefreet_trash.la
8 8
9EFREET_COMMON_CPPFLAGS = \ 9EFREET_COMMON_CPPFLAGS = \
10-I$(top_srcdir)/src/lib/eina \
11-I$(top_builddir)/src/lib/eina \
12-I$(top_srcdir)/src/lib/eo \
13-I$(top_builddir)/src/lib/eo \
14-I$(top_srcdir)/src/lib/ecore \
15-I$(top_builddir)/src/lib/ecore \
16-I$(top_srcdir)/src/lib/ecore_file \
17-I$(top_builddir)/src/lib/ecore_file \
18-I$(top_srcdir)/src/lib/eet \
19-I$(top_builddir)/src/lib/eet \
20-I$(top_srcdir)/src/lib/edbus \
21-I$(top_builddir)/src/lib/edbus \
22-I$(top_srcdir)/src/lib/efreet \
23-I$(top_builddir)/src/lib/efreet \
24-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
25-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
26-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \ 12-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
27-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 13-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
28-DDATA_DIR=\"$(datadir)\" \ 14-DDATA_DIR=\"$(datadir)\" \
29-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 15-DLOCALE_DIR=\"@LOCALE_DIR@\" \
30-DEFL_EFREET_BUILD \ 16@EFREET_CFLAGS@
31@EFL_COV_CFLAGS@ \
32@EFREET_CFLAGS@ \
33@USE_EVIL_CFLAGS@
34
35EFREET_COMMON_LIBADD = \
36lib/eina/libeina.la \
37lib/eo/libeo.la \
38lib/ecore/libecore.la \
39lib/ecore_file/libecore_file.la \
40lib/eet/libeet.la \
41lib/edbus/libedbus2.la \
42@USE_EVIL_LIBS@ \
43@EFREET_LIBS@ \
44@EFL_COV_LIBS@
45
46EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la
47
48EFREET_COMMON_USER_LDADD = \
49lib/efreet/libefreet.la \
50lib/eina/libeina.la \
51lib/eo/libeo.la \
52lib/ecore/libecore.la \
53lib/ecore_file/libecore_file.la \
54lib/eet/libeet.la \
55lib/edbus/libedbus2.la \
56@USE_EVIL_LIBS@ \
57@EFREET_LDFLAGS@ \
58@EFL_COV_LIBS@
59 17
60installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ 18installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
61dist_installed_efreetmainheaders_DATA = \ 19dist_installed_efreetmainheaders_DATA = \
@@ -88,19 +46,22 @@ lib/efreet/efreet_xml.h \
88lib/efreet/efreet_cache_private.h 46lib/efreet/efreet_cache_private.h
89 47
90lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 48lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
91lib_efreet_libefreet_la_LIBADD = $(EFREET_COMMON_LIBADD) 49lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
50lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
92lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 51lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
93 52
94# libefreet_mime.la 53# libefreet_mime.la
95lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c 54lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
96lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 55lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
97lib_efreet_libefreet_mime_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) 56lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
57lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
98lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 58lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
99 59
100# libefreet_trash.la 60# libefreet_trash.la
101lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c 61lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
102lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 62lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
103lib_efreet_libefreet_trash_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) 63lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
64lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
104lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 65lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
105 66
106 67
@@ -117,7 +78,8 @@ bin/efreet/efreetd_cache.h \
117bin/efreet/efreetd_cache.c 78bin/efreet/efreetd_cache.c
118 79
119bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 80bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
120bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD) 81bin_efreet_efreetd_LDADD = @USE_EFREET_LIBS@
82bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
121 83
122efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH) 84efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH)
123efreetinternal_bin_PROGRAMS = \ 85efreetinternal_bin_PROGRAMS = \
@@ -125,14 +87,14 @@ bin/efreet/efreet_desktop_cache_create \
125bin/efreet/efreet_icon_cache_create 87bin/efreet/efreet_icon_cache_create
126 88
127bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 89bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
128bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) 90bin_efreet_efreet_desktop_cache_create_LDADD = @USE_EFREET_LIBS@
129bin_efreet_efreet_desktop_cache_create_SOURCES = \ 91bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
130bin/efreet/efreet_desktop_cache_create.c 92bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
131 93
132bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 94bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
133bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD) 95bin_efreet_efreet_icon_cache_create_LDADD = @USE_EFREET_LIBS@
134bin_efreet_efreet_icon_cache_create_SOURCES = \ 96bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
135bin/efreet/efreet_icon_cache_create.c 97bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
136 98
137### Unit tests 99### Unit tests
138 100
@@ -151,7 +113,10 @@ tests/efreet/compare/efreet_menu_alloc
151# efreet_test 113# efreet_test
152tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 114tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
153tests_efreet_efreet_test_LDADD = \ 115tests_efreet_efreet_test_LDADD = \
154$(EFREET_COMMON_USER_LDADD) \ 116@USE_EFREET_LIBS@ \
117lib/efreet/libefreet_mime.la
118tests_efreet_efreet_test_DEPENDENCIES = \
119@USE_EFREET_INTERNAL_LIBS@ \
155lib/efreet/libefreet_mime.la 120lib/efreet/libefreet_mime.la
156 121
157tests_efreet_efreet_test_SOURCES = \ 122tests_efreet_efreet_test_SOURCES = \
@@ -168,38 +133,40 @@ tests/efreet/main.c
168 133
169# efreet_spec_test 134# efreet_spec_test
170tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 135tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
171tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD) 136tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@
172tests_efreet_efreet_spec_test_SOURCES = \ 137tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
173tests/efreet/efreet_spec_test.c 138tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c
174 139
175# efreet_cache_test 140# efreet_cache_test
176tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 141tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
177tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD) 142tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@
178tests_efreet_efreet_cache_test_SOURCES = \ 143tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
179tests/efreet/ef_cache.c 144tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c
180 145
181# efreet_icon_cache_dump 146# efreet_icon_cache_dump
182tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 147tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
183tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD) 148tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@
184tests_efreet_efreet_icon_cache_dump_SOURCES = \ 149tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
185tests/efreet/efreet_icon_cache_dump.c 150tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c
186 151
187# efreet_user_dir 152# efreet_user_dir
188tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 153tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
189tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD) 154tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@
190tests_efreet_efreet_user_dir_SOURCES = \ 155tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
191tests/efreet/efreet_user_dir.c 156tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c
192 157
193# efreet_alloc 158# efreet_alloc
194tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 159tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
195tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) 160tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@
161tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
196tests_efreet_compare_efreet_alloc_SOURCES = \ 162tests_efreet_compare_efreet_alloc_SOURCES = \
197tests/efreet/compare/efreet_alloc.c \ 163tests/efreet/compare/efreet_alloc.c \
198tests/efreet/compare/comp.h 164tests/efreet/compare/comp.h
199 165
200# efreet_menu_alloc 166# efreet_menu_alloc
201tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 167tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
202tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD) 168tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@
169tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
203tests_efreet_compare_efreet_menu_alloc_SOURCES = \ 170tests_efreet_compare_efreet_menu_alloc_SOURCES = \
204tests/efreet/compare/efreet_menu_alloc.c \ 171tests/efreet/compare/efreet_menu_alloc.c \
205tests/efreet/compare/comp.h 172tests/efreet/compare/comp.h
@@ -230,7 +197,8 @@ tests/efreet/efreet_test_efreet.c \
230tests/efreet/efreet_test_efreet_cache.c 197tests/efreet/efreet_test_efreet_cache.c
231 198
232tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ 199tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
233tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@ 200tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
201tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
234 202
235endif 203endif
236 204