From 3659db3a4a6218158b42ea8dbbf826c24662d544 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@gnome.org>
Date: Sat, 19 Dec 2009 18:37:39 +0100
Subject: [PATCH] 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).
---
 configure.in               | 1 +
 demos/Makefile.am          | 4 +++-
 demos/gtk-demo/Makefile.am | 3 ++-
 docs/tools/Makefile.am     | 3 ++-
 gtk/Makefile.am            | 5 +++--
 gtk/tests/Makefile.am      | 3 ++-
 gtk/theme-bits/Makefile.am | 2 +-
 perf/Makefile.am           | 3 ++-
 tests/Makefile.am          | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 26d752d454..d5a83b0e9e 100644
--- 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 81e07f427a..f87b3cd8b9 100644
--- 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 792ee35971..698c242c0d 100644
--- 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 3b3c09bcc9..66ba8b5064 100644
--- 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 d1307f659a..6d1318de99 100644
--- 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 c287c258df..7056dcd073 100644
--- 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 4ad04978a4..dee422ef6e 100644
--- 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 934cf24da9..5662b32df2 100644
--- 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 09feb72f5f..d8b4ea8bd2 100644
--- 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