diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libxklavier/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -1,9 +1,14 @@ -2008-03-18 svu +2009-04-06 svu + + * libxklavier/Makefile.am, tests/Makefile.am: adding -lX11 to .la + file, http://bugs.freedesktop.org/show_bug.cgi?id=20243 + +2009-03-18 svu * Makefile.am, gtk-doc.make: unneeded external file should not be in dist/CVS * configure.in, NEWS: preparing 3.9 -2008-03-10 svu +2009-03-10 svu * libxklavier/xklavier_evt.c: The X11 error processing is more robust in relation to the missing engine (during the diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am index 4a335dd..f69a52e 100644 --- a/libxklavier/Makefile.am +++ b/libxklavier/Makefile.am @@ -49,6 +49,6 @@ libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined libxklavier_la_LIBADD = \ $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \ $(LIBXKBFILE_PRESENT_LDFLAGS) \ - $(X_LIBS) $(LIBICONV) + $(X_LIBS) -lX11 $(LIBICONV) diff --git a/tests/Makefile.am b/tests/Makefile.am index 342606c..d5c8e0b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,5 +6,5 @@ test_monitor_SOURCES=test_monitor.c AM_CFLAGS=-Wall -Werror -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS) -LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) -lX11 $(GLIB_LIBS) +LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS) |