Fix link errors in Ubuntu

diff --git a/bus/Makefile.am b/bus/Makefile.am
index b4119f9..ecddff1 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -38,6 +38,7 @@ AM_CFLAGS = \
        $(INCLUDES) \
        $(NULL)
 AM_LDFLAGS = \
+       @GOBJECT2_LIBS@ \
        @GLIB2_LIBS@ \
        @GTHREAD2_LIBS@ \
        @DBUS_LIBS@ \

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 9f60772..9aeec66 100644 (file)
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -42,6 +42,7 @@ ibus_x11_LDADD = \
        $(NULL)
 
 ibus_x11_LDFLAGS = \
+       @X11_LIBS@ \
        @GTK2_LIBS@ \
        $(NULL)
 

diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 0f78189..d4b1a9f 100644 (file)
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -35,6 +35,7 @@ AM_CFLAGS = \
        $(INCLUDES) \
        $(NULL)
 AM_LDFLAGS = \
+       @GOBJECT2_LIBS@ \
        @GLIB2_LIBS@ \
        @GCONF_LIBS@ \
        @DBUS_LIBS@ \

diff --git a/src/Makefile.am b/src/Makefile.am
index 64f468c..4db7839 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,6 +162,8 @@ AM_CFLAGS = \
        $(NULL)
 AM_LDFLAGS = \
        $(DEPS) \
+       @GLIB2_LIBS@ \
+       @GOBJECT2_LIBS@ \
        $(NULL)
 
 TESTS = \
@@ -179,6 +181,12 @@ test_keymap_DEPENDENCIES = $(DEPS)
 test_keynames_DEPENDENCIES = $(DEPS)
 test_attribute_DEPENDENCIES = $(DEPS)
 test_lookuptable_DEPENDENCIES = $(DEPS)
+test_bus_LDFLAGS = $(AM_LDFLAGS)
+test_text_LDFLAGS = $(AM_LDFLAGS)
+test_keymap_LDFLAGS = $(AM_LDFLAGS)
+test_keynames_LDFLAGS = $(AM_LDFLAGS)
+test_attribute_LDFLAGS = $(AM_LDFLAGS)
+test_lookuptable_LDFLAGS = $(AM_LDFLAGS)
 
 # gen enum types
 ibusenumtypes.h: stamp-ibusenumtypes.h