summaryrefslogtreecommitdiff
path: root/src/Makefile_Embryo.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_Embryo.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_Embryo.am')
-rw-r--r--src/Makefile_Embryo.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 600b51c..32f6b14 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -18,6 +18,7 @@ lib/embryo/embryo_private.h
18 18
19lib_embryo_libembryo_la_CPPFLAGS = \ 19lib_embryo_libembryo_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \ 20-I$(top_srcdir)/src/lib/eina \
21-I$(top_builddir)/src/lib/eina \
21-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 22-DPACKAGE_BIN_DIR=\"$(bindir)\" \
22-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
23-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@@ -26,7 +27,8 @@ lib_embryo_libembryo_la_CPPFLAGS = \
26 27
27if HAVE_WINDOWS 28if HAVE_WINDOWS
28lib_embryo_libembryo_la_CPPFLAGS += \ 29lib_embryo_libembryo_la_CPPFLAGS += \
29-I$(top_srcdir)/src/lib/evil 30-I$(top_srcdir)/src/lib/evil \
31-I$(top_builddir)/src/lib/evil
30endif 32endif
31 33
32lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la 34lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la
@@ -62,6 +64,8 @@ bin/embryo/embryo_cc_prefix.h
62bin_embryo_embryo_cc_CPPFLAGS = \ 64bin_embryo_embryo_cc_CPPFLAGS = \
63-I$(top_srcdir)/src/lib/eina \ 65-I$(top_srcdir)/src/lib/eina \
64-I$(top_srcdir)/src/lib/embryo \ 66-I$(top_srcdir)/src/lib/embryo \
67-I$(top_builddir)/src/lib/eina \
68-I$(top_builddir)/src/lib/embryo \
65-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 69-DPACKAGE_BIN_DIR=\"$(bindir)\" \
66-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 70-DPACKAGE_LIB_DIR=\"$(libdir)\" \
67-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 71-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@@ -69,7 +73,8 @@ bin_embryo_embryo_cc_CPPFLAGS = \
69 73
70if HAVE_WINDOWS 74if HAVE_WINDOWS
71bin_embryo_embryo_cc_CPPFLAGS += \ 75bin_embryo_embryo_cc_CPPFLAGS += \
72-I$(top_srcdir)/src/lib/evil 76-I$(top_srcdir)/src/lib/evil \
77-I$(top_builddir)/src/lib/evil
73endif 78endif
74 79
75bin_embryo_embryo_cc_LDADD = \ 80bin_embryo_embryo_cc_LDADD = \