[cig-commits] [commit] master: Merge branch 'baagaard/update-autoconf' (91b178b)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Aug 19 12:35:17 PDT 2014 

Repository : https://github.com/geodynamics/spatialdata

On branch  : master
Link       : https://github.com/geodynamics/spatialdata/compare/6a221c2f1b10c32c456b623d1c767a87d17e8650...91b178b50d38198a16b88c4602ba359754957ffd

>---------------------------------------------------------------

commit 91b178b50d38198a16b88c4602ba359754957ffd
Merge: 6a221c2 b51f592
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Aug 19 12:35:22 2014 -0700

    Merge branch 'baagaard/update-autoconf'
    
    * baagaard/update-autoconf:
      Add AM_PROG_CC_C_O due to mixing of C and C++ objects in test.
      Cleanup and update for automake 1.13.
      Move libsrc stuff to libsrc/spatialdata.
      Trivial code cleanup.



>---------------------------------------------------------------

91b178b50d38198a16b88c4602ba359754957ffd
 templates/spatialdb/tests/Makefile.am => check.am  | 10 ++--
 configure.ac                                       | 19 +++++---
 libsrc/Makefile.am                                 | 54 +---------------------
 libsrc/{ => spatialdata}/Makefile.am               |  7 +--
 libsrc/{ => spatialdata}/geocoords/CSCart.cc       |  0
 libsrc/{ => spatialdata}/geocoords/CSCart.hh       |  0
 libsrc/{ => spatialdata}/geocoords/CSCart.icc      |  0
 libsrc/{ => spatialdata}/geocoords/CSGeo.cc        |  0
 libsrc/{ => spatialdata}/geocoords/CSGeo.hh        |  0
 libsrc/{ => spatialdata}/geocoords/CSGeo.icc       |  0
 .../{ => spatialdata}/geocoords/CSGeoLocalCart.cc  |  0
 .../{ => spatialdata}/geocoords/CSGeoLocalCart.hh  |  0
 .../{ => spatialdata}/geocoords/CSGeoLocalCart.icc |  0
 libsrc/{ => spatialdata}/geocoords/CSGeoProj.cc    |  0
 libsrc/{ => spatialdata}/geocoords/CSGeoProj.hh    |  0
 libsrc/{ => spatialdata}/geocoords/CSGeoProj.icc   |  0
 .../{ => spatialdata}/geocoords/CSPicklerAscii.cc  |  0
 .../{ => spatialdata}/geocoords/CSPicklerAscii.hh  |  0
 libsrc/{ => spatialdata}/geocoords/Converter.cc    |  0
 libsrc/{ => spatialdata}/geocoords/Converter.hh    |  0
 libsrc/{ => spatialdata}/geocoords/CoordSys.cc     |  0
 libsrc/{ => spatialdata}/geocoords/CoordSys.hh     |  0
 libsrc/{ => spatialdata}/geocoords/CoordSys.icc    |  0
 libsrc/{ => spatialdata}/geocoords/Geoid.cc        |  0
 libsrc/{ => spatialdata}/geocoords/Geoid.hh        |  0
 libsrc/{ => spatialdata}/geocoords/Geoid.icc       |  0
 libsrc/{ => spatialdata}/geocoords/Makefile.am     |  5 --
 libsrc/{ => spatialdata}/geocoords/Projector.cc    |  0
 libsrc/{ => spatialdata}/geocoords/Projector.hh    |  0
 libsrc/{ => spatialdata}/geocoords/Projector.icc   |  0
 .../{ => spatialdata}/geocoords/data/Makefile.am   |  0
 .../{ => spatialdata}/geocoords/data/ww15mgh.dac   |  0
 libsrc/{ => spatialdata}/geocoords/geocoordsfwd.hh |  0
 libsrc/{ => spatialdata}/geocoords/proj4fwd.h      |  0
 libsrc/{ => spatialdata}/spatialdb/CompositeDB.cc  |  0
 libsrc/{ => spatialdata}/spatialdb/CompositeDB.hh  |  0
 libsrc/{ => spatialdata}/spatialdb/Exception.hh    |  0
 libsrc/{ => spatialdata}/spatialdb/Exception.icc   |  0
 libsrc/{ => spatialdata}/spatialdb/GocadVoxet.cc   |  0
 libsrc/{ => spatialdata}/spatialdb/GocadVoxet.hh   |  0
 libsrc/{ => spatialdata}/spatialdb/GravityField.cc |  0
 libsrc/{ => spatialdata}/spatialdb/GravityField.hh |  0
 .../{ => spatialdata}/spatialdb/GravityField.icc   |  0
 libsrc/{ => spatialdata}/spatialdb/Makefile.am     |  5 --
 libsrc/{ => spatialdata}/spatialdb/SCECCVMH.cc     |  0
 libsrc/{ => spatialdata}/spatialdb/SCECCVMH.hh     |  0
 libsrc/{ => spatialdata}/spatialdb/SCECCVMH.icc    |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleDB.cc     |  6 +--
 libsrc/{ => spatialdata}/spatialdb/SimpleDB.hh     |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleDB.icc    |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleDBData.cc |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleDBData.hh |  0
 .../{ => spatialdata}/spatialdb/SimpleDBData.icc   |  0
 .../{ => spatialdata}/spatialdb/SimpleDBQuery.cc   |  0
 .../{ => spatialdata}/spatialdb/SimpleDBQuery.hh   |  0
 .../{ => spatialdata}/spatialdb/SimpleGridAscii.cc |  0
 .../{ => spatialdata}/spatialdb/SimpleGridAscii.hh |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleGridDB.cc |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleGridDB.hh |  0
 .../{ => spatialdata}/spatialdb/SimpleGridDB.icc   |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleIO.cc     |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleIO.hh     |  0
 libsrc/{ => spatialdata}/spatialdb/SimpleIO.icc    |  0
 .../{ => spatialdata}/spatialdb/SimpleIOAscii.cc   | 26 +++++------
 .../{ => spatialdata}/spatialdb/SimpleIOAscii.hh   |  0
 .../{ => spatialdata}/spatialdb/SimpleIOAscii.icc  |  0
 libsrc/{ => spatialdata}/spatialdb/SpatialDB.cc    |  0
 libsrc/{ => spatialdata}/spatialdb/SpatialDB.hh    |  0
 libsrc/{ => spatialdata}/spatialdb/SpatialDB.icc   |  0
 libsrc/{ => spatialdata}/spatialdb/TimeHistory.cc  |  0
 libsrc/{ => spatialdata}/spatialdb/TimeHistory.hh  |  0
 libsrc/{ => spatialdata}/spatialdb/TimeHistory.icc |  0
 .../{ => spatialdata}/spatialdb/TimeHistoryIO.cc   |  0
 .../{ => spatialdata}/spatialdb/TimeHistoryIO.hh   |  0
 libsrc/{ => spatialdata}/spatialdb/UniformDB.cc    |  0
 libsrc/{ => spatialdata}/spatialdb/UniformDB.hh    |  0
 libsrc/{ => spatialdata}/spatialdb/UniformDB.icc   |  0
 libsrc/{ => spatialdata}/spatialdb/cspatialdb.cc   |  0
 libsrc/{ => spatialdata}/spatialdb/cspatialdb.h    |  0
 libsrc/{ => spatialdata}/spatialdb/f77spatialdb.cc |  0
 libsrc/{ => spatialdata}/spatialdb/f77spatialdb.h  |  0
 libsrc/{ => spatialdata}/spatialdb/spatialdbfwd.hh |  0
 libsrc/{ => spatialdata}/units/Makefile.am         |  4 --
 libsrc/{ => spatialdata}/units/Nondimensional.cc   |  0
 libsrc/{ => spatialdata}/units/Nondimensional.hh   |  0
 libsrc/{ => spatialdata}/units/Nondimensional.icc  |  0
 libsrc/{ => spatialdata}/units/Parser.cc           |  0
 libsrc/{ => spatialdata}/units/Parser.hh           |  0
 libsrc/{ => spatialdata}/units/unitsfwd.hh         |  0
 libsrc/{ => spatialdata}/utils/LineParser.cc       |  0
 libsrc/{ => spatialdata}/utils/LineParser.hh       |  0
 libsrc/{ => spatialdata}/utils/Makefile.am         |  4 --
 libsrc/{ => spatialdata}/utils/PointsStream.cc     |  0
 libsrc/{ => spatialdata}/utils/PointsStream.hh     |  0
 libsrc/{ => spatialdata}/utils/PointsStream.icc    |  0
 libsrc/{ => spatialdata}/utils/utilsfwd.hh         |  0
 modulesrc/geocoords/Makefile.am                    |  5 +-
 modulesrc/{Makefile.am => module.am}               | 13 +++---
 modulesrc/spatialdb/Makefile.am                    |  5 +-
 modulesrc/units/Makefile.am                        |  5 +-
 subpackage.am                                      | 18 --------
 templates/spatialdb/Makefile.am                    |  4 +-
 tests/libtests/geocoords/Makefile.am               |  7 +--
 tests/libtests/spatialdb/Makefile.am               |  7 ++-
 tests/libtests/units/Makefile.am                   |  8 ++--
 tests/libtests/utils/Makefile.am                   |  5 +-
 tests/pytests/geocoords/Makefile.am                |  4 +-
 tests/pytests/geocoords/testgeocoords.py           |  0
 tests/pytests/spatialdb/Makefile.am                |  4 +-
 tests/pytests/spatialdb/test_sceccvmh.py           |  0
 tests/pytests/spatialdb/testspatial.py             |  0
 tests/pytests/units/Makefile.am                    |  4 +-
 tests/pytests/units/testunits.py                   |  0
 tests/pytests/utils/Makefile.am                    |  5 +-
 tests/pytests/utils/testutils.py                   |  0
 115 files changed, 65 insertions(+), 169 deletions(-)

More information about the CIG-COMMITS mailing list