diff options
| author | Michael Haubenwallner <michael.haubenwallner@salomon.at> | 2013-11-14 16:22:10 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2013-11-19 08:11:35 -0500 |
| commit | b1af471a3f08c3afa4eb61f0791998aac5da80a8 (patch) | |
| tree | d3f597b7104bea26a1f8e41e38209b0658e45b3a /gio/Makefile.am | |
| parent | 36f1a4ce7ed6df6aa8d24169508cc33dfc34cd79 (diff) | |
build: Give internal libraries higher precedence
Linking local libraries too late may cause preinstalled libraries to
get found earlier, due to external library paths in .la files.
https://bugzilla.gnome.org/show_bug.cgi?id=712314
Diffstat (limited to 'gio/Makefile.am')
| -rw-r--r-- | gio/Makefile.am | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/gio/Makefile.am b/gio/Makefile.am index 3e80e06a4..5b6cda1a3 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -482,9 +482,9 @@ libgio_2_0_la_SOURCES = \ EXTRA_DIST += strinfo.c libgio_2_0_la_LIBADD = \ - $(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ $(platform_libadd) \ $(ZLIB_LIBS) \ $(SELINUX_LIBS) \ @@ -688,10 +688,10 @@ gio-2.0.lib: libgio-2.0.la gio.def bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings -glib_compile_resources_LDADD = \ - $(top_builddir)/glib/libglib-2.0.la \ +glib_compile_resources_LDADD = libgio-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ - libgio-2.0.la + $(top_builddir)/glib/libglib-2.0.la \ + $(NULL) glib_compile_resources_SOURCES = \ gvdb/gvdb-format.h \ @@ -700,11 +700,10 @@ glib_compile_resources_SOURCES = \ glib-compile-resources.c gio_querymodules_SOURCES = gio-querymodules.c -gio_querymodules_LDADD = \ - $(top_builddir)/glib/libglib-2.0.la \ +gio_querymodules_LDADD = libgio-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ $(top_builddir)/gmodule/libgmodule-2.0.la \ - libgio-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ $(NULL) gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl @@ -718,10 +717,10 @@ glib_compile_schemas_SOURCES = \ gvdb/gvdb-builder.c \ glib-compile-schemas.c -gsettings_LDADD = \ - $(top_builddir)/glib/libglib-2.0.la \ +gsettings_LDADD = libgio-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ - libgio-2.0.la + $(top_builddir)/glib/libglib-2.0.la \ + $(NULL) gsettings_SOURCES = gsettings-tool.c schemadir = $(datadir)/glib-2.0/schemas @@ -732,18 +731,20 @@ dist_schema_DATA = gschema.dtd bin_PROGRAMS += gdbus gdbus_SOURCES = gdbus-tool.c -gdbus_LDADD = libgio-2.0.la \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la +gdbus_LDADD = libgio-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ + $(NULL) if OS_UNIX # ------------------------------------------------------------------------ # gapplication(1) tool bin_PROGRAMS += gapplication gapplication_SOURCES = gapplication-tool.c -gapplication_LDADD = libgio-2.0.la \ +gapplication_LDADD = libgio-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la + $(NULL) endif completiondir = $(datadir)/bash-completion/completions @@ -760,9 +761,9 @@ EXTRA_DIST += $(completion_DATA) bin_PROGRAMS += gresource gresource_SOURCES = gresource-tool.c gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS) -gresource_LDADD = libgio-2.0.la \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la \ +gresource_LDADD = libgio-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ $(LIBELF_LIBS) # ------------------------------------------------------------------------ |