summaryrefslogtreecommitdiff
path: root/src/Makefile_Eo.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_Eo.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_Eo.am')
-rw-r--r--src/Makefile_Eo.am21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 65d21913db..22fa8faa82 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -14,6 +14,8 @@ lib/eo/eo_private.h
14lib_eo_libeo_la_CPPFLAGS = \ 14lib_eo_libeo_la_CPPFLAGS = \
15-I$(top_srcdir)/src/lib/eina \ 15-I$(top_srcdir)/src/lib/eina \
16-I$(top_srcdir)/src/lib/eo \ 16-I$(top_srcdir)/src/lib/eo \
17-I$(top_builddir)/src/lib/eina \
18-I$(top_builddir)/src/lib/eo \
17-DNDEBUG \ 19-DNDEBUG \
18-DEFL_EO_BUILD \ 20-DEFL_EO_BUILD \
19@EFL_CFLAGS@ \ 21@EFL_CFLAGS@ \
@@ -22,7 +24,8 @@ lib_eo_libeo_la_CPPFLAGS = \
22 24
23if HAVE_WINDOWS 25if HAVE_WINDOWS
24lib_eo_libeo_la_CPPFLAGS += \ 26lib_eo_libeo_la_CPPFLAGS += \
25-I$(top_srcdir)/src/lib/evil 27-I$(top_srcdir)/src/lib/evil \
28-I$(top_builddir)/src/lib/evil
26endif 29endif
27 30
28lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ 31lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@
@@ -55,6 +58,8 @@ tests/eo/access/access_simple_protected.h
55tests_eo_test_access_CPPFLAGS = \ 58tests_eo_test_access_CPPFLAGS = \
56-I$(top_srcdir)/src/lib/eina \ 59-I$(top_srcdir)/src/lib/eina \
57-I$(top_srcdir)/src/lib/eo \ 60-I$(top_srcdir)/src/lib/eo \
61-I$(top_builddir)/src/lib/eina \
62-I$(top_builddir)/src/lib/eo \
58@CHECK_CFLAGS@ \ 63@CHECK_CFLAGS@ \
59@EO_CFLAGS@ 64@EO_CFLAGS@
60 65
@@ -72,6 +77,8 @@ tests/eo/composite_objects/composite_objects_simple.h
72tests_eo_test_composite_objects_CPPFLAGS = \ 77tests_eo_test_composite_objects_CPPFLAGS = \
73-I$(top_srcdir)/src/lib/eina \ 78-I$(top_srcdir)/src/lib/eina \
74-I$(top_srcdir)/src/lib/eo \ 79-I$(top_srcdir)/src/lib/eo \
80-I$(top_builddir)/src/lib/eina \
81-I$(top_builddir)/src/lib/eo \
75@CHECK_CFLAGS@ \ 82@CHECK_CFLAGS@ \
76@EO_CFLAGS@ 83@EO_CFLAGS@
77 84
@@ -101,6 +108,8 @@ tests/eo/constructors/constructors_simple7.h
101tests_eo_test_constructors_CPPFLAGS = \ 108tests_eo_test_constructors_CPPFLAGS = \
102-I$(top_srcdir)/src/lib/eina \ 109-I$(top_srcdir)/src/lib/eina \
103-I$(top_srcdir)/src/lib/eo \ 110-I$(top_srcdir)/src/lib/eo \
111-I$(top_builddir)/src/lib/eina \
112-I$(top_builddir)/src/lib/eo \
104@CHECK_CFLAGS@ \ 113@CHECK_CFLAGS@ \
105@EO_CFLAGS@ 114@EO_CFLAGS@
106 115
@@ -122,6 +131,8 @@ tests/eo/suite/eo_test_init.c
122tests_eo_eo_suite_CPPFLAGS = \ 131tests_eo_eo_suite_CPPFLAGS = \
123-I$(top_srcdir)/src/lib/eina \ 132-I$(top_srcdir)/src/lib/eina \
124-I$(top_srcdir)/src/lib/eo \ 133-I$(top_srcdir)/src/lib/eo \
134-I$(top_builddir)/src/lib/eina \
135-I$(top_builddir)/src/lib/eo \
125-DNDEBUG \ 136-DNDEBUG \
126@CHECK_CFLAGS@ \ 137@CHECK_CFLAGS@ \
127@EO_CFLAGS@ 138@EO_CFLAGS@
@@ -147,6 +158,8 @@ tests/eo/function_overrides/function_overrides_simple.h
147tests_eo_test_function_overrides_CPPFLAGS = \ 158tests_eo_test_function_overrides_CPPFLAGS = \
148-I$(top_srcdir)/src/lib/eina \ 159-I$(top_srcdir)/src/lib/eina \
149-I$(top_srcdir)/src/lib/eo \ 160-I$(top_srcdir)/src/lib/eo \
161-I$(top_builddir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eo \
150@CHECK_CFLAGS@ \ 163@CHECK_CFLAGS@ \
151@EO_CFLAGS@ 164@EO_CFLAGS@
152 165
@@ -166,6 +179,8 @@ tests/eo/interface/interface_simple.h
166tests_eo_test_interface_CPPFLAGS = \ 179tests_eo_test_interface_CPPFLAGS = \
167-I$(top_srcdir)/src/lib/eina \ 180-I$(top_srcdir)/src/lib/eina \
168-I$(top_srcdir)/src/lib/eo \ 181-I$(top_srcdir)/src/lib/eo \
182-I$(top_builddir)/src/lib/eina \
183-I$(top_builddir)/src/lib/eo \
169@CHECK_CFLAGS@ \ 184@CHECK_CFLAGS@ \
170@EO_CFLAGS@ 185@EO_CFLAGS@
171 186
@@ -191,6 +206,8 @@ tests/eo/mixin/mixin_simple.h
191tests_eo_test_mixin_CPPFLAGS = \ 206tests_eo_test_mixin_CPPFLAGS = \
192-I$(top_srcdir)/src/lib/eina \ 207-I$(top_srcdir)/src/lib/eina \
193-I$(top_srcdir)/src/lib/eo \ 208-I$(top_srcdir)/src/lib/eo \
209-I$(top_builddir)/src/lib/eina \
210-I$(top_builddir)/src/lib/eo \
194@CHECK_CFLAGS@ \ 211@CHECK_CFLAGS@ \
195@EO_CFLAGS@ 212@EO_CFLAGS@
196 213
@@ -206,6 +223,8 @@ tests/eo/signals/signals_simple.h
206tests_eo_test_signals_CPPFLAGS = \ 223tests_eo_test_signals_CPPFLAGS = \
207-I$(top_srcdir)/src/lib/eina \ 224-I$(top_srcdir)/src/lib/eina \
208-I$(top_srcdir)/src/lib/eo \ 225-I$(top_srcdir)/src/lib/eo \
226-I$(top_builddir)/src/lib/eina \
227-I$(top_builddir)/src/lib/eo \
209@CHECK_CFLAGS@ \ 228@CHECK_CFLAGS@ \
210@EO_CFLAGS@ 229@EO_CFLAGS@
211 230