[gtk+/gtk-2-18] Build adds not-yet-built libgtk-x11-2.0.la into the linker flags



commit f07fced38c8879f76238a6badceae8151e139ad0
Author: Benjamin Otte <otte gnome org>
Date:   Mon Dec 21 02:43:10 2009 +0100

    Build adds not-yet-built libgtk-x11-2.0.la into the linker flags
    
    Commit 9e7c91bf83fd21a559b5658d02a1466deb4de919 added a bit too many
    LDFLAGS to the build of gtk-update-icon-cache, revert it to only use the
    required ones. Bug 605036
    (cherry picked from commit 3921834b96281732bca7618325e747a7bfd8d80f)

 gtk/Makefile.am |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9a34da9..be8944e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -989,7 +989,10 @@ 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 $(LDADDS)
+gtk_update_icon_cache_LDADD = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+	$(GDK_PIXBUF_DEP_LIBS)
+
 
 gtk_update_icon_cache_SOURCES = \
 	updateiconcache.c 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]