3 files changed, 12 insertions, 4 deletions

diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index 79fcfda..da42115 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -159,6 +159,7 @@ modules_ecore_imf_xim_xim_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_x \
 -I$(top_srcdir)/src/lib/ecore_imf \
 @ECORE_IMF_CFLAGS@ \
+@ecore_imf_xim_cflags@ \
 @EFL_COV_CFLAGS@
 modules_ecore_imf_xim_xim_la_LIBADD = \
 lib/ecore_imf/libecore_imf.la \
@@ -166,6 +167,7 @@ lib/ecore_x/libecore_x.la \
 lib/ecore/libecore.la \
 lib/eo/libeo.la \
 lib/eina/libeina.la \
+@ecore_imf_xim_libs@ \
 @EFL_COV_LIBS@
 modules_ecore_imf_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 modules_ecore_imf_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index 502f981..eea0a17 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -131,7 +131,7 @@ $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h
 BUILT_SOURCES += \
 $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
 
-$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h: $(KEYSYMDEFS) $(top_builddir)/src/utils/ecore/makekeys$(EXEEXT)
+$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h: $(KEYSYMDEFS) utils/ecore/makekeys$(EXEEXT)
         $(top_builddir)/src/utils/ecore/makekeys $(KEYSYMDEFS) > $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h
         mv -f $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
 endif
@@ -141,6 +141,7 @@ endif
 noinst_PROGRAMS += utils/ecore/makekeys
 
 utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
+utils_ecore_makekeys_CFLAGS = @ECORE_X_CFLAGS@
 
 endif
 EXTRA_DIST += utils/ecore/mkks.sh
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 1893e1c..4c99c78 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -553,6 +553,9 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -DEFL_EVAS_BUILD \
 @EVAS_CFLAGS@
+if BUILD_ENGINE_GL_X11
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
+endif
 modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
 lib/eet/libeet.la \
 lib/evas/libevas.la
@@ -653,9 +656,9 @@ if EVAS_STATIC_BUILD_GL_X11
 lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES)
 lib_evas_libevas_la_CPPFLAGS += \
 -I$(top_srcdir)/src/modules/evas/engines/gl_common \
-@evas_engine_gl_xlib_cflags@
+@evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
 lib_evas_libevas_la_LIBADD += \
-@evas_engine_gl_xlib_libs@
+@evas_engine_gl_xlib_libs@ @evas_engine_gl_xcb_libs@
 else
 engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
 engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
@@ -670,6 +673,7 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/modules/evas/engines/gl_common \
 @evas_engine_gl_xlib_cflags@ \
+@evas_engine_gl_xcb_cflags@ \
 @EVAS_CFLAGS@
 modules_evas_engines_gl_x11_module_la_LIBADD =
 if ! EVAS_STATIC_BUILD_GL_COMMON
@@ -679,7 +683,8 @@ endif
 modules_evas_engines_gl_x11_module_la_LIBADD += \
 lib/eet/libeet.la \
 lib/evas/libevas.la \
-@evas_engine_gl_xlib_libs@
+@evas_engine_gl_xlib_libs@ \
+@evas_engine_gl_xcb_libs@
 modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
 endif