aboutsummaryrefslogtreecommitdiffstats
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
parentedbus: Dont call dispatch_name_owner_change() if we get a error message (diff)
downloadefl-b1bc5aeb24d6dd0faf97c2d1d6c6781798a7fbe9.tar.gz
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 \
lib/efreet/libefreet_trash.la
EFREET_COMMON_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_builddir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
--I$(top_srcdir)/src/lib/efreet \
--I$(top_builddir)/src/lib/efreet \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DDATA_DIR=\"$(datadir)\" \
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
--DEFL_EFREET_BUILD \
-@EFL_COV_CFLAGS@ \
-@EFREET_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-EFREET_COMMON_LIBADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/ecore_file/libecore_file.la \
-lib/eet/libeet.la \
-lib/edbus/libedbus2.la \
-@USE_EVIL_LIBS@ \
-@EFREET_LIBS@ \
-@EFL_COV_LIBS@
-
-EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la
-
-EFREET_COMMON_USER_LDADD = \
-lib/efreet/libefreet.la \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/ecore_file/libecore_file.la \
-lib/eet/libeet.la \
-lib/edbus/libedbus2.la \
-@USE_EVIL_LIBS@ \
-@EFREET_LDFLAGS@ \
-@EFL_COV_LIBS@
+@EFREET_CFLAGS@
installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
dist_installed_efreetmainheaders_DATA = \
@@ -88,19 +46,22 @@ lib/efreet/efreet_xml.h \
lib/efreet/efreet_cache_private.h
lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_la_LIBADD = $(EFREET_COMMON_LIBADD)
+lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
+lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# libefreet_mime.la
lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_mime_la_LIBADD = $(EFREET_COMMON_USER_LIBADD)
+lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# libefreet_trash.la
lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_trash_la_LIBADD = $(EFREET_COMMON_USER_LIBADD)
+lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -117,7 +78,8 @@ bin/efreet/efreetd_cache.h \
bin/efreet/efreetd_cache.c
bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD)
+bin_efreet_efreetd_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH)
efreetinternal_bin_PROGRAMS = \
@@ -125,14 +87,14 @@ bin/efreet/efreet_desktop_cache_create \
bin/efreet/efreet_icon_cache_create
bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
-bin_efreet_efreet_desktop_cache_create_SOURCES = \
-bin/efreet/efreet_desktop_cache_create.c
+bin_efreet_efreet_desktop_cache_create_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
-bin_efreet_efreet_icon_cache_create_SOURCES = \
-bin/efreet/efreet_icon_cache_create.c
+bin_efreet_efreet_icon_cache_create_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
### Unit tests
@@ -151,7 +113,10 @@ tests/efreet/compare/efreet_menu_alloc
# efreet_test
tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
tests_efreet_efreet_test_LDADD = \
-$(EFREET_COMMON_USER_LDADD) \
+@USE_EFREET_LIBS@ \
+lib/efreet/libefreet_mime.la
+tests_efreet_efreet_test_DEPENDENCIES = \
+@USE_EFREET_INTERNAL_LIBS@ \
lib/efreet/libefreet_mime.la
tests_efreet_efreet_test_SOURCES = \
@@ -168,38 +133,40 @@ tests/efreet/main.c
# efreet_spec_test
tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_spec_test_SOURCES = \
-tests/efreet/efreet_spec_test.c
+tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c
# efreet_cache_test
tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_cache_test_SOURCES = \
-tests/efreet/ef_cache.c
+tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c
# efreet_icon_cache_dump
tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_icon_cache_dump_SOURCES = \
-tests/efreet/efreet_icon_cache_dump.c
+tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c
# efreet_user_dir
tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_user_dir_SOURCES = \
-tests/efreet/efreet_user_dir.c
+tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c
# efreet_alloc
tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
+tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@
+tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
tests_efreet_compare_efreet_alloc_SOURCES = \
tests/efreet/compare/efreet_alloc.c \
tests/efreet/compare/comp.h
# efreet_menu_alloc
tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
+tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@
+tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
tests_efreet_compare_efreet_menu_alloc_SOURCES = \
tests/efreet/compare/efreet_menu_alloc.c \
tests/efreet/compare/comp.h
@@ -230,7 +197,8 @@ tests/efreet/efreet_test_efreet.c \
tests/efreet/efreet_test_efreet_cache.c
tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
-tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@
+tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
+tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
endif