summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-09 16:48:40 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-09 16:48:40 +0000
commit57090b2abbb9dea419c99c5ce33a48e07ec33725 (patch)
treec5f6dd8cf2883a413994f0be2c6fb5df2b2d0c3f /src
parentf0a7a2a75170043bb3c44e511cc3558dc585293c (diff)
efl: improve X detection by Joel Klinghed.
* Split out ecore_imf_xim to do its own check * Fixed problem with xcb's makekeys, no rule for $(top_builddir)/src/utils/ecore/makekeys$(EXEEXT) exists so make used an implicit rule (ignoring any cflags of course) * Fixed gl_x11 engine to build with either Xlib or XCB (xcb flags were missing) * Added EFL_FIND_X and replace any used of AC_PATH_X{,TRA}. First looks for Xorg pkg-config files then if those arn't found it falls back to old AC_PATH_X. Also generalized common header and lib checks. Could probably use some polishing (the AC_CACHE_VAL cruft especially) but this is what I have time for tonight. Now X11 should be found on non-standard locations by means of xmkmf, --x-includes/--x-libraries and also pkg-config. SVN revision: 82475
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Ecore_Imf.am2
-rw-r--r--src/Makefile_Ecore_X.am3
-rw-r--r--src/Makefile_Evas.am11
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 = \
159-I$(top_builddir)/src/lib/ecore_x \ 159-I$(top_builddir)/src/lib/ecore_x \
160-I$(top_srcdir)/src/lib/ecore_imf \ 160-I$(top_srcdir)/src/lib/ecore_imf \
161@ECORE_IMF_CFLAGS@ \ 161@ECORE_IMF_CFLAGS@ \
162@ecore_imf_xim_cflags@ \
162@EFL_COV_CFLAGS@ 163@EFL_COV_CFLAGS@
163modules_ecore_imf_xim_xim_la_LIBADD = \ 164modules_ecore_imf_xim_xim_la_LIBADD = \
164lib/ecore_imf/libecore_imf.la \ 165lib/ecore_imf/libecore_imf.la \
@@ -166,6 +167,7 @@ lib/ecore_x/libecore_x.la \
166lib/ecore/libecore.la \ 167lib/ecore/libecore.la \
167lib/eo/libeo.la \ 168lib/eo/libeo.la \
168lib/eina/libeina.la \ 169lib/eina/libeina.la \
170@ecore_imf_xim_libs@ \
169@EFL_COV_LIBS@ 171@EFL_COV_LIBS@
170modules_ecore_imf_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 172modules_ecore_imf_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
171modules_ecore_imf_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static 173modules_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
131BUILT_SOURCES += \ 131BUILT_SOURCES += \
132$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h 132$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
133 133
134$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h: $(KEYSYMDEFS) $(top_builddir)/src/utils/ecore/makekeys$(EXEEXT) 134$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h: $(KEYSYMDEFS) utils/ecore/makekeys$(EXEEXT)
135 $(top_builddir)/src/utils/ecore/makekeys $(KEYSYMDEFS) > $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h 135 $(top_builddir)/src/utils/ecore/makekeys $(KEYSYMDEFS) > $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h
136 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 136 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
137endif 137endif
@@ -141,6 +141,7 @@ endif
141noinst_PROGRAMS += utils/ecore/makekeys 141noinst_PROGRAMS += utils/ecore/makekeys
142 142
143utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c 143utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
144utils_ecore_makekeys_CFLAGS = @ECORE_X_CFLAGS@
144 145
145endif 146endif
146EXTRA_DIST += utils/ecore/mkks.sh 147EXTRA_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 = \
553-I$(top_srcdir)/src/lib/evas/cserve2 \ 553-I$(top_srcdir)/src/lib/evas/cserve2 \
554-DEFL_EVAS_BUILD \ 554-DEFL_EVAS_BUILD \
555@EVAS_CFLAGS@ 555@EVAS_CFLAGS@
556if BUILD_ENGINE_GL_X11
557modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
558endif
556modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ 559modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
557lib/eet/libeet.la \ 560lib/eet/libeet.la \
558lib/evas/libevas.la 561lib/evas/libevas.la
@@ -653,9 +656,9 @@ if EVAS_STATIC_BUILD_GL_X11
653lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES) 656lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES)
654lib_evas_libevas_la_CPPFLAGS += \ 657lib_evas_libevas_la_CPPFLAGS += \
655-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 658-I$(top_srcdir)/src/modules/evas/engines/gl_common \
656@evas_engine_gl_xlib_cflags@ 659@evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
657lib_evas_libevas_la_LIBADD += \ 660lib_evas_libevas_la_LIBADD += \
658@evas_engine_gl_xlib_libs@ 661@evas_engine_gl_xlib_libs@ @evas_engine_gl_xcb_libs@
659else 662else
660engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) 663engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
661engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la 664engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
@@ -670,6 +673,7 @@ modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
670-I$(top_srcdir)/src/lib/evas/cserve2 \ 673-I$(top_srcdir)/src/lib/evas/cserve2 \
671-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 674-I$(top_srcdir)/src/modules/evas/engines/gl_common \
672@evas_engine_gl_xlib_cflags@ \ 675@evas_engine_gl_xlib_cflags@ \
676@evas_engine_gl_xcb_cflags@ \
673@EVAS_CFLAGS@ 677@EVAS_CFLAGS@
674modules_evas_engines_gl_x11_module_la_LIBADD = 678modules_evas_engines_gl_x11_module_la_LIBADD =
675if ! EVAS_STATIC_BUILD_GL_COMMON 679if ! EVAS_STATIC_BUILD_GL_COMMON
@@ -679,7 +683,8 @@ endif
679modules_evas_engines_gl_x11_module_la_LIBADD += \ 683modules_evas_engines_gl_x11_module_la_LIBADD += \
680lib/eet/libeet.la \ 684lib/eet/libeet.la \
681lib/evas/libevas.la \ 685lib/evas/libevas.la \
682@evas_engine_gl_xlib_libs@ 686@evas_engine_gl_xlib_libs@ \
687@evas_engine_gl_xcb_libs@
683modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 688modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
684modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static 689modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
685endif 690endif