diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2008-12-14 10:18:41 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2008-12-14 10:18:41 +0000 |
| commit | b817d69996c17a4e2c22b2b76769ac26b400d212 (patch) | |
| tree | 7f1bad1775e63d289df385344407a6731cd76169 | |
| parent | 5b908316c02b773bd7b1ef9db9835224d4af88d2 (diff) | |
| download | libxklavier-b817d69996c17a4e2c22b2b76769ac26b400d212.tar.gz | |
small cygwin fixes, b.fd.o#19030
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libxklavier/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-12-14 svu + + * libxklavier/Makefile.am, tests/Makefile.am: small cygwin fixes, + http://bugs.freedesktop.org/show_bug.cgi?id=19030 + 2008-11-26 Rob Bradford <rob@linux.intel.com> * libxklavier/Makefile.am: diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am index fdba712..be4aa72 100644 --- a/libxklavier/Makefile.am +++ b/libxklavier/Makefile.am @@ -45,7 +45,8 @@ libxklavier_la_SOURCES = xklavier.c xklavier_evt.c xklavier_config.c xklavier_co xklavier_xmm.c xklavier_xmm_opts.c xklavier_evt_xmm.c xklavier_config_xmm.c \ xklavier_util.c xklavier_props.c xklavier_dump.c xkl_engine_marshal.c \ $(noinst_HEADERS) $(xklavierinc_HEADERS) -libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ \ +libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined +libxklavier_la_LIBADD = \ $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \ $(LIBXKBFILE_PRESENT_LDFLAGS) \ $(X_LIBS) $(LIBICONV) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7b791a8..87afeff 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,5 +6,5 @@ test_monitor_SOURCES=test_monitor.c AM_CFLAGS=-Wall -Werror $(X_CFLAGS) -I$(top_srcdir) $(GLIB_CFLAGS) -AM_LDFLAGS=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) -lX11 $(GLIB_LIBS) +LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) -lX11 $(GLIB_LIBS) |