summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore_Evas.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_Evas.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_Evas.am')
-rw-r--r--src/Makefile_Ecore_Evas.am29
1 files changed, 28 insertions, 1 deletions
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 6f437df465..f0f5aa8c52 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -26,6 +26,15 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
26-I$(top_srcdir)/src/lib/ecore_input_evas \ 26-I$(top_srcdir)/src/lib/ecore_input_evas \
27-I$(top_srcdir)/src/lib/ecore_evas \ 27-I$(top_srcdir)/src/lib/ecore_evas \
28-I$(top_srcdir)/src/modules/evas/engines/buffer \ 28-I$(top_srcdir)/src/modules/evas/engines/buffer \
29-I$(top_builddir)/src/lib/eina \
30-I$(top_builddir)/src/lib/eo \
31-I$(top_builddir)/src/lib/evas \
32-I$(top_builddir)/src/lib/ecore \
33-I$(top_builddir)/src/lib/ecore_ipc \
34-I$(top_builddir)/src/lib/ecore_input \
35-I$(top_builddir)/src/lib/ecore_input_evas \
36-I$(top_builddir)/src/lib/ecore_evas \
37-I$(top_builddir)/src/modules/evas/engines/buffer \
29-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 38-DPACKAGE_LIB_DIR=\"$(libdir)\" \
30-DEFL_ECORE_EVAS_BUILD \ 39-DEFL_ECORE_EVAS_BUILD \
31@EFL_CFLAGS@ \ 40@EFL_CFLAGS@ \
@@ -33,7 +42,8 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
33 42
34if HAVE_WINDOWS 43if HAVE_WINDOWS
35lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ 44lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
36-I$(top_srcdir)/src/lib/evil 45-I$(top_srcdir)/src/lib/evil \
46-I$(top_builddir)/src/lib/evil
37endif 47endif
38 48
39lib_ecore_evas_libecore_evas_la_LIBADD = \ 49lib_ecore_evas_libecore_evas_la_LIBADD = \
@@ -76,6 +86,9 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
76-I$(top_srcdir)/src/lib/ecore_x \ 86-I$(top_srcdir)/src/lib/ecore_x \
77-I$(top_srcdir)/src/modules/evas/engines/software_x11 \ 87-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
78-I$(top_srcdir)/src/modules/evas/engines/gl_x11 \ 88-I$(top_srcdir)/src/modules/evas/engines/gl_x11 \
89-I$(top_builddir)/src/lib/ecore_x \
90-I$(top_builddir)/src/modules/evas/engines/software_x11 \
91-I$(top_builddir)/src/modules/evas/engines/gl_x11
79modules_ecore_evas_engines_x_module_la_LIBADD = \ 92modules_ecore_evas_engines_x_module_la_LIBADD = \
80lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 93lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
81lib/ecore_x/libecore_x.la 94lib/ecore_x/libecore_x.la
@@ -92,6 +105,8 @@ modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \
92$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 105$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
93-I$(top_srcdir)/src/lib/ecore_cocoa \ 106-I$(top_srcdir)/src/lib/ecore_cocoa \
94-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa \ 107-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa \
108-I$(top_builddir)/src/lib/ecore_cocoa \
109-I$(top_builddir)/src/modules/evas/engines/gl_cocoa
95modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ 110modules_ecore_evas_engines_cocoa_module_la_LIBADD = \
96lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 111lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
97lib/ecore_cocoa/libecore_cocoa.la 112lib/ecore_cocoa/libecore_cocoa.la
@@ -108,6 +123,8 @@ modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \
108$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 123$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
109-I$(top_srcdir)/src/lib/ecore_fb \ 124-I$(top_srcdir)/src/lib/ecore_fb \
110-I$(top_srcdir)/src/modules/evas/engines/fb \ 125-I$(top_srcdir)/src/modules/evas/engines/fb \
126-I$(top_builddir)/src/lib/ecore_fb \
127-I$(top_builddir)/src/modules/evas/engines/fb
111modules_ecore_evas_engines_fb_module_la_LIBADD = \ 128modules_ecore_evas_engines_fb_module_la_LIBADD = \
112lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 129lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
113lib/ecore_fb/libecore_fb.la 130lib/ecore_fb/libecore_fb.la
@@ -124,6 +141,8 @@ modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \
124$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 141$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
125-I$(top_srcdir)/src/lib/ecore_psl1ght \ 142-I$(top_srcdir)/src/lib/ecore_psl1ght \
126-I$(top_srcdir)/src/modules/evas/engines/psl1ght \ 143-I$(top_srcdir)/src/modules/evas/engines/psl1ght \
144-I$(top_builddir)/src/lib/ecore_psl1ght \
145-I$(top_builddir)/src/modules/evas/engines/psl1ght
127modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ 146modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \
128lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 147lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
129lib/ecore_psl1ght/libecore_psl1ght.la 148lib/ecore_psl1ght/libecore_psl1ght.la
@@ -145,6 +164,9 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
145-I$(top_srcdir)/src/lib/ecore_wayland \ 164-I$(top_srcdir)/src/lib/ecore_wayland \
146-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \ 165-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
147-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ 166-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
167-I$(top_builddir)/src/lib/ecore_wayland \
168-I$(top_builddir)/src/modules/evas/engines/wayland_shm \
169-I$(top_builddir)/src/modules/evas/engines/wayland_egl \
148@ECORE_WAYLAND_CFLAGS@ 170@ECORE_WAYLAND_CFLAGS@
149modules_ecore_evas_engines_wayland_module_la_LIBADD = \ 171modules_ecore_evas_engines_wayland_module_la_LIBADD = \
150lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 172lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
@@ -163,6 +185,8 @@ modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \
163$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ 185$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
164-I$(top_srcdir)/src/lib/ecore_sdl \ 186-I$(top_srcdir)/src/lib/ecore_sdl \
165-I$(top_srcdir)/src/modules/evas/engines/gl_sdl \ 187-I$(top_srcdir)/src/modules/evas/engines/gl_sdl \
188-I$(top_builddir)/src/lib/ecore_sdl \
189-I$(top_builddir)/src/modules/evas/engines/gl_sdl
166modules_ecore_evas_engines_sdl_module_la_LIBADD = \ 190modules_ecore_evas_engines_sdl_module_la_LIBADD = \
167lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ 191lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \
168lib/ecore_sdl/libecore_sdl.la 192lib/ecore_sdl/libecore_sdl.la
@@ -181,6 +205,9 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
181-I$(top_srcdir)/src/lib/ecore_win32 \ 205-I$(top_srcdir)/src/lib/ecore_win32 \
182-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ 206-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
183-I$(top_srcdir)/src/modules/evas/engines/software_gdi \ 207-I$(top_srcdir)/src/modules/evas/engines/software_gdi \
208-I$(top_builddir)/src/lib/ecore_win32 \
209-I$(top_builddir)/src/modules/evas/engines/software_ddraw \
210-I$(top_builddir)/src/modules/evas/engines/software_gdi
184modules_ecore_evas_engines_win32_module_la_LIBADD = \ 211modules_ecore_evas_engines_win32_module_la_LIBADD = \
185lib/ecore/libeecore_evas.la @EFL_LIBS@ \ 212lib/ecore/libeecore_evas.la @EFL_LIBS@ \
186lib/ecore_win32/libecore_win32.la 213lib/ecore_win32/libecore_win32.la