mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-06 00:30:08 +00:00
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).
This commit is contained in:
parent
71d7b97a90
commit
3659db3a4a
@ -582,6 +582,7 @@ case $host in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
AC_SUBST(MATH_LIB)
|
||||||
#
|
#
|
||||||
# see bug 162979
|
# see bug 162979
|
||||||
#
|
#
|
||||||
|
@ -19,7 +19,9 @@ DEPS = \
|
|||||||
LDADDS = \
|
LDADDS = \
|
||||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
$(top_builddir)/gtk/$(gtktargetlib)
|
$(top_builddir)/gtk/$(gtktargetlib) \
|
||||||
|
$(GTK_DEP_LIBS) \
|
||||||
|
$(MATH_LIB)
|
||||||
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
testpixbuf-drawable \
|
testpixbuf-drawable \
|
||||||
|
@ -62,7 +62,8 @@ DEPS = \
|
|||||||
LDADDS = \
|
LDADDS = \
|
||||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
$(top_builddir)/gtk/$(gtktargetlib)
|
$(top_builddir)/gtk/$(gtktargetlib) \
|
||||||
|
$(GTK_DEP_LIBS)
|
||||||
|
|
||||||
bin_PROGRAMS = gtk-demo
|
bin_PROGRAMS = gtk-demo
|
||||||
|
|
||||||
|
@ -17,7 +17,8 @@ LDADDS = \
|
|||||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
$(top_builddir)/gtk/$(gtktargetlib) \
|
$(top_builddir)/gtk/$(gtktargetlib) \
|
||||||
$(GTK_DEP_LIBS)
|
$(GTK_DEP_LIBS) \
|
||||||
|
$(GDK_DEP_LIBS)
|
||||||
|
|
||||||
if USE_X11
|
if USE_X11
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
|
@ -971,7 +971,8 @@ TEST_DEPS = $(DEPS) gtk.immodules
|
|||||||
LDADDS = \
|
LDADDS = \
|
||||||
$(gtktargetlib) \
|
$(gtktargetlib) \
|
||||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
$(top_builddir)/gdk/$(gdktargetlib)
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
|
$(GTK_DEP_LIBS)
|
||||||
|
|
||||||
if HAVE_INTROSPECTION
|
if HAVE_INTROSPECTION
|
||||||
introspection_files = \
|
introspection_files = \
|
||||||
@ -1048,7 +1049,7 @@ gtk_query_immodules_2_0_LDADD = $(LDADDS)
|
|||||||
|
|
||||||
gtk_query_immodules_2_0_SOURCES = queryimmodules.c
|
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 = \
|
gtk_update_icon_cache_SOURCES = \
|
||||||
updateiconcache.c
|
updateiconcache.c
|
||||||
|
@ -17,7 +17,8 @@ DEPS = \
|
|||||||
progs_ldadd = \
|
progs_ldadd = \
|
||||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
$(top_builddir)/gtk/$(gtktargetlib)
|
$(top_builddir)/gtk/$(gtktargetlib) \
|
||||||
|
$(GTK_DEP_LIBS)
|
||||||
|
|
||||||
noinst_PROGRAMS = $(TEST_PROGS)
|
noinst_PROGRAMS = $(TEST_PROGS)
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ INCLUDES = \
|
|||||||
noinst_PROGRAMS = decompose-bits
|
noinst_PROGRAMS = decompose-bits
|
||||||
|
|
||||||
decompose_bits_SOURCES = decompose-bits.c
|
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
|
EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png
|
||||||
|
|
||||||
|
@ -18,7 +18,8 @@ DEPS = \
|
|||||||
LDADDS = \
|
LDADDS = \
|
||||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
$(top_builddir)/gtk/$(gtktargetlib)
|
$(top_builddir)/gtk/$(gtktargetlib) \
|
||||||
|
$(GTK_DEP_LIBS)
|
||||||
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
testperf
|
testperf
|
||||||
|
@ -18,7 +18,8 @@ DEPS = \
|
|||||||
LDADDS = \
|
LDADDS = \
|
||||||
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
|
||||||
$(top_builddir)/gdk/$(gdktargetlib) \
|
$(top_builddir)/gdk/$(gdktargetlib) \
|
||||||
$(top_builddir)/gtk/$(gtktargetlib)
|
$(top_builddir)/gtk/$(gtktargetlib) \
|
||||||
|
$(GTK_DEP_LIBS)
|
||||||
|
|
||||||
if USE_X11
|
if USE_X11
|
||||||
testsocket_programs = testsocket testsocket_child
|
testsocket_programs = testsocket testsocket_child
|
||||||
|
Loading…
Reference in New Issue
Block a user