List in-tree libraries first in LDADD / LIBADD

2008-10-31  Tommi Komulainen  <tommi.komulainen@iki.fi>

	* giscanner/Makefile.am:
	* tests/invoke/Makefile.am:
	* tests/repository/Makefile.am: List in-tree libraries first in
	LDADD / LIBADD. If installed library is listed first, the
	resulting binary will prefer installed version to one in .libs,
	possibly making 'make check' behave strangely.

svn path=/trunk/; revision=849

diff --git a/ChangeLog b/ChangeLog
index e414d15..4c41444 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-31  Tommi Komulainen  <tommi.komulainen@iki.fi>
+
+       * giscanner/Makefile.am:
+       * tests/invoke/Makefile.am:
+       * tests/repository/Makefile.am: List in-tree libraries first in
+       LDADD / LIBADD. If installed library is listed first, the
+       resulting binary will prefer installed version to one in .libs,
+       possibly making 'make check' behave strangely.
+
 2008-10-30  Tommi Komulainen  <tommi.komulainen@iki.fi>
 
        * giscanner/ast.py: map 'id' (ObjC) to 'any' type to stop

diff --git a/giscanner/Makefile.am b/giscanner/Makefile.am
index b21b17d..c9d23e5 100644 (file)
--- a/giscanner/Makefile.am
+++ b/giscanner/Makefile.am
@@ -55,7 +55,7 @@ _giscanner_la_CFLAGS = \
        $(PYTHON_INCLUDES) \
        $(GOBJECT_CFLAGS) \
        -I$(top_srcdir)/giscanner
-_giscanner_la_LIBADD = $(GOBJECT_LIBS) libgiscanner.la
+_giscanner_la_LIBADD = libgiscanner.la $(GOBJECT_LIBS)
 
 _giscanner_la_LDFLAGS = \
        -module -avoid-version -export-symbols-regex init_giscanner

diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am
index 7f8801f..92158eb 100644 (file)
--- a/tests/invoke/Makefile.am
+++ b/tests/invoke/Makefile.am
@@ -11,7 +11,7 @@ testfns_la_SOURCES =                          \
        testfns-metadata.c
 testfns_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 testfns_la_LDFLAGS = -module -avoid-version
-testfns_la_LIBADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
+testfns_la_LIBADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
 
 if OS_WIN32
 testfns_la_LDFLAGS += -no-undefined
@@ -25,7 +25,7 @@ testfns-metadata.c: testfns-1.0.gir $(top_builddir)/tools/g-ir-compiler Makefile
 
 invoke_SOURCES = invoke.c
 invoke_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
-invoke_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
+invoke_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
 
 TESTS = invoke invoke-namespace-find.sh
 

diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
index 6790c42..51e9767 100644 (file)
--- a/tests/repository/Makefile.am
+++ b/tests/repository/Makefile.am
@@ -6,11 +6,11 @@ noinst_PROGRAMS = gitestrepo gitestthrows
 
 gitestrepo_SOURCES = $(srcdir)/gitestrepo.c
 gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestrepo_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
+gitestrepo_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
 
 gitestthrows_SOURCES = $(srcdir)/gitestthrows.c
 gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestthrows_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
+gitestthrows_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
 
 TESTS = gitestrepo gitestthrows
 TESTS_ENVIRONMENT=env top_builddir="$(top_builddir)" $(DEBUG)