diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libxklavier/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2009-02-21 svu + + * libxklavier/Makefile.am, tests/Makefile.am: reordering CFLAGS, + http://bugs.freedesktop.org/show_bug.cgi?id=20244 + 2009-01-21 svu * configure.in: eliminate bashisms, diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am index be4aa72..4a335dd 100644 --- a/libxklavier/Makefile.am +++ b/libxklavier/Makefile.am @@ -27,7 +27,7 @@ xkl_engine_marshal.c: xkl_engine_marshal.h $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --body > xkl_engine_marshal.c AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - -I. $(X_CFLAGS) -I$(top_srcdir) \ + -I. -I$(top_srcdir) $(X_CFLAGS) \ $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \ $(LIBXKBFILE_PRESENT_CFLAG) \ $(ENABLE_XKB_SUPPORT_CFLAG) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 87afeff..342606c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,7 @@ test_config_SOURCES=test_config.c test_monitor_SOURCES=test_monitor.c -AM_CFLAGS=-Wall -Werror $(X_CFLAGS) -I$(top_srcdir) $(GLIB_CFLAGS) +AM_CFLAGS=-Wall -Werror -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS) LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) -lX11 $(GLIB_LIBS) |