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

[brad at geodynamics.org]

Author: brad
Date: 2009-05-08 15:06:27 -0700 (Fri, 08 May 2009)
New Revision: 14930

Modified:
   cs/spatialdata-0.1/trunk/libsrc/Makefile.am
   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 to Python library.

Modified: cs/spatialdata-0.1/trunk/libsrc/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/Makefile.am	2009-05-08 19:39:08 UTC (rev 14929)
+++ cs/spatialdata-0.1/trunk/libsrc/Makefile.am	2009-05-08 22:06:27 UTC (rev 14930)
@@ -48,10 +48,10 @@
 libspatialdata_la_LDFLAGS = $(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 libspatialdata_la_LIBADD = \
 	-lproj
-#if NO_UNDEFINED
+if NO_UNDEFINED
 libspatialdata_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
-#endif
+endif
 
 AM_CPPFLAGS = -DDATADIR="$(pkgdatadir)/geocoords" \
 	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 

Modified: cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am	2009-05-08 19:39:08 UTC (rev 14929)
+++ cs/spatialdata-0.1/trunk/tests/libtests/geocoords/Makefile.am	2009-05-08 22:06:27 UTC (rev 14930)
@@ -47,6 +47,7 @@
 testgeocoords_LDADD = \
 	-lcppunit -ldl \
 	-lproj \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
 	$(top_builddir)/libsrc/libspatialdata.la
 
 # version

Modified: cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am	2009-05-08 19:39:08 UTC (rev 14929)
+++ cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/Makefile.am	2009-05-08 22:06:27 UTC (rev 14930)
@@ -61,6 +61,7 @@
 
 testspatial_LDADD = \
 	-lcppunit -ldl \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
 	$(top_builddir)/libsrc/libspatialdata.la 
 
 

Modified: cs/spatialdata-0.1/trunk/tests/libtests/units/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/units/Makefile.am	2009-05-08 19:39:08 UTC (rev 14929)
+++ cs/spatialdata-0.1/trunk/tests/libtests/units/Makefile.am	2009-05-08 22:06:27 UTC (rev 14930)
@@ -34,6 +34,7 @@
 
 testunits_LDADD = \
 	-lcppunit -ldl \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
 	$(top_builddir)/libsrc/libspatialdata.la
 
 

Modified: cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am	2009-05-08 19:39:08 UTC (rev 14929)
+++ cs/spatialdata-0.1/trunk/tests/libtests/utils/Makefile.am	2009-05-08 22:06:27 UTC (rev 14930)
@@ -30,9 +30,8 @@
 
 testutils_LDADD = \
 	-lcppunit -ldl \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS) \
 	$(top_builddir)/libsrc/libspatialdata.la
 
-# version
-# $Id$
 
 # End of file