From 22e091bebc9e4eac7c9f2f8a3928618d6fb0e334 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 24 Feb 2010 12:51:01 +0100 Subject: [PATCH] patch: gold Squashed commit of the following: commit da5ee1fe718d9bbbda6c786ebf0f4ded43a7a246 Author: Manish Singh Date: Wed Sep 9 17:41:20 2009 -0700 Explicit shared lib deps to support gold (attempted cherry-picking from commit 15497c1d6808b1ea479574b0b3e132484f7f172f, resolved conflicts) Signed-off-by: Nils Philippsen commit 7cae0f249a5d2110a596f3fb22cdd33b07b05f1c Author: Manish Singh 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) Signed-off-by: Nils Philippsen --- libgimpthumb/Makefile.am | 5 ++++- plug-ins/common/Makefile.am | 11 ++++++----- plug-ins/common/mkgen.pl | 11 ++++++----- plug-ins/help-browser/Makefile.am | 1 + plug-ins/metadata/Makefile.am | 5 ++++- 5 files changed, 21 insertions(+), 12 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 <