gobject-introspection r849 - in trunk: . giscanner tests/invoke tests/repository

[tko svn gnome org]

Author: tko
Date: Fri Oct 31 10:54:32 2008
New Revision: 849
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=849&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/giscanner/Makefile.am
   trunk/tests/invoke/Makefile.am
   trunk/tests/repository/Makefile.am

Modified: trunk/giscanner/Makefile.am
==============================================================================
--- trunk/giscanner/Makefile.am	(original)
+++ trunk/giscanner/Makefile.am	Fri Oct 31 10:54:32 2008
@@ -55,7 +55,7 @@
 	$(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

Modified: trunk/tests/invoke/Makefile.am
==============================================================================
--- trunk/tests/invoke/Makefile.am	(original)
+++ trunk/tests/invoke/Makefile.am	Fri Oct 31 10:54:32 2008
@@ -11,7 +11,7 @@
 	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 @@
 
 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
 

Modified: trunk/tests/repository/Makefile.am
==============================================================================
--- trunk/tests/repository/Makefile.am	(original)
+++ trunk/tests/repository/Makefile.am	Fri Oct 31 10:54:32 2008
@@ -6,11 +6,11 @@
 
 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)