[cig-commits] r15199 - in cs/spatialdata-0.1/trunk/tests/libtests: geocoords spatialdb units utils

[brad at geodynamics.org]

Author: brad
Date: 2009-06-11 13:35:36 -0700 (Thu, 11 Jun 2009)
New Revision: 15199

Modified:
   cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am
   cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/tests/libtests/units/Makefile.am
   cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am
Log:
Fixed linking order.

Modified: cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am	2009-06-11 20:15:03 UTC (rev 15198)
+++ cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am	2009-06-11 20:35:36 UTC (rev 15199)
@@ -45,12 +45,10 @@
 INCLUDES +=
 
 testgeocoords_LDADD = \
-	-lcppunit -ldl \
+	$(top_builddir)/libsrc/libspatialdata.la \
 	-lproj \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
-	$(top_builddir)/libsrc/libspatialdata.la
+	-lcppunit -ldl \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
-# version
-# $Id$
 
 # End of file 

Modified: cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am	2009-06-11 20:15:03 UTC (rev 15198)
+++ cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am	2009-06-11 20:35:36 UTC (rev 15199)
@@ -64,9 +64,10 @@
 AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
 
 testspatial_LDADD = \
+	$(top_builddir)/libsrc/libspatialdata.la \
+	-lproj \
 	-lcppunit -ldl \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
-	$(top_builddir)/libsrc/libspatialdata.la 
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 
 # Source files associated with testing data

Modified: cs/spatialdata-0.1/trunk/tests/libtests/units/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/units/Makefile.am	2009-06-11 20:15:03 UTC (rev 15198)
+++ cs/spatialdata-0.1/trunk/tests/libtests/units/Makefile.am	2009-06-11 20:35:36 UTC (rev 15199)
@@ -33,9 +33,10 @@
 	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 testunits_LDADD = \
+	$(top_builddir)/libsrc/libspatialdata.la \
+	-lproj \
 	-lcppunit -ldl \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
-	$(top_builddir)/libsrc/libspatialdata.la
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 
 # End of file 

Modified: cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am	2009-06-11 20:15:03 UTC (rev 15198)
+++ cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am	2009-06-11 20:35:36 UTC (rev 15199)
@@ -29,9 +29,10 @@
 testutils_LDFLAGS =
 
 testutils_LDADD = \
+	$(top_builddir)/libsrc/libspatialdata.la \
+	-lproj \
 	-lcppunit -ldl \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
-	$(top_builddir)/libsrc/libspatialdata.la
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 
 # End of file