summaryrefslogtreecommitdiff
path: root/src/Makefile_Efreet.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_Efreet.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_Efreet.am')
-rw-r--r--src/Makefile_Efreet.am35
1 files changed, 23 insertions, 12 deletions
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index ed827670cf..1822713644 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -25,7 +25,6 @@ EFREET_COMMON_CPPFLAGS = \
25-DPACKAGE_DATA_DIR=\"$(datadir)\" \ 25-DPACKAGE_DATA_DIR=\"$(datadir)\" \
26-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 26-DLOCALE_DIR=\"@LOCALE_DIR@\" \
27-DEFL_EFREET_BUILD \ 27-DEFL_EFREET_BUILD \
28@EFL_CFLAGS@ \
29@EFL_COV_CFLAGS@ \ 28@EFL_COV_CFLAGS@ \
30@EFREET_CFLAGS@ \ 29@EFREET_CFLAGS@ \
31@USE_EVIL_CFLAGS@ 30@USE_EVIL_CFLAGS@
@@ -43,6 +42,18 @@ lib/edbus/libedbus2.la \
43 42
44EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la 43EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la
45 44
45EFREET_COMMON_USER_LDADD = \
46lib/efreet/libefreet.la \
47lib/eina/libeina.la \
48lib/eo/libeo.la \
49lib/ecore/libecore.la \
50lib/ecore_file/libecore_file.la \
51lib/eet/libeet.la \
52lib/edbus/libedbus2.la \
53@USE_EVIL_LIBS@ \
54@EFREET_LDFLAGS@ \
55@EFL_COV_LIBS@
56
46installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ 57installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
47dist_installed_efreetmainheaders_DATA = \ 58dist_installed_efreetmainheaders_DATA = \
48lib/efreet/Efreet.h \ 59lib/efreet/Efreet.h \
@@ -104,7 +115,7 @@ bin/efreet/efreetd_cache.h \
104bin/efreet/efreetd_cache.c 115bin/efreet/efreetd_cache.c
105 116
106bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 117bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
107bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LIBADD) 118bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD)
108 119
109efreetinternal_bindir=$(libdir)/efreet 120efreetinternal_bindir=$(libdir)/efreet
110efreetinternal_bin_PROGRAMS = \ 121efreetinternal_bin_PROGRAMS = \
@@ -112,12 +123,12 @@ bin/efreet/efreet_desktop_cache_create \
112bin/efreet/efreet_icon_cache_create 123bin/efreet/efreet_icon_cache_create
113 124
114bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 125bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
115bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) 126bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
116bin_efreet_efreet_desktop_cache_create_SOURCES = \ 127bin_efreet_efreet_desktop_cache_create_SOURCES = \
117bin/efreet/efreet_desktop_cache_create.c 128bin/efreet/efreet_desktop_cache_create.c
118 129
119bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 130bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
120bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LIBADD) 131bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
121bin_efreet_efreet_icon_cache_create_SOURCES = \ 132bin_efreet_efreet_icon_cache_create_SOURCES = \
122bin/efreet/efreet_icon_cache_create.c 133bin/efreet/efreet_icon_cache_create.c
123 134
@@ -138,7 +149,7 @@ tests/efreet/compare/efreet_menu_alloc
138# efreet_test 149# efreet_test
139tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 150tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
140tests_efreet_efreet_test_LDADD = \ 151tests_efreet_efreet_test_LDADD = \
141$(EFREET_COMMON_USER_LIBADD) \ 152$(EFREET_COMMON_USER_LDADD) \
142lib/efreet/libefreet_mime.la 153lib/efreet/libefreet_mime.la
143 154
144tests_efreet_efreet_test_SOURCES = \ 155tests_efreet_efreet_test_SOURCES = \
@@ -154,38 +165,38 @@ tests/efreet/main.c
154 165
155# efreet_spec_test 166# efreet_spec_test
156tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 167tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
157tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LIBADD) 168tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD)
158tests_efreet_efreet_spec_test_SOURCES = \ 169tests_efreet_efreet_spec_test_SOURCES = \
159tests/efreet/efreet_spec_test.c 170tests/efreet/efreet_spec_test.c
160 171
161# efreet_cache_test 172# efreet_cache_test
162tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 173tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
163tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LIBADD) 174tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD)
164tests_efreet_efreet_cache_test_SOURCES = \ 175tests_efreet_efreet_cache_test_SOURCES = \
165tests/efreet/ef_cache.c 176tests/efreet/ef_cache.c
166 177
167# efreet_icon_cache_dump 178# efreet_icon_cache_dump
168tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 179tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
169tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LIBADD) 180tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD)
170tests_efreet_efreet_icon_cache_dump_SOURCES = \ 181tests_efreet_efreet_icon_cache_dump_SOURCES = \
171tests/efreet/efreet_icon_cache_dump.c 182tests/efreet/efreet_icon_cache_dump.c
172 183
173# efreet_user_dir 184# efreet_user_dir
174tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 185tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
175tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LIBADD) 186tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD)
176tests_efreet_efreet_user_dir_SOURCES = \ 187tests_efreet_efreet_user_dir_SOURCES = \
177tests/efreet/efreet_user_dir.c 188tests/efreet/efreet_user_dir.c
178 189
179# efreet_alloc 190# efreet_alloc
180tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 191tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
181tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) 192tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
182tests_efreet_compare_efreet_alloc_SOURCES = \ 193tests_efreet_compare_efreet_alloc_SOURCES = \
183tests/efreet/compare/efreet_alloc.c \ 194tests/efreet/compare/efreet_alloc.c \
184tests/efreet/compare/comp.h 195tests/efreet/compare/comp.h
185 196
186# efreet_menu_alloc 197# efreet_menu_alloc
187tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 198tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
188tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LIBADD) 199tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
189tests_efreet_compare_efreet_menu_alloc_SOURCES = \ 200tests_efreet_compare_efreet_menu_alloc_SOURCES = \
190tests/efreet/compare/efreet_menu_alloc.c \ 201tests/efreet/compare/efreet_menu_alloc.c \
191tests/efreet/compare/comp.h 202tests/efreet/compare/comp.h
@@ -215,6 +226,6 @@ tests/efreet/efreet_test_efreet.c \
215tests/efreet/efreet_test_efreet_cache.c 226tests/efreet/efreet_test_efreet_cache.c
216 227
217tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@ 228tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
218tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LIBADD) @CHECK_LIBS@ 229tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@
219 230
220endif 231endif