Fix up linker flags

This adds LDFLAGS everywhere where they were previously pulled in via
other libraries. This is however unsupported by modern linkers.
You can trigger these failures by building with gold (or, I'm told, with
very new ld).

diff --git a/configure.in b/configure.in
index 26d752d4541123586066fddcad5112caf6e0300e..d5a83b0e9e6bfb8793840fb0f3ab3f368258a787 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -582,6 +582,7 @@ case $host in
   ;;
 esac
 
+AC_SUBST(MATH_LIB)
 #
 # see bug 162979
 #

diff --git a/demos/Makefile.am b/demos/Makefile.am
index 81e07f427a5fcdeb28cac7ffe140f6684805877c..f87b3cd8b9274bc14a9c1b312219f321875a9b25 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -19,7 +19,9 @@ DEPS =                                                                        \
 LDADDS =                                                               \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)                                                 \
+       $(MATH_LIB)
 
 noinst_PROGRAMS =              \
        testpixbuf-drawable     \

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 792ee35971bd576b0574987ef108e704ac2692da..698c242c0dc0719f70206df2f5505957fd52aecc 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -62,7 +62,8 @@ DEPS = \
 LDADDS = \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
 bin_PROGRAMS = gtk-demo
 

diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 3b3c09bcc9ccbe7dc14a09fdf5213b393870a190..66ba8b50645652ecdbed10565621c02fd6094b1d 100644 (file)
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -17,7 +17,8 @@ LDADDS =                                                              \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(top_builddir)/gtk/$(gtktargetlib)                             \
-       $(GTK_DEP_LIBS)
+       $(GTK_DEP_LIBS)                                                 \
+       $(GDK_DEP_LIBS)
 
 if USE_X11
 noinst_PROGRAMS =              \

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d1307f659a9827fb1e411346460b3981b7ea0f75..6d1318de99e3376bd9ab4fffa5a3b177bfcb9b5d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -971,7 +971,8 @@ TEST_DEPS = $(DEPS) gtk.immodules
 LDADDS =                                                               \
        $(gtktargetlib)                                                 \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
 introspection_files = \
@@ -1048,7 +1049,7 @@ gtk_query_immodules_2_0_LDADD = $(LDADDS)
 
 gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 
-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(LDADDS)
 
 gtk_update_icon_cache_SOURCES = \
        updateiconcache.c 

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index c287c258df7a0d6f4fef10b70749670e4d2c6199..7056dcd07364ee1eaae4b06e88cfa4a04b261fc6 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -17,7 +17,8 @@ DEPS = \
 progs_ldadd = \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = $(TEST_PROGS)
 

diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am
index 4ad04978a4dfc864082792a062eb83016dee0420..dee422ef6e4193e146941c1193d2f5b57731973e 100644 (file)
--- a/gtk/theme-bits/Makefile.am
+++ b/gtk/theme-bits/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 noinst_PROGRAMS = decompose-bits
 
 decompose_bits_SOURCES = decompose-bits.c
-decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
 
 EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png
 

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 934cf24da9e6f1e5078764d989a199a01701d28b..5662b32df2d2824372b3f1bbf218cbb95310dc54 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -18,7 +18,8 @@ DEPS =                                                                        \
 LDADDS =                                                               \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS        =       \
        testperf

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 09feb72f5fb975646722b9ccc9bf01fc467f03e3..d8b4ea8bd2f3e539f92fed6be48427d49ab41042 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,8 @@ DEPS =                                                                        \
 LDADDS =                                                               \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
 if USE_X11
 testsocket_programs = testsocket testsocket_child