summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore_X.am
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/Makefile_Ecore_X.am
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/Makefile_Ecore_X.am')
-rw-r--r--src/Makefile_Ecore_X.am3
1 files changed, 2 insertions, 1 deletions
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