aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Ethumb.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_Ethumb.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_Ethumb.am')
-rw-r--r--src/Makefile_Ethumb.am124
1 files changed, 33 insertions, 91 deletions
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 3b0e15daae..b7a8552fa6 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -4,38 +4,6 @@ lib_LTLIBRARIES += \
lib/ethumb/libethumb.la \
lib/ethumb/client/libethumb_client.la
-ETHUMB_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_evas \
--I$(top_builddir)/src/lib/ecore_evas \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_builddir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/evas \
--I$(top_builddir)/src/lib/evas \
--I$(top_srcdir)/src/lib/edje \
--I$(top_builddir)/src/lib/edje \
--I$(top_srcdir)/src/lib/ethumb \
--I$(top_builddir)/src/lib/ethumb \
-@EFL_COV_CFLAGS@ \
-@ETHUMB_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-ETHUMB_COMMON_LDADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_file/libecore_file.la \
-lib/evas/libevas.la \
-lib/edje/libedje.la \
-@EFL_COV_LIBS@ \
-@USE_EVIL_LIBS@
-
installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@
dist_installed_ethumbmainheaders_DATA = \
lib/ethumb/Ethumb.h \
@@ -49,38 +17,22 @@ lib/ethumb/md5.h \
lib/ethumb/ethumb.c \
lib/ethumb/md5.c
-ETHUMB_COMMON_LIBADD = $(ETHUMB_COMMON_LDADD) @ETHUMB_LIBS@
-ETHUMB_COMMON_LDADD += @ETHUMB_LDFLAGS@
-ETHUMB_COMMON_USER_LIBADD = $(ETHUMB_COMMON_LIBADD) lib/ethumb/libethumb.la
-ETHUMB_COMMON_USER_LDADD = $(ETHUMB_COMMON_LDADD) lib/ethumb/libethumb.la
-
lib_ethumb_libethumb_la_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
--DEFL_ETHUMB_BUILD
-
-lib_ethumb_libethumb_la_LIBADD = $(ETHUMB_COMMON_LIBADD)
+@ETHUMB_CFLAGS@
+lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
+lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-
+# TODO: fix directory!
# libethumb_client.la
-lib_ethumb_client_libethumb_client_la_SOURCES = \
-lib/ethumb/client/ethumb_client.c
-
-lib_ethumb_client_libethumb_client_la_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
--I$(top_srcdir)/src/lib/ethumb/client \
--I$(top_builddir)/src/lib/ethumb/client \
--DEFL_ETHUMB_BUILD
-
-lib_ethumb_client_libethumb_client_la_LIBADD = \
-$(ETHUMB_COMMON_USER_LIBADD) \
-lib/edbus/libedbus2.la
+lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb/client/ethumb_client.c
+lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
+lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
+lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
## Modules
@@ -91,21 +43,18 @@ ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la
modules_ethumb_emotion_module_la_SOURCES = \
modules/ethumb/emotion/emotion.c
modules_ethumb_emotion_module_la_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet \
--I$(top_srcdir)/src/lib/emotion \
--I$(top_builddir)/src/lib/emotion \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\"
-
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+@EMOTION_CFLAGS@ \
+@ETHUMB_CFLAGS@
modules_ethumb_emotion_module_la_LIBADD = \
-$(ETHUMB_COMMON_USER_LIBADD) \
-lib/eet/libeet.la \
-lib/emotion/libemotion.la
-
+@USE_EMOTION_LIBS@ \
+@USE_ETHUMB_LIBS@
+modules_ethumb_emotion_module_la_DEPENDENCIES = \
+@USE_EMOTION_INTERNAL_LIBS@ \
+@USE_ETHUMB_INTERNAL_LIBS@
modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -132,40 +81,33 @@ ethumbinternal_bin_PROGRAMS = \
bin/ethumb/ethumbd_slave
bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
-bin_ethumb_ethumb_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS)
-bin_ethumb_ethumb_LDADD = $(ETHUMB_COMMON_USER_LDADD)
+bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
+bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
+bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
# TODO: review why ethumd (master) links to libethumb! shouldn't
bin_ethumb_ethumbd_SOURCES = \
bin/ethumb/ethumbd_private.h \
bin/ethumb/ethumbd.c
bin_ethumb_ethumbd_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\"
-bin_ethumb_ethumbd_LDADD = \
-$(ETHUMB_COMMON_USER_LDADD) \
-lib/edbus/libedbus2.la
-
-bin_ethumb_ethumbd_client_SOURCES = \
-bin/ethumb/ethumbd_client.c
-bin_ethumb_ethumbd_client_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
--I$(top_srcdir)/src/lib/ethumb/client \
--I$(top_builddir)/src/lib/ethumb/client
-bin_ethumb_ethumbd_client_LDADD = \
-$(ETHUMB_COMMON_USER_LDADD) \
-lib/ethumb/client/libethumb_client.la \
-lib/edbus/libedbus2.la
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+@ETHUMB_CLIENT_CFLAGS@
+bin_ethumb_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
+bin_ethumb_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
+bin_ethumb_ethumbd_client_SOURCES = bin/ethumb/ethumbd_client.c
+bin_ethumb_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
+bin_ethumb_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
+bin_ethumb_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
+
+# slave does not use dbus, it's a simple ethumb application
bin_ethumb_ethumbd_slave_SOURCES = \
bin/ethumb/ethumbd_private.h \
bin/ethumb/ethumbd_slave.c
-bin_ethumb_ethumbd_slave_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS)
-bin_ethumb_ethumbd_slave_LDADD = $(ETHUMB_COMMON_USER_LDADD)
+bin_ethumb_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
+bin_ethumb_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
+bin_ethumb_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
+