summaryrefslogtreecommitdiff
path: root/src/Makefile_Eet.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_Eet.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_Eet.am')
-rw-r--r--src/Makefile_Eet.am13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 44fbfe9c79..79d9a625a7 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -26,6 +26,9 @@ lib_eet_libeet_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/eina \ 26-I$(top_srcdir)/src/lib/eina \
27-I$(top_srcdir)/src/lib/eet \ 27-I$(top_srcdir)/src/lib/eet \
28-I$(top_srcdir)/src/static_libs/lz4 \ 28-I$(top_srcdir)/src/static_libs/lz4 \
29-I$(top_builddir)/src/lib/eina \
30-I$(top_builddir)/src/lib/eet \
31-I$(top_builddir)/src/static_libs/lz4 \
29-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 32-DPACKAGE_BIN_DIR=\"$(bindir)\" \
30-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 33-DPACKAGE_LIB_DIR=\"$(libdir)\" \
31-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 34-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
@@ -36,7 +39,8 @@ lib_eet_libeet_la_CPPFLAGS = \
36 39
37if HAVE_WINDOWS 40if HAVE_WINDOWS
38lib_eet_libeet_la_CPPFLAGS += \ 41lib_eet_libeet_la_CPPFLAGS += \
39-I$(top_srcdir)/src/lib/evil 42-I$(top_srcdir)/src/lib/evil \
43-I$(top_builddir)/src/lib/evil
40endif 44endif
41 45
42lib_eet_libeet_la_LIBADD = lib/eina/libeina.la 46lib_eet_libeet_la_LIBADD = lib/eina/libeina.la
@@ -60,6 +64,8 @@ bin_eet_eet_SOURCES = bin/eet/eet_main.c
60bin_eet_eet_CPPFLAGS = \ 64bin_eet_eet_CPPFLAGS = \
61-I$(top_srcdir)/src/lib/eina \ 65-I$(top_srcdir)/src/lib/eina \
62-I$(top_srcdir)/src/lib/eet \ 66-I$(top_srcdir)/src/lib/eet \
67-I$(top_builddir)/src/lib/eina \
68-I$(top_builddir)/src/lib/eet \
63-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 69-DPACKAGE_BIN_DIR=\"$(bindir)\" \
64-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 70-DPACKAGE_LIB_DIR=\"$(libdir)\" \
65-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 71-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@@ -69,7 +75,8 @@ bin_eet_eet_CPPFLAGS = \
69 75
70if HAVE_WINDOWS 76if HAVE_WINDOWS
71bin_eet_eet_CPPFLAGS += \ 77bin_eet_eet_CPPFLAGS += \
72-I$(top_srcdir)/src/lib/evil 78-I$(top_srcdir)/src/lib/evil \
79-I$(top_builddir)/src/lib/evil
73endif 80endif
74 81
75bin_eet_eet_LDADD = \ 82bin_eet_eet_LDADD = \
@@ -96,6 +103,8 @@ tests/eet/eet_suite.h
96tests_eet_eet_suite_CPPFLAGS = \ 103tests_eet_eet_suite_CPPFLAGS = \
97-I$(top_srcdir)/src/lib/eina \ 104-I$(top_srcdir)/src/lib/eina \
98-I$(top_srcdir)/src/lib/eet \ 105-I$(top_srcdir)/src/lib/eet \
106-I$(top_builddir)/src/lib/eina \
107-I$(top_builddir)/src/lib/eet \
99-DTESTS_SRC_DIR=\"$(top_srcdir)\" \ 108-DTESTS_SRC_DIR=\"$(top_srcdir)\" \
100@CHECK_CFLAGS@ \ 109@CHECK_CFLAGS@ \
101@EET_CFLAGS@ 110@EET_CFLAGS@