summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore.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_Ecore.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_Ecore.am')
-rw-r--r--src/Makefile_Ecore.am63
1 files changed, 24 insertions, 39 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 1d3a6a72cd..97bb235519 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -48,25 +48,9 @@ lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_signal.c lib/ecore/ecore_exe.c
48endif 48endif
49endif 49endif
50 50
51lib_ecore_libecore_la_CPPFLAGS = \ 51lib_ecore_libecore_la_CPPFLAGS = @ECORE_CFLAGS@
52-I$(top_srcdir)/src/lib/eina \ 52lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
53-I$(top_builddir)/src/lib/eina \ 53lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
54-I$(top_srcdir)/src/lib/eo \
55-I$(top_srcdir)/src/lib/ecore \
56-DEFL_ECORE_BUILD \
57@EFL_COV_CFLAGS@ \
58@ECORE_CFLAGS@ \
59@USE_EVIL_CFLAGS@ \
60@USE_ESCAPE_CFLAGS@
61
62lib_ecore_libecore_la_LIBADD = \
63lib/eo/libeo.la \
64lib/eina/libeina.la \
65@USE_EVIL_LIBS@ \
66@USE_ESCAPE_LIBS@ \
67@ECORE_LIBS@ \
68@EFL_COV_LIBS@
69
70lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 54lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
71 55
72### Unit tests 56### Unit tests
@@ -84,32 +68,33 @@ tests/ecore/ecore_test_ecore_imf.c \
84tests/ecore/ecore_suite.h 68tests/ecore/ecore_suite.h
85 69
86tests_ecore_ecore_suite_CPPFLAGS = \ 70tests_ecore_ecore_suite_CPPFLAGS = \
87-I$(top_srcdir)/src/lib/eina \
88-I$(top_builddir)/src/lib/eina \
89-I$(top_srcdir)/src/lib/eo \
90-I$(top_srcdir)/src/lib/ecore \
91-I$(top_srcdir)/src/lib/ecore_audio \
92-I$(top_srcdir)/src/lib/ecore_con \
93-I$(top_srcdir)/src/lib/ecore_file \
94-I$(top_srcdir)/src/lib/ecore_x \
95-I$(top_builddir)/src/lib/ecore_x \
96-I$(top_srcdir)/src/lib/ecore_imf \
97-I$(top_builddir)/src/lib/ecore_imf \
98-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 71-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
99@CHECK_CFLAGS@ 72@CHECK_CFLAGS@ \
73@ECORE_CFLAGS@ \
74@ECORE_AUDIO_CFLAGS@ \
75@ECORE_CON_CFLAGS@ \
76@ECORE_FILE_CFLAGS@ \
77@ECORE_X_CFLAGS@ \
78@ECORE_IMF_CFLAGS@
100 79
101tests_ecore_ecore_suite_LDADD = \ 80tests_ecore_ecore_suite_LDADD = \
102lib/ecore_imf/libecore_imf.la \ 81@CHECK_LIBS@ \
103lib/ecore_con/libecore_con.la \ 82@USE_ECORE_LIBS@ \
104lib/ecore_file/libecore_file.la \ 83@USE_ECORE_AUDIO_LIBS@ \
105lib/ecore/libecore.la \ 84@USE_ECORE_CON_LIBS@ \
106lib/eina/libeina.la \ 85@USE_ECORE_FILE_LIBS@ \
107@ECORE_LDFLAGS@ \ 86@USE_ECORE_X_LIBS@ \
108@CHECK_LIBS@ 87@USE_ECORE_IMF_LIBS@
88tests_ecore_ecore_suite_DEPENDENCIES = \
89@USE_ECORE_INTERNAL_LIBS@ \
90@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
91@USE_ECORE_CON_INTERNAL_LIBS@ \
92@USE_ECORE_FILE_INTERNAL_LIBS@ \
93@USE_ECORE_X_INTERNAL_LIBS@ \
94@USE_ECORE_IMF_INTERNAL_LIBS@
109 95
110if HAVE_ECORE_AUDIO 96if HAVE_ECORE_AUDIO
111tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c 97tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c
112tests_ecore_ecore_suite_LDADD += lib/ecore_audio/libecore_audio.la
113endif 98endif
114 99
115endif 100endif