Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up linker flags

Browse Source 
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).
(cherry picked from commit 9e7c91bf83)
This commit is contained in:
Benjamin Otte
2009-12-19 18:37:39 +01:00
committed by Matthias Clasen
parent 71cef6c8a0
commit 3f935d85d3
9 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@@ -580,6 +580,7 @@ case $host in
;;
esac
AC_SUBST(MATH_LIB)
#
# see bug 162979
#

4
demos/Makefile.am
View File

@@ -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 \

3
demos/gtk-demo/Makefile.am
View File

@@ -60,7 +60,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

3
docs/tools/Makefile.am
View File

@@ -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 = \

5
gtk/Makefile.am
View File

@@ -939,7 +939,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)
#
# Installed tools
@@ -988,7 +989,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

3
gtk/tests/Makefile.am
View File

@@ -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)

2
gtk/theme-bits/Makefile.am
View File

@@ -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

3
perf/Makefile.am
View File

@@ -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

3
tests/Makefile.am
View File

@@ -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