summaryrefslogtreecommitdiff
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
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_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 3b0e15d..b7a8552 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -4,38 +4,6 @@ lib_LTLIBRARIES += \
4lib/ethumb/libethumb.la \ 4lib/ethumb/libethumb.la \
5lib/ethumb/client/libethumb_client.la 5lib/ethumb/client/libethumb_client.la
6 6
7ETHUMB_COMMON_CPPFLAGS = \
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/ecore \
13-I$(top_builddir)/src/lib/ecore \
14-I$(top_srcdir)/src/lib/ecore_evas \
15-I$(top_builddir)/src/lib/ecore_evas \
16-I$(top_srcdir)/src/lib/ecore_file \
17-I$(top_builddir)/src/lib/ecore_file \
18-I$(top_srcdir)/src/lib/evas \
19-I$(top_builddir)/src/lib/evas \
20-I$(top_srcdir)/src/lib/edje \
21-I$(top_builddir)/src/lib/edje \
22-I$(top_srcdir)/src/lib/ethumb \
23-I$(top_builddir)/src/lib/ethumb \
24@EFL_COV_CFLAGS@ \
25@ETHUMB_CFLAGS@ \
26@USE_EVIL_CFLAGS@
27
28ETHUMB_COMMON_LDADD = \
29lib/eina/libeina.la \
30lib/eo/libeo.la \
31lib/ecore/libecore.la \
32lib/ecore_evas/libecore_evas.la \
33lib/ecore_file/libecore_file.la \
34lib/evas/libevas.la \
35lib/edje/libedje.la \
36@EFL_COV_LIBS@ \
37@USE_EVIL_LIBS@
38
39installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@ 7installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@
40dist_installed_ethumbmainheaders_DATA = \ 8dist_installed_ethumbmainheaders_DATA = \
41lib/ethumb/Ethumb.h \ 9lib/ethumb/Ethumb.h \
@@ -49,38 +17,22 @@ lib/ethumb/md5.h \
49lib/ethumb/ethumb.c \ 17lib/ethumb/ethumb.c \
50lib/ethumb/md5.c 18lib/ethumb/md5.c
51 19
52ETHUMB_COMMON_LIBADD = $(ETHUMB_COMMON_LDADD) @ETHUMB_LIBS@
53ETHUMB_COMMON_LDADD += @ETHUMB_LDFLAGS@
54ETHUMB_COMMON_USER_LIBADD = $(ETHUMB_COMMON_LIBADD) lib/ethumb/libethumb.la
55ETHUMB_COMMON_USER_LDADD = $(ETHUMB_COMMON_LDADD) lib/ethumb/libethumb.la
56
57lib_ethumb_libethumb_la_CPPFLAGS = \ 20lib_ethumb_libethumb_la_CPPFLAGS = \
58$(ETHUMB_COMMON_CPPFLAGS) \
59-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 21-DPACKAGE_BIN_DIR=\"$(bindir)\" \
60-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 22-DPACKAGE_LIB_DIR=\"$(libdir)\" \
61-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 23-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
62-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 24-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
63-DEFL_ETHUMB_BUILD 25@ETHUMB_CFLAGS@
64 26lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
65lib_ethumb_libethumb_la_LIBADD = $(ETHUMB_COMMON_LIBADD) 27lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
66lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 28lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
67 29
68 30# TODO: fix directory!
69# libethumb_client.la 31# libethumb_client.la
70lib_ethumb_client_libethumb_client_la_SOURCES = \ 32lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb/client/ethumb_client.c
71lib/ethumb/client/ethumb_client.c 33lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
72 34lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
73lib_ethumb_client_libethumb_client_la_CPPFLAGS = \ 35lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
74$(ETHUMB_COMMON_CPPFLAGS) \
75-I$(top_srcdir)/src/lib/edbus \
76-I$(top_builddir)/src/lib/edbus \
77-I$(top_srcdir)/src/lib/ethumb/client \
78-I$(top_builddir)/src/lib/ethumb/client \
79-DEFL_ETHUMB_BUILD
80
81lib_ethumb_client_libethumb_client_la_LIBADD = \
82$(ETHUMB_COMMON_USER_LIBADD) \
83lib/edbus/libedbus2.la
84lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 36lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
85 37
86## Modules 38## Modules
@@ -91,21 +43,18 @@ ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la
91modules_ethumb_emotion_module_la_SOURCES = \ 43modules_ethumb_emotion_module_la_SOURCES = \
92modules/ethumb/emotion/emotion.c 44modules/ethumb/emotion/emotion.c
93modules_ethumb_emotion_module_la_CPPFLAGS = \ 45modules_ethumb_emotion_module_la_CPPFLAGS = \
94$(ETHUMB_COMMON_CPPFLAGS) \
95-I$(top_srcdir)/src/lib/eet \
96-I$(top_builddir)/src/lib/eet \
97-I$(top_srcdir)/src/lib/emotion \
98-I$(top_builddir)/src/lib/emotion \
99-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 46-DPACKAGE_BIN_DIR=\"$(bindir)\" \
100-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 47-DPACKAGE_LIB_DIR=\"$(libdir)\" \
101-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 48-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
102-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" 49-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
103 50@EMOTION_CFLAGS@ \
51@ETHUMB_CFLAGS@
104modules_ethumb_emotion_module_la_LIBADD = \ 52modules_ethumb_emotion_module_la_LIBADD = \
105$(ETHUMB_COMMON_USER_LIBADD) \ 53@USE_EMOTION_LIBS@ \
106lib/eet/libeet.la \ 54@USE_ETHUMB_LIBS@
107lib/emotion/libemotion.la 55modules_ethumb_emotion_module_la_DEPENDENCIES = \
108 56@USE_EMOTION_INTERNAL_LIBS@ \
57@USE_ETHUMB_INTERNAL_LIBS@
109modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 58modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
110modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static 59modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
111 60
@@ -132,40 +81,33 @@ ethumbinternal_bin_PROGRAMS = \
132bin/ethumb/ethumbd_slave 81bin/ethumb/ethumbd_slave
133 82
134bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c 83bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
135bin_ethumb_ethumb_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS) 84bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
136bin_ethumb_ethumb_LDADD = $(ETHUMB_COMMON_USER_LDADD) 85bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
86bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
137 87
138# TODO: review why ethumd (master) links to libethumb! shouldn't 88# TODO: review why ethumd (master) links to libethumb! shouldn't
139bin_ethumb_ethumbd_SOURCES = \ 89bin_ethumb_ethumbd_SOURCES = \
140bin/ethumb/ethumbd_private.h \ 90bin/ethumb/ethumbd_private.h \
141bin/ethumb/ethumbd.c 91bin/ethumb/ethumbd.c
142bin_ethumb_ethumbd_CPPFLAGS = \ 92bin_ethumb_ethumbd_CPPFLAGS = \
143$(ETHUMB_COMMON_CPPFLAGS) \
144-I$(top_srcdir)/src/lib/edbus \
145-I$(top_builddir)/src/lib/edbus \
146-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 93-DPACKAGE_BIN_DIR=\"$(bindir)\" \
147-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 94-DPACKAGE_LIB_DIR=\"$(libdir)\" \
148-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 95-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
149-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" 96-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
150bin_ethumb_ethumbd_LDADD = \ 97@ETHUMB_CLIENT_CFLAGS@
151$(ETHUMB_COMMON_USER_LDADD) \ 98bin_ethumb_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
152lib/edbus/libedbus2.la 99bin_ethumb_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
153
154bin_ethumb_ethumbd_client_SOURCES = \
155bin/ethumb/ethumbd_client.c
156bin_ethumb_ethumbd_client_CPPFLAGS = \
157$(ETHUMB_COMMON_CPPFLAGS) \
158-I$(top_srcdir)/src/lib/edbus \
159-I$(top_builddir)/src/lib/edbus \
160-I$(top_srcdir)/src/lib/ethumb/client \
161-I$(top_builddir)/src/lib/ethumb/client
162bin_ethumb_ethumbd_client_LDADD = \
163$(ETHUMB_COMMON_USER_LDADD) \
164lib/ethumb/client/libethumb_client.la \
165lib/edbus/libedbus2.la
166 100
101bin_ethumb_ethumbd_client_SOURCES = bin/ethumb/ethumbd_client.c
102bin_ethumb_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
103bin_ethumb_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
104bin_ethumb_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
105
106# slave does not use dbus, it's a simple ethumb application
167bin_ethumb_ethumbd_slave_SOURCES = \ 107bin_ethumb_ethumbd_slave_SOURCES = \
168bin/ethumb/ethumbd_private.h \ 108bin/ethumb/ethumbd_private.h \
169bin/ethumb/ethumbd_slave.c 109bin/ethumb/ethumbd_slave.c
170bin_ethumb_ethumbd_slave_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS) 110bin_ethumb_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
171bin_ethumb_ethumbd_slave_LDADD = $(ETHUMB_COMMON_USER_LDADD) 111bin_ethumb_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
112bin_ethumb_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
113