Skip to content

Commit

Permalink
Merge pull request #67 from geodynamics/baagaard/fix-make-dist
Browse files Browse the repository at this point in the history
Update Makefiles for distribution
  • Loading branch information
baagaard-usgs authored Jun 6, 2022
2 parents a8cbfad + 5ab6e9d commit ca4b7e8
Show file tree
Hide file tree
Showing 224 changed files with 550 additions and 494 deletions.
14 changes: 10 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# This code was developed as part of the Computational Infrastructure
# for Geodynamics (http://geodynamics.org).
#
# Copyright (c) 2010-2017 University of California, Davis
# Copyright (c) 2010-2022 University of California, Davis
#
# See COPYING for license information.
# See LICENSE.md for license information.
#
# ----------------------------------------------------------------------
#
Expand All @@ -20,7 +20,8 @@ SUBDIRS = \
libsrc \
modulesrc \
spatialdata \
templates
templates \
docs


if ENABLE_TESTING
Expand All @@ -33,7 +34,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
LDFLAGS="-L${PROJ4_LIBDIR} -L${CPPUNIT_LIBDIR} -L${CIG_LIBDIR}"

EXTRA_DIST = \
CHANGES.md \
README.md \
CHANGES.md \
setup.py \
setup.cfg \
configure.ac \
applications/gensimpledb.py \
LICENSE.md \
docker/spatialdata-testenv \
ci-config/run_tests.sh \
Expand Down
4 changes: 2 additions & 2 deletions applications/gensimpledb.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# This code was developed as part of the Computational Infrastructure
# for Geodynamics (http://geodynamics.org).
#
# Copyright (c) 2010-2017 University of California, Davis
# Copyright (c) 2010-2022 University of California, Davis
#
# See COPYING for license information.
# See LICENSE.md for license information.
#
# ======================================================================
#
Expand Down
4 changes: 2 additions & 2 deletions check.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# This code was developed as part of the Computational Infrastructure
# for Geodynamics (http://geodynamics.org).
#
# Copyright (c) 2010-2017 University of California, Davis
# Copyright (c) 2010-2022 University of California, Davis
#
# See COPYING for license information.
# See LICENSE.md for license information.
#
# ----------------------------------------------------------------------
#
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dnl
dnl This code was developed as part of the Computational Infrastructure
dnl for Geodynamics (http://geodynamics.org).
dnl
dnl Copyright (c) 2010-2017 University of California, Davis
dnl Copyright (c) 2010-2022 University of California, Davis
dnl
dnl See COPYING for license information.
dnl See LICENSE.md for license information.
dnl
dnl ----------------------------------------------------------------------
dnl
Expand Down
78 changes: 50 additions & 28 deletions docs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# This code was developed as part of the Computational Infrastructure
# for Geodynamics (http://geodynamics.org).
#
# Copyright (c) 2010-2021 University of California, Davis
# Copyright (c) 2010-2022 University of California, Davis
#
# See LICENSE.md for license information.
#
Expand All @@ -22,42 +22,64 @@ dist_noinst_DATA = \
_static/css/custom.css \
_static/images/cig_logo_dots.png \
_static/images/cig_short_nolabel.png \
_static/images/cig_short_pylith.png \
_templates/sidebase-cig.html \
palettes/figcolors.tex \
_static/images/cig_short_spatialdata.png \
_static/images/cig_short_spatialdata.xcf \
_templates/sidebar-cig.html \
index.md \
references.bib \
references.md \
intro/index.md \
intro/development-plan.md \
intro/preface.md \
intro/quickstart.md \
intro/release-notes.md \
intro/development-plan.md \
intro/images/easy.png \
intro/images/intermediate.png \
intro/images/difficult.png \
intro/images/expert.png \
user/index.md \
user/preface.md \
user/intro/index.md \
user/intro/figs/workflow.tex \
user/intro/figs/workflow.pdf \
user/intro/figs/workflow.jpg \
user/install/index.md \
user/install/figs/installchoices.tex \
user/install/figs/installchoices.pdf \
user/install/figs/installchoices.jpg \
user/examples/index.md \
user/examples/examples-other.md \
user/examples/paraview-python.md \
user/2d/box/index.md \
user/3d/box/index.md \
user/2d/strikeslip/index.md \
user/2d/reverse/index.md \
user/2d/reverse/meshing.md \
user/2d/reverse/figs/geometry.pdf \
user/2d/reverse/figs/geometry.png \
user/2d/subduction/index.md \
user/3d/subduction/index.md
user/file-formats/simple-grid.md \
user/file-formats/index.md \
user/file-formats/time-history.md \
user/file-formats/simple-ascii.md \
user/timedb/index.md \
user/components/update.sh \
user/components/index.md \
user/components/utils/PointsStream.md \
user/components/utils/UnitTestApp.md \
user/components/utils/index.md \
user/components/geocoords/CSGeo.md \
user/components/geocoords/index.md \
user/components/geocoords/CSCart.md \
user/components/geocoords/CoordSys.md \
user/components/units/NondimElasticQuasistatic.md \
user/components/units/index.md \
user/components/units/NondimElasticDynamic.md \
user/components/units/Nondimensional.md \
user/components/spatialdb/SimpleGridDB.md \
user/components/spatialdb/CompositeDB.md \
user/components/spatialdb/SimpleDB.md \
user/components/spatialdb/UserFunctionDB.md \
user/components/spatialdb/generator/Geometry.md \
user/components/spatialdb/generator/Value.md \
user/components/spatialdb/generator/GenSimpleDBApp.md \
user/components/spatialdb/generator/index.md \
user/components/spatialdb/generator/Shaper.md \
user/components/spatialdb/SimpleGridAscii.md \
user/components/spatialdb/GravityField.md \
user/components/spatialdb/index.md \
user/components/spatialdb/TimeHistory.md \
user/components/spatialdb/SpatialDBObj.md \
user/components/spatialdb/SCECCVMH.md \
user/components/spatialdb/UniformDB.md \
user/components/spatialdb/SimpleIOAscii.md \
user/nondimensionalization.md \
user/spatialdb/simplegriddb.md \
user/spatialdb/overview.md \
user/spatialdb/compositedb.md \
user/spatialdb/simpledb.md \
user/spatialdb/index.md \
user/spatialdb/gravity-field.md \
user/spatialdb/uniformdb.md \
user/coordsys.md


# End of file
4 changes: 2 additions & 2 deletions libsrc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# This code was developed as part of the Computational Infrastructure
# for Geodynamics (http://geodynamics.org).
#
# Copyright (c) 2010-2017 University of California, Davis
# Copyright (c) 2010-2022 University of California, Davis
#
# See COPYING for license information.
# See LICENSE.md for license information.
#
# ----------------------------------------------------------------------
#
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# This code was developed as part of the Computational Infrastructure
# for Geodynamics (http://geodynamics.org).
#
# Copyright (c) 2010-2017 University of California, Davis
# Copyright (c) 2010-2022 University of California, Davis
#
# See COPYING for license information.
# See LICENSE.md for license information.
#
# ----------------------------------------------------------------------
#
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CSCart.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CSCart.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CSGeo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CSGeo.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CSPicklerAscii.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CSPicklerAscii.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/Converter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/Converter.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CoordSys.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/CoordSys.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# This code was developed as part of the Computational Infrastructure
# for Geodynamics (http://geodynamics.org).
#
# Copyright (c) 2010-2017 University of California, Davis
# Copyright (c) 2010-2022 University of California, Davis
#
# See COPYING for license information.
# See LICENSE.md for license information.
#
# ----------------------------------------------------------------------
#
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/geocoords/geocoordsfwd.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/spatialdb/CompositeDB.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/spatialdb/CompositeDB.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/spatialdb/Exception.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
4 changes: 2 additions & 2 deletions libsrc/spatialdata/spatialdb/Exception.icc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// This code was developed as part of the Computational Infrastructure
// for Geodynamics (http://geodynamics.org).
//
// Copyright (c) 2010-2017 University of California, Davis
// Copyright (c) 2010-2022 University of California, Davis
//
// See COPYING for license information.
// See LICENSE.md for license information.
//
// ----------------------------------------------------------------------
//
Expand Down
Loading

0 comments on commit ca4b7e8

Please sign in to comment.