[cig-commits] r13406 - in cs/spatialdata-0.1/trunk: . modulesrc/spatialdb templates

[brad at geodynamics.org]

Author: brad
Date: 2008-11-25 15:25:10 -0800 (Tue, 25 Nov 2008)
New Revision: 13406

Modified:
   cs/spatialdata-0.1/trunk/configure.ac
   cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/templates/Makefile.am
Log:
Fixed Makefiles for source distribution.

Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac	2008-11-25 23:24:33 UTC (rev 13405)
+++ cs/spatialdata-0.1/trunk/configure.ac	2008-11-25 23:25:10 UTC (rev 13406)
@@ -11,7 +11,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([spatialdata], [0.3.1], [baagaard at usgs.gov])
+AC_INIT([spatialdata], [0.4.0], [baagaard at usgs.gov])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_AUX_DIR([./aux-config])
 AM_INIT_AUTOMAKE([foreign])

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2008-11-25 23:24:33 UTC (rev 13405)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2008-11-25 23:25:10 UTC (rev 13406)
@@ -13,6 +13,9 @@
 subpackage = spatialdb
 include $(top_srcdir)/subpackage.am
 
+EXTRA_DIST = \
+	spatialdb.pxd.src
+
 subpkgpyexec_LTLIBRARIES = spatialdbmodule.la
 
 spatialdbmodule_la_LDFLAGS = -module -avoid-version \
@@ -32,7 +35,7 @@
 
 INCLUDES += -I$(PYTHON_INCDIR)
 
-nobase_pyexec_HEADERS = \
+nodist_pyexec_HEADERS = \
 	spatialdata.spatialdb.spatialdb.pxd
 
 spatialdata.spatialdb.spatialdb.pyx spatialdata.spatialdb.spatialdb_embed.cpp spatialdata.spatialdb.spatialdb_embed.h: spatialdata.spatialdb.spatialdb.pyxe spatialdata.spatialdb.spatialdb.pxd

Modified: cs/spatialdata-0.1/trunk/templates/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/templates/Makefile.am	2008-11-25 23:24:33 UTC (rev 13405)
+++ cs/spatialdata-0.1/trunk/templates/Makefile.am	2008-11-25 23:25:10 UTC (rev 13406)
@@ -24,6 +24,6 @@
 	spatialdb/GeoGridVelModel.cc \
 	spatialdb/__init__.py \
 	spatialdb/GeoGridVelModel.py \
-	spatialdb/geogridvelmodel.pyxe.src
+	spatialdb/spatialdb.pyxe.src
 
 # End of file