From 3af5038eefaabc50fb806f71780a31986e6c265b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 16 Nov 2010 16:05:18 -0500 Subject: build: Flip around linking order of libraries for tools It seems in some cases (Debian libtool) we get an injected rpath first for the jhbuild root, which screws us over since we need the libraries from .libs. --- Makefile-tools.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile-tools.am b/Makefile-tools.am index 5940287c..d57ccde8 100644 --- a/Makefile-tools.am +++ b/Makefile-tools.am @@ -15,18 +15,18 @@ g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \ -I$(top_srcdir)/girepository g_ir_compiler_CFLAGS = $(GIO_CFLAGS) g_ir_compiler_LDADD = \ - $(GIREPO_LIBS) \ libgirepository-parser.la \ - libgirepository-1.0.la + libgirepository-1.0.la \ + $(GIREPO_LIBS) g_ir_generate_SOURCES = tools/generate.c g_ir_generate_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \ -I$(top_srcdir)/girepository g_ir_generate_CFLAGS = $(GIO_CFLAGS) g_ir_generate_LDADD = \ - $(GIREPO_LIBS) \ libgirepository-parser.la \ - libgirepository-1.0.la + libgirepository-1.0.la \ + $(GIREPO_LIBS) GCOVSOURCES = \ $(g_ir_compiler_SOURCES) \ -- cgit v1.2.1