Currect use of autotools: Use *_LIBADD and *_LDADD to replace some *_LDFLAGS.

diff --git a/bus/Makefile.am b/bus/Makefile.am
index ecddff1590da320dc675b842a3c8a50af946fbe0..bc2fed94fd1e19a99f29f249215daa1e895e4b80 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -37,7 +37,7 @@ AM_CFLAGS = \
        -DBINDIR=\"@bindir@\" \
        $(INCLUDES) \
        $(NULL)
-AM_LDFLAGS = \
+AM_LDADD = \
        @GOBJECT2_LIBS@ \
        @GLIB2_LIBS@ \
        @GTHREAD2_LIBS@ \
@@ -91,7 +91,7 @@ ibus_daemon_CFLAGS = \
        $(AM_CFLAGS) \
        $(NULL)
 ibus_daemon_LDADD = \
-       $(AM_LDFLAGS) \
+       $(AM_LDADD) \
        $(NULL)
 
 # test_registry_SOURCES = \

diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am
index 1f884a5006f3f7bfd365eda59dad9b3b43da86dd..ca2db11e2452c75e147ef32d1637a564f1d6feee 100644 (file)
--- a/client/gtk2/Makefile.am
+++ b/client/gtk2/Makefile.am
@@ -45,9 +45,11 @@ im_ibus_la_CFLAGS = \
        -DG_LOG_DOMAIN=\"IBUS\" \
        $(NULL)
 
-im_ibus_la_LDFLAGS = \
+im_ibus_la_LIBADD = \
        @GTK2_LIBS@ \
        @DBUS_LIBS@ \
+       $(NULL)
+im_ibus_la_LDFLAGS = \
        -avoid-version \
        -module \
        $(NULL)

diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 9aeec66d77a0114133e599cfaac421d5fb2b0d5d..af457275c4b0841e2089d79f6f13abfc858b5a3e 100644 (file)
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -39,9 +39,6 @@ ibus_x11_DEPENDENCIES = \
 ibus_x11_LDADD = \
        $(libIMdkit) \
        $(libibus) \
-       $(NULL)
-
-ibus_x11_LDFLAGS = \
        @X11_LIBS@ \
        @GTK2_LIBS@ \
        $(NULL)

diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index d4b1a9f0f2f37eca99cb9c5d3b9eab0b74fb0a02..0c7e38fd1960d3101a1c3fb4f1905effc5dfa6ab 100644 (file)
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -34,7 +34,7 @@ AM_CFLAGS = \
        -DG_LOG_DOMAIN=\"IBUS\" \
        $(INCLUDES) \
        $(NULL)
-AM_LDFLAGS = \
+AM_LDADD = \
        @GOBJECT2_LIBS@ \
        @GLIB2_LIBS@ \
        @GCONF_LIBS@ \
@@ -54,8 +54,8 @@ ibus_gconf_SOURCES = \
 ibus_gconf_CFLAGS = \
        $(AM_CFLAGS) \
        $(NULL)
-ibus_gconf_LDFLAGS = \
-       $(AM_LDFLAGS) \
+ibus_gconf_LDADD = \
+       $(AM_LDADD) \
        $(NULL)
 
 component_DATA = \

diff --git a/src/Makefile.am b/src/Makefile.am
index 4db7839b616b05bacbeb305b3a59f3b1ef2d0a1d..4f284b2e0394ec3183c2b470698daf75e2cb38b5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -133,12 +133,14 @@ libibus_la_CFLAGS = \
        -DG_LOG_DOMAIN=\"IBUS\" \
        -DIBUS_DATA_DIR=\"$(pkgdatadir)\" \
        $(NULL)
-libibus_la_LDFLAGS = \
+libibus_la_LIBADD = \
        @X11_LIBS@ \
        @GLIB2_LIBS@ \
        @GOBJECT2_LIBS@ \
        @GIO2_LIBS@ \
        @DBUS_LIBS@ \
+       $(NULL)
+libibus_la_LDFLAGS = \
        -export-symbols-regex "ibus_.*" \
        -version-info @LT_VERSION_INFO@ \
        $(NULL)
@@ -160,7 +162,7 @@ AM_CFLAGS = \
        @DBUS_CFLAGS@ \
        -DG_LOG_DOMAIN=\"IBUS\" \
        $(NULL)
-AM_LDFLAGS = \
+AM_LDADD = \
        $(DEPS) \
        @GLIB2_LIBS@ \
        @GOBJECT2_LIBS@ \
@@ -181,12 +183,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)
+test_bus_LDADD = $(AM_LDADD)
+test_text_LDADD = $(AM_LDADD)
+test_keymap_LDADD = $(AM_LDADD)
+test_keynames_LDADD = $(AM_LDADD)
+test_attribute_LDADD = $(AM_LDADD)
+test_lookuptable_LDADD = $(AM_LDADD)
 
 # gen enum types
 ibusenumtypes.h: stamp-ibusenumtypes.h