gjs r67 - trunk

[tko svn gnome org]

Author: tko
Date: Fri Oct 31 10:19:15 2008
New Revision: 67
URL: http://svn.gnome.org/viewvc/gjs?rev=67&view=rev

Log:
List in-tree libraries first in LIBADD / LDADD

	* Makefile-gi.am (libgjs_gi_la_LIBADD):
	* Makefile-modules.am (JS_NATIVE_MODULE_LIBADD):
	* Makefile-test.am (gjs_tests_LDADD, gjs_unit_LDADD): List
	in-tree libraries first in LIBADD / LDADD

	The order matters. RPATH is constructed from dependent libraries
	in order, so if installed library is listed before in-tree
	library ${libdir} gets preference over ${builddir}/.libs which
	makes 'make check' use installed libraries.

Modified:
   trunk/Makefile-gi.am
   trunk/Makefile-modules.am
   trunk/Makefile-test.am

Modified: trunk/Makefile-gi.am
==============================================================================
--- trunk/Makefile-gi.am	(original)
+++ trunk/Makefile-gi.am	Fri Oct 31 10:19:15 2008
@@ -7,8 +7,8 @@
         $(GJS_CFLAGS)			\
         $(GOBJECT_INTROSPECTION_CFLAGS)
 libgjs_gi_la_LIBADD =			\
-        $(GOBJECT_INTROSPECTION_LIBS)	\
-        libgjs.la
+        libgjs.la			\
+        $(GOBJECT_INTROSPECTION_LIBS)
 libgjs_gi_la_LDFLAGS = \
 	-export-symbols-regex "^[^_].*" -version-info 0:0:0 -rdynamic
 

Modified: trunk/Makefile-modules.am
==============================================================================
--- trunk/Makefile-modules.am	(original)
+++ trunk/Makefile-modules.am	Fri Oct 31 10:19:15 2008
@@ -12,8 +12,8 @@
         $(AM_CFLAGS)		\
         $(GJS_CFLAGS)
 JS_NATIVE_MODULE_LIBADD =	\
-        $(GJS_LIBS)		\
-        libgjs.la
+        libgjs.la		\
+        $(GJS_LIBS)
 JS_NATIVE_MODULE_LDFLAGS =	\
         -module -avoid-version -Wl,-z,defs -rdynamic
 

Modified: trunk/Makefile-test.am
==============================================================================
--- trunk/Makefile-test.am	(original)
+++ trunk/Makefile-test.am	Fri Oct 31 10:19:15 2008
@@ -13,8 +13,8 @@
 ## -rdynamic makes backtraces work
 gjs_tests_LDFLAGS = -rdynamic
 gjs_tests_LDADD =		\
-	$(GJSTESTS_LIBS)	\
-	libgjs.la
+	libgjs.la		\
+	$(GJSTESTS_LIBS)
 
 gjs_tests_SOURCES =		\
 	test/gjs-tests.c	\
@@ -42,8 +42,8 @@
 	$(gjs_directory_defines)\
 	$(GJS_CFLAGS)
 gjs_unit_LDADD =		\
-	$(GJS_LIBS)		\
-	libgjs.la
+	libgjs.la		\
+	$(GJS_LIBS)
 
 ## -rdynamic makes backtraces work
 ## we -export-dynamic so we can dlopen ourselves and use gobject-introspection