summaryrefslogtreecommitdiff
path: root/src/Makefile_Eet.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_Eet.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_Eet.am')
-rw-r--r--src/Makefile_Eet.am44
1 files changed, 8 insertions, 36 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 0b238debd0..63142dc366 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -23,24 +23,13 @@ static_libs/lz4/lz4hc.c \
23static_libs/lz4/lz4hc.h 23static_libs/lz4/lz4hc.h
24 24
25lib_eet_libeet_la_CPPFLAGS = \ 25lib_eet_libeet_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/eina \
27-I$(top_builddir)/src/lib/eina \
28-I$(top_srcdir)/src/lib/eet \
29-I$(top_srcdir)/src/static_libs/lz4 \ 26-I$(top_srcdir)/src/static_libs/lz4 \
30-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 27-DPACKAGE_BIN_DIR=\"$(bindir)\" \
31-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 28-DPACKAGE_LIB_DIR=\"$(libdir)\" \
32-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 29-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
33-DEFL_EET_BUILD \ 30@EET_CFLAGS@
34@EFL_COV_CFLAGS@ \ 31lib_eet_libeet_la_LIBADD = @EET_LIBS@
35@EET_CFLAGS@ \ 32lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
36@USE_EVIL_CFLAGS@
37
38lib_eet_libeet_la_LIBADD = \
39lib/eina/libeina.la \
40@USE_EVIL_LIBS@ \
41@EET_LIBS@ \
42@EFL_COV_LIBS@
43
44lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 33lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
45 34
46EXTRA_DIST += static_libs/lz4/README 35EXTRA_DIST += static_libs/lz4/README
@@ -52,22 +41,13 @@ bin_PROGRAMS += bin/eet/eet
52bin_eet_eet_SOURCES = bin/eet/eet_main.c 41bin_eet_eet_SOURCES = bin/eet/eet_main.c
53 42
54bin_eet_eet_CPPFLAGS = \ 43bin_eet_eet_CPPFLAGS = \
55-I$(top_srcdir)/src/lib/eina \
56-I$(top_builddir)/src/lib/eina \
57-I$(top_srcdir)/src/lib/eet \
58-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 44-DPACKAGE_BIN_DIR=\"$(bindir)\" \
59-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 45-DPACKAGE_LIB_DIR=\"$(libdir)\" \
60-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 46-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
61@EFL_COV_CFLAGS@ \ 47@EET_CFLAGS@
62@EET_CFLAGS@ \
63@USE_EVIL_CFLAGS@
64 48
65bin_eet_eet_LDADD = \ 49bin_eet_eet_LDADD = @USE_EET_LIBS@
66lib/eet/libeet.la \ 50bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
67lib/eina/libeina.la \
68@USE_EVIL_LIBS@ \
69@EET_LDFLAGS@ \
70@EFL_COV_LIBS@
71 51
72### Unit tests 52### Unit tests
73 53
@@ -81,20 +61,12 @@ tests/eet/eet_data_suite.c \
81tests/eet/eet_suite.h 61tests/eet/eet_suite.h
82 62
83tests_eet_eet_suite_CPPFLAGS = \ 63tests_eet_eet_suite_CPPFLAGS = \
84-I$(top_srcdir)/src/lib/eina \
85-I$(top_builddir)/src/lib/eina \
86-I$(top_srcdir)/src/lib/eet \
87-DTESTS_WD=\"`pwd`\" \ 64-DTESTS_WD=\"`pwd`\" \
88-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \ 65-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
89@CHECK_CFLAGS@ \ 66@CHECK_CFLAGS@ \
90@EET_CFLAGS@ 67@EET_CFLAGS@
91 68tests_eet_eet_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
92tests_eet_eet_suite_LDADD = \ 69tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
93lib/eet/libeet.la \
94lib/eina/libeina.la \
95@CHECK_LIBS@ \
96@EET_LDFLAGS@
97
98endif 70endif
99 71
100EXTRA_DIST += \ 72EXTRA_DIST += \