summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore.am
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-12-18 15:41:06 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-12-18 15:41:06 +0000
commit7470edfa5a0c53a0c71184fb31eccb27817f5e62 (patch)
treef0a9af76405aea169140d66178ae7cc754cc30a1 /src/Makefile_Ecore.am
parent7b944729bb0c3f375407e54fb3bffb9281f1fced (diff)
sorry vincent. i know you dont like thus, but with this commit efl
tree simply is broken and doesnt compile. error here: ... src/Makefile_Evas.am:1809: unterminated conditionals: HAVE_WINDOWS_TRUE src/Makefile.am:24: src/Makefile_Evas.am' included from here src/Makefile.am:128: unterminated conditionals: HAVE_WINDOWS_TRUE src/Makefile.am: installing ./depcomp' automake: #################### automake: ## Internal Error ## automake: #################### automake: undefined condition TRUE' for RECURSIVE_TARGETS' automake: RECURSIVE_TARGETS: automake: { automake: HAVE_WINDOWS => { automake: type: += automake: where: /usr/share/automake-1.11/am/texinfos.am: automake: comment: automake: value: dvi-recursive html-recursive info-recursive pdf-recursive ps-recursive \ automake: install-dvi-recursive \ automake: install-html-recursive \ automake: install-info-recursive \ automake: install-pdf-recursive \ automake: install-ps-recursive all-recursive check-recursive installcheck-recursive automake: owner: Automake automake: } automake: } automake: automake: Please contact <bug-automake@gnu.org>. at /usr/share/automake-1.11/Automake/Channels.pm line 657 Automake::Channels::msg('automake', '', 'undefined condition TRUE\' for RECURSIVE_TARGETS\'\x{a}RECURSIV...') called at /usr/share/automake-1.11/Automake/ChannelDefs.pm line 208 Automake::ChannelDefs::prog_error('undefined condition TRUE\' for RECURSIVE_TARGETS\'\x{a}RECURSIV...') called at /usr/share/automake-1.11/Automake/Item.pm line 94 Automake::Item::rdef('Automake::Variable=HASH(0x38cbe20)', 'Automake::Condition=HASH(0x2832a48)') called at /usr/bin/automake line 4102 Automake::handle_subdirs() called at /usr/bin/automake line 8305 Automake::generate_makefile('src/Makefile.am', 'src/Makefile.in') called at /usr/bin/automake line 8602 Automake::handle_makefile('src/Makefile.in') called at /usr/bin/automake line 8616 Automake::handle_makefiles_serial() called at /usr/bin/automake line 8769 autoreconf: automake failed with exit status: 255 ... i looked at the HAVE_WINDOWS if's and it seems fine to me - i couldnt find what was missing, so i had to resort to a revert instead of fix :( sorry :( SVN revision: 81267
Diffstat (limited to 'src/Makefile_Ecore.am')
-rw-r--r--src/Makefile_Ecore.am16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 7e00c3e..3e7684a 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -51,6 +51,9 @@ lib_ecore_libecore_la_CPPFLAGS = \
51-I$(top_srcdir)/src/lib/eina \ 51-I$(top_srcdir)/src/lib/eina \
52-I$(top_srcdir)/src/lib/eo \ 52-I$(top_srcdir)/src/lib/eo \
53-I$(top_srcdir)/src/lib/ecore \ 53-I$(top_srcdir)/src/lib/ecore \
54-I$(top_builddir)/src/lib/eina \
55-I$(top_builddir)/src/lib/eo \
56-I$(top_builddir)/src/lib/ecore \
54-DEFL_ECORE_BUILD \ 57-DEFL_ECORE_BUILD \
55@EFL_CFLAGS@ \ 58@EFL_CFLAGS@ \
56@EFL_COV_CFLAGS@ \ 59@EFL_COV_CFLAGS@ \
@@ -58,12 +61,14 @@ lib_ecore_libecore_la_CPPFLAGS = \
58 61
59if HAVE_WINDOWS 62if HAVE_WINDOWS
60lib_ecore_libecore_la_CPPFLAGS += \ 63lib_ecore_libecore_la_CPPFLAGS += \
61-I$(top_srcdir)/src/lib/evil 64-I$(top_srcdir)/src/lib/evil \
65-I$(top_builddir)/src/lib/evil
62endif 66endif
63 67
64if HAVE_PS3 68if HAVE_PS3
65lib_ecore_libecore_la_CPPFLAGS += \ 69lib_ecore_libecore_la_CPPFLAGS += \
66-I$(top_srcdir)/src/lib/escape 70-I$(top_srcdir)/src/lib/escape \
71-I$(top_builddir)/src/lib/escape
67endif 72endif
68 73
69lib_ecore_libecore_la_LIBADD = \ 74lib_ecore_libecore_la_LIBADD = \
@@ -103,6 +108,13 @@ tests_ecore_ecore_suite_CPPFLAGS = \
103-I$(top_srcdir)/src/lib/ecore_con \ 108-I$(top_srcdir)/src/lib/ecore_con \
104-I$(top_srcdir)/src/lib/ecore_file \ 109-I$(top_srcdir)/src/lib/ecore_file \
105-I$(top_srcdir)/src/lib/ecore_x \ 110-I$(top_srcdir)/src/lib/ecore_x \
111-I$(top_builddir)/src/lib/eina \
112-I$(top_builddir)/src/lib/eo \
113-I$(top_builddir)/src/lib/ecore \
114-I$(top_builddir)/src/lib/ecore_audio \
115-I$(top_builddir)/src/lib/ecore_con \
116-I$(top_builddir)/src/lib/ecore_file \
117-I$(top_builddir)/src/lib/ecore_x \
106-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 118-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
107@CHECK_CFLAGS@ 119@CHECK_CFLAGS@
108 120