kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas: Fix wayland-egl build on merged efl tree. 

SVN revision: 78920
This commit is contained in:
Rafael Antognolli 2012-11-05 11:08:37 +00:00
parent 8091219f10
commit db1ef2dad7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile_Evas.am
View File

@ -1038,7 +1038,9 @@ modules/evas/engines/wayland_egl/evas_wl_main.c \
modules/evas/engines/wayland_egl/evas_engine.h modules/evas/engines/wayland_egl/evas_engine.h
if EVAS_STATIC_BUILD_WAYLAND_EGL if EVAS_STATIC_BUILD_WAYLAND_EGL
lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES) lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES)
lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@ lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_wayland_egl_cflags@
lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_egl_libs@ lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_egl_libs@
else else
enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
@ -1049,16 +1051,22 @@ modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eo \ -I$(top_builddir)/src/lib/eo \
-I$(top_srcdir)/src/lib/eet \
-I$(top_builddir)/src/lib/eet \
-I$(top_srcdir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas \
-I$(top_builddir)/src/lib/evas \ -I$(top_builddir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/include \
-I$(top_builddir)/src/lib/evas/include \ -I$(top_builddir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_builddir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
-I$(top_builddir)/src/modules/evas/engines/gl_common \
@evas_engine_wayland_egl_cflags@ \ @evas_engine_wayland_egl_cflags@ \
@EFL_CFLAGS@ \ @EFL_CFLAGS@ \
@EVAS_CFLAGS@ @EVAS_CFLAGS@
modules_evas_engines_wayland_egl_module_la_LIBADD = \ modules_evas_engines_wayland_egl_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
lib/eet/libeet.la \
lib/evas/libevas.la \ lib/evas/libevas.la \
@EFL_LIBS@ \ @EFL_LIBS@ \
@evas_engine_wayland_egl_libs@ @evas_engine_wayland_egl_libs@
@ -2093,4 +2101,4 @@ bin_evas_loaders_xpm_module_la_CPPFLAGS = \
bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@ bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@
bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version
bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif endif