[cig-commits] r11838 - in cs/spatialdata-0.1/trunk: . libsrc/geocoords/data modulesrc/geocoords modulesrc/spatialdb modulesrc/utils tests/libtests/spatialdb/data tests/pytests/geocoords tests/pytests/spatialdb tests/pytests/utils
brad at geodynamics.org
brad at geodynamics.org
Mon Apr 21 12:06:22 PDT 2008
Author: brad
Date: 2008-04-21 12:06:22 -0700 (Mon, 21 Apr 2008)
New Revision: 11838
Modified:
cs/spatialdata-0.1/trunk/libsrc/geocoords/data/Makefile.am
cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
cs/spatialdata-0.1/trunk/subpackage.am
cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/data/Makefile.am
cs/spatialdata-0.1/trunk/tests/pytests/geocoords/Makefile.am
cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am
cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am
Log:
Fixed Makefiles for missing files in source distribution.
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/data/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/data/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/data/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -13,19 +13,17 @@
subpackage = geocoords
include $(top_srcdir)/subpackage.am
-subpkgdata_DATA = \
+dist_subpkgdata_DATA = \
ww15mgh.dac
# 'export' the input files by performing a mock install
export_datadir = $(subpkgdatadir)
-export-data: $(subpkgdata_DATA)
+export-data: $(dist_subpkgdata_DATA)
$(mkinstalldirs) $(subpkgdatadir)
- for f in $(subpkgdata_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
+ for f in $(dist_subpkgdata_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
# export
BUILT_SOURCES = export-data
-# version
-# $Id$
# End of file
Modified: cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -13,14 +13,16 @@
subpackage = geocoords
include $(top_srcdir)/subpackage.am
+
subpkgpyexec_LTLIBRARIES = geocoordsmodule.la
geocoordsmodule_la_LDFLAGS = -module -avoid-version \
$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
-geocoordsmodule_la_SOURCES = geocoords.pyxe
+dist_geocoordsmodule_la_SOURCES = geocoords.pyxe.src
nodist_geocoordsmodule_la_SOURCES = \
+ geocoords.pyxe \
geocoords.c geocoords_embed.cpp geocoords_embed.h
geocoordsmodule_la_LIBADD = \
Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -18,9 +18,9 @@
spatialdbmodule_la_LDFLAGS = -module -avoid-version \
$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
-spatialdbmodule_la_SOURCES = spatialdb.pyxe
-
+dist_spatialdbmodule_la_SOURCES = spatialdb.pyxe.src
nodist_spatialdbmodule_la_SOURCES = \
+ spatialdb.pyxe \
spatialdb.c spatialdb_embed.cpp spatialdb_embed.h
spatialdbmodule_la_LIBADD = \
Modified: cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/modulesrc/utils/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -22,8 +22,9 @@
# simple array
simplearraymodule_la_LDFLAGS = -module -avoid-version \
$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
-simplearraymodule_la_SOURCES = simplearray.pyxe
+dist_simplearraymodule_la_SOURCES = simplearray.pyxe.src
nodist_simplearraymodule_la_SOURCES = \
+ simplearray.pyxe \
simplearray.c simplearray_embed.cpp simplearray_embed.h
simplearraymodule_la_LIBADD =
if NO_UNDEFINED
@@ -34,8 +35,9 @@
# utils
utilsmodule_la_LDFLAGS = -module -avoid-version \
$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
-utilsmodule_la_SOURCES = utils.pyxe
+dist_utilsmodule_la_SOURCES = utils.pyxe.src
nodist_utilsmodule_la_SOURCES = \
+ utils.pyxe \
utils.c utils_embed.cpp utils_embed.h
utilsmodule_la_LIBADD = \
$(top_builddir)/libsrc/libspatialdata.la
Modified: cs/spatialdata-0.1/trunk/subpackage.am
===================================================================
--- cs/spatialdata-0.1/trunk/subpackage.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/subpackage.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -35,7 +35,5 @@
INCLUDES = -I$(top_builddir)/include
-# version
-# $Id$
# End of file
Modified: cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/data/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/data/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/tests/libtests/spatialdb/data/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -10,7 +10,7 @@
# ----------------------------------------------------------------------
#
-noinst_DATA = \
+dist_noinst_DATA = \
spatialdb.dat \
spatial_comments.dat
@@ -22,8 +22,8 @@
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests/libtests/spatialdb/data
-export-data: $(noinst_DATA)
- for f in $(noinst_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
+export-data: $(dist_noinst_DATA)
+ for f in $(dist_noinst_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
BUILT_SOURCES = export-data
Modified: cs/spatialdata-0.1/trunk/tests/pytests/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/geocoords/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/tests/pytests/geocoords/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -11,7 +11,7 @@
#
TESTS = testgeocoords.py
-check_SCRIPTS = testgeocoords.py
+dist_check_SCRIPTS = testgeocoords.py
TESTS_ENVIRONMENT = $(PYTHON)
Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -13,24 +13,27 @@
SUBDIRS = data
TESTS = testspatial.py
-check_SCRIPTS = testspatial.py
+dist_check_SCRIPTS = testspatial.py
if ENABLE_SCEC_CVM_H
TESTS += test_sceccvmh.py
- check_SCRIPTS += test_sceccvmh.py
+ dist_check_SCRIPTS += test_sceccvmh.py
endif
TESTS_ENVIRONMENT = $(PYTHON)
noinst_PYTHON = \
TestGenSimpleDBApp.py \
+ TestGravityField.py \
TestSCECCVMH.py \
TestSimpleIOAscii.py \
TestSpatialDB.py \
TestUniformDB.py
+dist_noinst_PYTHON = \
+ TestSCECCVMH.py.in
-data_DATA = \
+dist_data_DATA = \
testgen1din2d.odb \
testgen1din2d_one.odb \
testgen1din2d_two.odb \
@@ -44,13 +47,13 @@
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests/pytests/spatialdb
-export-data: $(data_DATA)
- for f in $(data_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
+export-data: $(dist_data_DATA)
+ for f in $(dist_data_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
BUILT_SOURCES = export-data
CLEANFILES = \
$(srcdir)/TestSCECCVMH.py \
- $(export_datadir)/$(data_DATA)
+ $(export_datadir)/$(dist_data_DATA)
# End of file
Modified: cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am 2008-04-21 18:15:37 UTC (rev 11837)
+++ cs/spatialdata-0.1/trunk/tests/pytests/utils/Makefile.am 2008-04-21 19:06:22 UTC (rev 11838)
@@ -14,11 +14,14 @@
include $(top_srcdir)/subpackage.am
TESTS = testutils.py
-check_SCRIPTS = testutils.py
+dist_check_SCRIPTS = testutils.py
TESTS_ENVIRONMENT = $(PYTHON)
noinst_PYTHON = \
+ TestChangeCoordSys.py \
+ TestConvertApp.py \
+ TestPointsStream.py \
TestSimpleArray.py
# module
@@ -32,9 +35,10 @@
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
endif
-testcppmodule_la_SOURCES = testcpp.pyxe
+dist_testcppmodule_la_SOURCES = testcpp.pyxe.src
nodist_testcppmodule_la_SOURCES = \
+ testcpp.pyxe \
testcpp.c testcpp_embed.cpp testcpp_embed.h
INCLUDES += -I$(PYTHON_INCDIR)
More information about the cig-commits
mailing list