build: Flip around linking order of libraries for tools
authorColin Walters <walters@verbum.org>
Tue, 16 Nov 2010 21:05:18 +0000 (16:05 -0500)
committerColin Walters <walters@verbum.org>
Tue, 16 Nov 2010 21:07:38 +0000 (16:07 -0500)
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

index 5940287..d57ccde 100644 (file)
@@ -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)                \