summaryrefslogtreecommitdiff
path: root/src/Makefile_Eina.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_Eina.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_Eina.am')
-rw-r--r--src/Makefile_Eina.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index c8b0af401e..d3f5738818 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -159,6 +159,7 @@ einampchainedpool_LTLIBRARIES = chained_pool_module.la
159 159
160chained_pool_module_la_CPPFLAGS = \ 160chained_pool_module_la_CPPFLAGS = \
161-I$(top_srcdir)/src/lib/eina \ 161-I$(top_srcdir)/src/lib/eina \
162-I$(top_builddir)/src/lib/eina \
162-DEFL_EINA_BUILD 163-DEFL_EINA_BUILD
163chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ 164chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
164chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 165chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -175,6 +176,7 @@ einamponebig_LTLIBRARIES = one_big_module.la
175 176
176one_big_module_la_CPPFLAGS = \ 177one_big_module_la_CPPFLAGS = \
177-I$(top_srcdir)/src/lib/eina \ 178-I$(top_srcdir)/src/lib/eina \
179-I$(top_builddir)/src/lib/eina \
178-DEFL_EINA_BUILD 180-DEFL_EINA_BUILD
179one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ 181one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@
180one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 182one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -191,6 +193,7 @@ einamppassthrough_LTLIBRARIES = pass_through_module.la
191 193
192pass_through_module_la_CPPFLAGS = \ 194pass_through_module_la_CPPFLAGS = \
193-I$(top_srcdir)/src/lib/eina \ 195-I$(top_srcdir)/src/lib/eina \
196-I$(top_builddir)/src/lib/eina \
194-DEFL_EINA_BUILD 197-DEFL_EINA_BUILD
195pass_through_module_la_CFLAGS = @EINA_CFLAGS@ 198pass_through_module_la_CFLAGS = @EINA_CFLAGS@
196pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c 199pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -201,6 +204,7 @@ endif
201 204
202lib_eina_libeina_la_CPPFLAGS = \ 205lib_eina_libeina_la_CPPFLAGS = \
203-I$(top_srcdir)/src/lib/eina \ 206-I$(top_srcdir)/src/lib/eina \
207-I$(top_builddir)/src/lib/eina \
204-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 208-DPACKAGE_BIN_DIR=\"$(bindir)\" \
205-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 209-DPACKAGE_LIB_DIR=\"$(libdir)\" \
206-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 210-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@@ -212,7 +216,8 @@ lib_eina_libeina_la_CPPFLAGS = \
212 216
213if HAVE_WINDOWS 217if HAVE_WINDOWS
214lib_eina_libeina_la_CPPFLAGS += \ 218lib_eina_libeina_la_CPPFLAGS += \
215-I$(top_srcdir)/src/lib/evil 219-I$(top_srcdir)/src/lib/evil \
220-I$(top_builddir)/src/lib/evil
216endif 221endif
217 222
218lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ 223lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@
@@ -279,6 +284,7 @@ tests/eina/eina_test_value.c
279 284
280tests_eina_eina_suite_CPPFLAGS = \ 285tests_eina_eina_suite_CPPFLAGS = \
281-I$(top_srcdir)/src/lib/eina \ 286-I$(top_srcdir)/src/lib/eina \
287-I$(top_builddir)/src/lib/eina \
282-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ 288-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
283@CHECK_CFLAGS@ \ 289@CHECK_CFLAGS@ \
284@EINA_CFLAGS@ 290@EINA_CFLAGS@
@@ -293,6 +299,7 @@ tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
293 299
294tests_eina_cxx_compile_test_CPPFLAGS = \ 300tests_eina_cxx_compile_test_CPPFLAGS = \
295-I$(top_srcdir)/src/lib/eina \ 301-I$(top_srcdir)/src/lib/eina \
302-I$(top_builddir)/src/lib/eina \
296@CHECK_CFLAGS@ \ 303@CHECK_CFLAGS@ \
297@EINA_CFLAGS@ 304@EINA_CFLAGS@
298 305
@@ -308,6 +315,7 @@ tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
308 315
309tests_eina_module_dummy_la_CPPFLAGS = \ 316tests_eina_module_dummy_la_CPPFLAGS = \
310-I$(top_srcdir)/src/lib/eina \ 317-I$(top_srcdir)/src/lib/eina \
318-I$(top_builddir)/src/lib/eina \
311-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ 319-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
312@CHECK_CFLAGS@ \ 320@CHECK_CFLAGS@ \
313@EINA_CFLAGS@ \ 321@EINA_CFLAGS@ \