[gimp/gimp-2-6] Explicitly specify library dependencies at link time, so we can use gold. (cherry picked from commit

[Nils Philippsen <nphilipp src gnome org>]

commit 7f8d272d4c4a3990259928070752f215fb229d6f
Author: Manish Singh <yosh gimp org>
Date:   Sun May 24 10:42:39 2009 -0700

    Explicitly specify library dependencies at link time, so we can use gold.
    (cherry picked from commit 582cb0f14eb9f145bd2a2f5c9fda12309ae0229f)

 libgimpthumb/Makefile.am          |    5 ++++-
 plug-ins/common/Makefile.am       |   11 ++++++-----
 plug-ins/common/mkgen.pl          |   11 ++++++-----
 plug-ins/help-browser/Makefile.am |    1 +
 4 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
index 2e7b531..ee26219 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -86,7 +86,10 @@ noinst_PROGRAMS = gimp-thumbnail-list
 
 gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c
 
-gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la
+gimp_thumbnail_list_LDADD = \
+	libgimpthumb-$(GIMP_API_VERSION).la \
+	$(GDK_PIXBUF_LIBS) \
+	$(GLIB_LIBS)
 
 
 install-data-local: install-ms-lib install-libtool-import-lib
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 66dc6dd..d58ecee 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -7,21 +7,22 @@
 ## Modify those two files instead of this one; for most
 ## plug-ins you should only need to modify plugin-defs.pl.
 
+if OS_WIN32
+mwindows = -mwindows
+else
+libm = -lm
+endif
 
 libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
 libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
 libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
 libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
-libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm)
 libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
 libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
 libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
 
 
-if OS_WIN32
-mwindows = -mwindows
-endif
-
 AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index 40b4b74..b0cd786 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -51,21 +51,22 @@ print MK <<EOT;
 ## Modify those two files instead of this one; for most
 ## plug-ins you should only need to modify plugin-defs.pl.
 
+if OS_WIN32
+mwindows = -mwindows
+else
+libm = -lm
+endif
 
 libgimp = \$(top_builddir)/libgimp/libgimp-\$(GIMP_API_VERSION).la
 libgimpbase = \$(top_builddir)/libgimpbase/libgimpbase-\$(GIMP_API_VERSION).la
 libgimpcolor = \$(top_builddir)/libgimpcolor/libgimpcolor-\$(GIMP_API_VERSION).la
 libgimpconfig = \$(top_builddir)/libgimpconfig/libgimpconfig-\$(GIMP_API_VERSION).la
-libgimpmath = \$(top_builddir)/libgimpmath/libgimpmath-\$(GIMP_API_VERSION).la
+libgimpmath = \$(top_builddir)/libgimpmath/libgimpmath-\$(GIMP_API_VERSION).la \$(libm)
 libgimpmodule = \$(top_builddir)/libgimpmodule/libgimpmodule-\$(GIMP_API_VERSION).la
 libgimpui = \$(top_builddir)/libgimp/libgimpui-\$(GIMP_API_VERSION).la
 libgimpwidgets = \$(top_builddir)/libgimpwidgets/libgimpwidgets-\$(GIMP_API_VERSION).la
 
 
-if OS_WIN32
-mwindows = -mwindows
-endif
-
 AM_LDFLAGS = \$(mwindows)
 
 libexecdir = \$(gimpplugindir)/plug-ins
diff --git a/plug-ins/help-browser/Makefile.am b/plug-ins/help-browser/Makefile.am
index 14fbe02..7360433 100644
--- a/plug-ins/help-browser/Makefile.am
+++ b/plug-ins/help-browser/Makefile.am
@@ -36,6 +36,7 @@ LDADD = \
 	$(libgimpbase)		\
 	$(WEBKIT_LIBS)		\
 	$(GIO_LIBS)		\
+	$(GLIB_LIBS)		\
 	$(RT_LIBS)		\
 	$(INTLLIBS)