mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 02:40:11 +00:00
build: Don't link against libgtk and libgdk
libgdk is statically linked these days, so if you link against it, all of its symbols will exist twice: Once in libgtk.so and once in your binary.
This commit is contained in:
parent
fef2f96add
commit
dfd9150a82
@ -1586,8 +1586,6 @@ bin_PROGRAMS = \
|
||||
gtk4_query_immodules_SOURCES = queryimmodules.c gtkutils.c
|
||||
gtk4_query_immodules_LDADD = \
|
||||
libgtk-4.la \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gsk/libgsk-4.la \
|
||||
$(GMODULE_LIBS) \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
@ -1596,30 +1594,23 @@ gtk4_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
|
||||
|
||||
gtk4_encode_symbolic_svg_SOURCES = encodesymbolic.c
|
||||
gtk4_encode_symbolic_svg_LDADD = \
|
||||
libgtk-4.la \
|
||||
$(GDK_PIXBUF_LIBS) \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gsk/libgsk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
gtk4_builder_tool_SOURCES = gtk-builder-tool.c
|
||||
gtk4_builder_tool_LDADD = \
|
||||
libgtk-4.la \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gsk/libgsk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
gtk4_query_settings_SOURCES = gtk-query-settings.c
|
||||
gtk4_query_settings_LDADD= \
|
||||
libgtk-4.la \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gsk/libgsk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
gtk4_launch_SOURCES = gtk-launch.c
|
||||
gtk4_launch_LDADD = \
|
||||
libgtk-4.la \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gsk/libgsk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
if OS_WIN32
|
||||
|
@ -17,8 +17,6 @@ DEPS =
|
||||
|
||||
LDADD = \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(top_builddir)/gsk/libgsk-4.la \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(GTK_DEP_LIBS) \
|
||||
$(GDK_DEP_LIBS) \
|
||||
-lm
|
||||
|
@ -13,7 +13,6 @@ DEPS = \
|
||||
|
||||
LDADDS = \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(GTK_DEP_LIBS) \
|
||||
-lm
|
||||
|
||||
|
@ -16,7 +16,6 @@ AM_CPPFLAGS = \
|
||||
$(GTK_DEP_CFLAGS)
|
||||
|
||||
LDADD = \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
|
@ -13,7 +13,6 @@ AM_CPPFLAGS = \
|
||||
$(GTK_DEP_CFLAGS)
|
||||
|
||||
LDADD = \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
|
@ -18,7 +18,6 @@ AM_CPPFLAGS = \
|
||||
$(GTK_DEP_CFLAGS)
|
||||
|
||||
LDADD = \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
|
@ -18,7 +18,6 @@ test_css_nodes_CFLAGS = \
|
||||
$(NULL)
|
||||
|
||||
test_css_nodes_LDADD = \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(GTK_DEP_LIBS) \
|
||||
$(NULL)
|
||||
|
@ -19,7 +19,6 @@ test_css_parser_CFLAGS = \
|
||||
$(GTK_DEP_CFLAGS)
|
||||
|
||||
test_css_parser_LDADD = \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
|
@ -18,7 +18,6 @@ test_css_style_CFLAGS = \
|
||||
$(NULL)
|
||||
|
||||
test_css_style_LDADD = \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(GTK_DEP_LIBS) \
|
||||
$(NULL)
|
||||
|
@ -12,7 +12,7 @@ AM_CPPFLAGS = \
|
||||
|
||||
LDADD = \
|
||||
$(GDK_DEP_LIBS) \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(NULL)
|
||||
|
||||
#TEST_PROGS += check-gdk-cairo
|
||||
|
@ -21,7 +21,6 @@ DEPS = \
|
||||
|
||||
LDADD = \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(GTK_DEP_LIBS)
|
||||
|
||||
CLEANFILES =
|
||||
|
@ -43,7 +43,6 @@ endif
|
||||
libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS)
|
||||
libgtkreftestprivate_la_LDFLAGS = $(no_undefined)
|
||||
libgtkreftestprivate_la_LIBADD = \
|
||||
$(top_builddir)/gdk/libgdk-4.la \
|
||||
$(top_builddir)/gtk/libgtk-4.la \
|
||||
$(GTK_DEP_LIBS) \
|
||||
$(GMODULE_LIBS) \
|
||||
|
Loading…
Reference in New Issue
Block a user