enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl: enable back Ecore_Evas build after merge. 

SVN revision: 80037
This commit is contained in:
Cedric BAIL 2012-12-03 10:21:16 +00:00
parent ce2972a214
commit 3d346a6511
2 changed files with 65 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -53,6 +53,7 @@ endif
if HAVE_ECORE_X if HAVE_ECORE_X
include Makefile_Ecore_X.am include Makefile_Ecore_X.am
endif endif
include Makefile_Ecore_Evas.am
include Makefile_Ecore_Imf.am include Makefile_Ecore_Imf.am
include Makefile_Embryo.am include Makefile_Embryo.am

101
src/Makefile_Ecore_Evas.am
View File

@ -25,7 +25,7 @@ lib/ecore_evas/ecore_evas_wayland_egl.c \
lib/ecore_evas/ecore_evas_extn.c \ lib/ecore_evas/ecore_evas_extn.c \
lib/ecore_evas/ecore_evas_private.h lib/ecore_evas/ecore_evas_private.h
if BUILD_ECORE_WAYLAND if HAVE_ECORE_WAYLAND
lib_ecore_evas_libecore_evas_la_SOURCES += \ lib_ecore_evas_libecore_evas_la_SOURCES += \
lib/ecore_evas/ecore_evas_wayland_common.c lib/ecore_evas/ecore_evas_wayland_common.c
endif endif
@ -33,127 +33,154 @@ endif
lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eo \
-I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_ipc \ -I$(top_srcdir)/src/lib/ecore_ipc \
-I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_input \
-I$(top_srcdir)/src/lib/ecore_input_evas \ -I$(top_srcdir)/src/lib/ecore_input_evas \
-I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_srcdir)/src/modules/evas/engines/buffer \
-I$(top_builddir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \ -I$(top_builddir)/src/lib/eo \
-I$(top_builddir)/src/lib/evas \
-I$(top_builddir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_ipc \ -I$(top_builddir)/src/lib/ecore_ipc \
-I$(top_builddir)/src/lib/ecore_input \ -I$(top_builddir)/src/lib/ecore_input \
-I$(top_builddir)/src/lib/ecore_input_evas \ -I$(top_builddir)/src/lib/ecore_input_evas \
-I$(top_builddir)/src/lib/ecore_evas \ -I$(top_builddir)/src/lib/ecore_evas \
-I$(top_builddir)/src/modules/evas/engines/buffer \
-DEFL_ECORE_EVAS_BUILD \ -DEFL_ECORE_EVAS_BUILD \
@EFL_CFLAGS@ \ @EFL_CFLAGS@ \
@EFL_COV_CFLAGS@ @EFL_COV_CFLAGS@
if BUILD_ECORE_COCOA if HAVE_ECORE_COCOA
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_cocoa \ -I$(top_srcdir)/src/lib/ecore_cocoa \
-I$(top_builddir)/src/lib/ecore_cocoa -I$(top_srcdir)/src/modules/evas/engines/gl_cocoa \
-I$(top_builddir)/src/lib/ecore_cocoa \
-I$(top_builddir)/src/modules/evas/engines/gl_cocoa
endif endif
if BUILD_ECORE_DIRECTFB if HAVE_ECORE_DIRECTFB
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_directfb \ -I$(top_srcdir)/src/lib/ecore_directfb \
-I$(top_builddir)/src/lib/ecore_directfb -I$(top_srcdir)/src/modules/evas/engines/directfb \
-I$(top_builddir)/src/lib/ecore_directfb \
-I$(top_builddir)/src/modules/evas/engines/directfb
endif endif
if BUILD_ECORE_FB if HAVE_ECORE_FB
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_fb \ -I$(top_srcdir)/src/lib/ecore_fb \
-I$(top_builddir)/src/lib/ecore_fb -I$(top_srcdir)/src/modules/evas/engines/fb \
-I$(top_builddir)/src/lib/ecore_fb \
-I$(top_builddir)/src/modules/evas/engines/fb
endif endif
if BUILD_ECORE_PSL1GHT if HAVE_PS3
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_psl1ght \ -I$(top_srcdir)/src/lib/ecore_psl1ght \
-I$(top_builddir)/src/lib/ecore_psl1ght -I$(top_srcdir)/src/modules/evas/engines/psl1ght \
-I$(top_builddir)/src/lib/ecore_psl1ght \
-I$(top_builddir)/src/modules/evas/engines/psl1ght
endif endif
if BUILD_ECORE_SDL if HAVE_ECORE_SDL
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_sdl \ -I$(top_srcdir)/src/lib/ecore_sdl \
-I$(top_builddir)/src/lib/ecore_sdl -I$(top_srcdir)/src/modules/evas/engines/gl_sdl \
-I$(top_builddir)/src/lib/ecore_sdl \
-I$(top_builddir)/src/modules/evas/engines/gl_sdl
endif endif
if BUILD_ECORE_WAYLAND if HAVE_ECORE_WAYLAND
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_wayland \ -I$(top_srcdir)/src/lib/ecore_wayland \
-I$(top_builddir)/src/lib/ecore_wayland -I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
-I$(top_builddir)/src/lib/ecore_wayland \
-I$(top_builddir)/src/modules/evas/engines/wayland_shm \
-I$(top_builddir)/src/modules/evas/engines/wayland_egl
endif endif
if BUILD_ECORE_WIN32 if HAVE_WIN32
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_win32 \ -I$(top_srcdir)/src/lib/ecore_win32 \
-I$(top_builddir)/src/lib/ecore_win32 -I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
-I$(top_srcdir)/src/modules/evas/engines/direct3d \
-I$(top_builddir)/src/lib/ecore_win32 \
-I$(top_builddir)/src/modules/evas/engines/software_ddraw \
-I$(top_builddir)/src/modules/evas/engines/direct3d
endif endif
if BUILD_ECORE_WINCE if HAVE_WINCE
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_wince \ -I$(top_srcdir)/src/lib/ecore_wince \
-I$(top_builddir)/src/lib/ecore_wince -I$(top_builddir)/src/lib/ecore_wince
endif endif
if BUILD_ECORE_X if HAVE_ECORE_X
lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/ecore_x \ -I$(top_srcdir)/src/lib/ecore_x \
-I$(top_builddir)/src/lib/ecore_x -I$(top_srcdir)/src/modules/evas/engines/software_x11 \
-I$(top_srcdir)/src/modules/evas/engines/gl_x11 \
-I$(top_builddir)/src/lib/ecore_x \
-I$(top_builddir)/src/modules/evas/engines/software_x11 \
-I$(top_builddir)/src/modules/evas/engines/gl_x11
endif endif
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD = \
lib/ecore_input_evas/libecore_input_evas.la \ lib/ecore_input/libecore_input_evas.la \
lib/ecore_input/libecore_input.la \ lib/ecore_input/libecore_input.la \
lib/ecore_ipc/libecore_ipc.la \ lib/ecore_ipc/libecore_ipc.la \
lib/ecore/libecore.la \ lib/ecore/libecore.la \
lib/evas/libevas.la \
lib/eo/libeo.la \ lib/eo/libeo.la \
lib/eina/libeina.la \ lib/eina/libeina.la \
@ECORE_EVAS_LIBS@ @ECORE_EVAS_LIBS@
if BUILD_ECORE_COCOA if HAVE_ECORE_COCOA
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_cocoa/libecore_cocoa.la lib/ecore_cocoa/libecore_cocoa.la
endif endif
if BUILD_ECORE_DIRECTFB if HAVE_ECORE_DIRECTFB
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_directfb/libecore_directfb.la lib/ecore_directfb/libecore_directfb.la
endif endif
if BUILD_ECORE_FB if HAVE_ECORE_FB
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_fb/libecore_fb.la lib/ecore_fb/libecore_fb.la
endif endif
if BUILD_ECORE_PSL1GHT if HAVE_PS3
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_psl1ght/libecore_psl1ght.la lib/ecore_psl1ght/libecore_psl1ght.la
endif endif
if BUILD_ECORE_SDL if HAVE_ECORE_SDL
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_sdl/libecore_sdl.la lib/ecore_sdl/libecore_sdl.la
endif endif
if BUILD_ECORE_WAYLAND if HAVE_ECORE_WAYLAND
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_wayland/libecore_wayland.la lib/ecore_wayland/libecore_wayland.la
endif endif
if BUILD_ECORE_WIN32 if HAVE_WIN32
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_win32/libecore_win32.la lib/ecore_win32/libecore_win32.la
endif endif
if BUILD_ECORE_WINCE if HAVE_WINCE
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_wince/libecore_wince.la lib/ecore_wince/libecore_wince.la
endif endif
if BUILD_ECORE_X if HAVE_ECORE_X
lib_ecore_evas_libecore_evas_la_LIBADD = \ lib_ecore_evas_libecore_evas_la_LIBADD += \
lib/ecore_x/libecore_x.la lib/ecore_x/libecore_x.la
endif endif