summaryrefslogtreecommitdiff
path: root/src/Makefile_Embryo.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_Embryo.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_Embryo.am')
-rw-r--r--src/Makefile_Embryo.am27
1 files changed, 6 insertions, 21 deletions
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 8d07096f30..47bc04b0ad 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -17,20 +17,12 @@ lib/embryo/embryo_time.c \
17lib/embryo/embryo_private.h 17lib/embryo/embryo_private.h
18 18
19lib_embryo_libembryo_la_CPPFLAGS = \ 19lib_embryo_libembryo_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \
21-I$(top_builddir)/src/lib/eina \
22-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 20-DPACKAGE_BIN_DIR=\"$(bindir)\" \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 21-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 22-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
25-DEFL_EMBRYO_BUILD \ 23@EMBRYO_CFLAGS@
26@EMBRYO_CFLAGS@ \ 24lib_embryo_libembryo_la_LIBADD = @EMBRYO_LIBS@
27@USE_EVIL_CFLAGS@ 25lib_embryo_libembryo_la_DEPENDENCIES = @EMBRYO_INTERNAL_LIBS@
28
29lib_embryo_libembryo_la_LIBADD = \
30lib/eina/libeina.la \
31@EMBRYO_LIBS@ \
32@USE_EVIL_LIBS@
33
34lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 26lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
35 27
36### Binary 28### Binary
@@ -55,21 +47,14 @@ bin/embryo/embryo_cc_prefix.c \
55bin/embryo/embryo_cc_prefix.h 47bin/embryo/embryo_cc_prefix.h
56 48
57bin_embryo_embryo_cc_CPPFLAGS = \ 49bin_embryo_embryo_cc_CPPFLAGS = \
58-I$(top_srcdir)/src/lib/eina \
59-I$(top_builddir)/src/lib/eina \
60-I$(top_srcdir)/src/lib/embryo \
61-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 50-DPACKAGE_BIN_DIR=\"$(bindir)\" \
62-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 51-DPACKAGE_LIB_DIR=\"$(libdir)\" \
63-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 52-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
64-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 53-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
65@EMBRYO_CFLAGS@ \ 54@EMBRYO_CFLAGS@
66@USE_EVIL_CFLAGS@
67 55
68bin_embryo_embryo_cc_LDADD = \ 56bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@
69lib/embryo/libembryo.la \ 57bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
70lib/eina/libeina.la \
71@EMBRYO_LDFLAGS@ \
72@USE_EVIL_LIBS@
73 58
74EXTRA_DIST += \ 59EXTRA_DIST += \
75bin/embryo/embryo_cc_sc5.scp \ 60bin/embryo/embryo_cc_sc5.scp \