Skip to content

Commit ca4b7e8

Browse files
baagaard-usgsbaagaard-usgs
authored
Merge pull request #67 from geodynamics/baagaard/fix-make-dist
Update Makefiles for distribution
2 parents a8cbfad + 5ab6e9d commit ca4b7e8

File tree

224 files changed

+550
-494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+550
-494
lines changed

‎Makefile.am‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2017 University of California, Davis
10+
# Copyright (c) 2010-2022 University of California, Davis
1111
#
12-
# See COPYING for license information.
12+
# See LICENSE.md for license information.
1313
#
1414
# ----------------------------------------------------------------------
1515
#
@@ -20,7 +20,8 @@ SUBDIRS = \
2020
libsrc \
2121
modulesrc \
2222
spatialdata \
23-
templates
23+
templates \
24+
docs
2425

2526

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

3536
EXTRA_DIST = \
36-
CHANGES.md \
37+
README.md \
38+
CHANGES.md \
39+
setup.py \
40+
setup.cfg \
41+
configure.ac \
42+
applications/gensimpledb.py \
3743
LICENSE.md \
3844
docker/spatialdata-testenv \
3945
ci-config/run_tests.sh \

‎applications/gensimpledb.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2017 University of California, Davis
10+
# Copyright (c) 2010-2022 University of California, Davis
1111
#
12-
# See COPYING for license information.
12+
# See LICENSE.md for license information.
1313
#
1414
# ======================================================================
1515
#

‎check.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2017 University of California, Davis
10+
# Copyright (c) 2010-2022 University of California, Davis
1111
#
12-
# See COPYING for license information.
12+
# See LICENSE.md for license information.
1313
#
1414
# ----------------------------------------------------------------------
1515
#

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dnl
77
dnl This code was developed as part of the Computational Infrastructure
88
dnl for Geodynamics (http://geodynamics.org).
99
dnl
10-
dnl Copyright (c) 2010-2017 University of California, Davis
10+
dnl Copyright (c) 2010-2022 University of California, Davis
1111
dnl
12-
dnl See COPYING for license information.
12+
dnl See LICENSE.md for license information.
1313
dnl
1414
dnl ----------------------------------------------------------------------
1515
dnl

‎docs/Makefile.am‎

Lines changed: 50 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# This code was developed as part of the Computational Infrastructure
1010
# for Geodynamics (http://geodynamics.org).
1111
#
12-
# Copyright (c) 2010-2021 University of California, Davis
12+
# Copyright (c) 2010-2022 University of California, Davis
1313
#
1414
# See LICENSE.md for license information.
1515
#
@@ -22,42 +22,64 @@ dist_noinst_DATA = \
2222
_static/css/custom.css \
2323
_static/images/cig_logo_dots.png \
2424
_static/images/cig_short_nolabel.png \
25-
_static/images/cig_short_pylith.png \
26-
_templates/sidebase-cig.html \
27-
palettes/figcolors.tex \
25+
_static/images/cig_short_spatialdata.png \
26+
_static/images/cig_short_spatialdata.xcf \
27+
_templates/sidebar-cig.html \
2828
index.md \
29-
references.bib \
30-
references.md \
3129
intro/index.md \
30+
intro/development-plan.md \
31+
intro/preface.md \
3232
intro/quickstart.md \
3333
intro/release-notes.md \
34-
intro/development-plan.md \
3534
intro/images/easy.png \
3635
intro/images/intermediate.png \
3736
intro/images/difficult.png \
3837
intro/images/expert.png \
3938
user/index.md \
40-
user/preface.md \
41-
user/intro/index.md \
42-
user/intro/figs/workflow.tex \
43-
user/intro/figs/workflow.pdf \
44-
user/intro/figs/workflow.jpg \
45-
user/install/index.md \
46-
user/install/figs/installchoices.tex \
47-
user/install/figs/installchoices.pdf \
48-
user/install/figs/installchoices.jpg \
49-
user/examples/index.md \
50-
user/examples/examples-other.md \
51-
user/examples/paraview-python.md \
52-
user/2d/box/index.md \
53-
user/3d/box/index.md \
54-
user/2d/strikeslip/index.md \
55-
user/2d/reverse/index.md \
56-
user/2d/reverse/meshing.md \
57-
user/2d/reverse/figs/geometry.pdf \
58-
user/2d/reverse/figs/geometry.png \
59-
user/2d/subduction/index.md \
60-
user/3d/subduction/index.md
39+
user/file-formats/simple-grid.md \
40+
user/file-formats/index.md \
41+
user/file-formats/time-history.md \
42+
user/file-formats/simple-ascii.md \
43+
user/timedb/index.md \
44+
user/components/update.sh \
45+
user/components/index.md \
46+
user/components/utils/PointsStream.md \
47+
user/components/utils/UnitTestApp.md \
48+
user/components/utils/index.md \
49+
user/components/geocoords/CSGeo.md \
50+
user/components/geocoords/index.md \
51+
user/components/geocoords/CSCart.md \
52+
user/components/geocoords/CoordSys.md \
53+
user/components/units/NondimElasticQuasistatic.md \
54+
user/components/units/index.md \
55+
user/components/units/NondimElasticDynamic.md \
56+
user/components/units/Nondimensional.md \
57+
user/components/spatialdb/SimpleGridDB.md \
58+
user/components/spatialdb/CompositeDB.md \
59+
user/components/spatialdb/SimpleDB.md \
60+
user/components/spatialdb/UserFunctionDB.md \
61+
user/components/spatialdb/generator/Geometry.md \
62+
user/components/spatialdb/generator/Value.md \
63+
user/components/spatialdb/generator/GenSimpleDBApp.md \
64+
user/components/spatialdb/generator/index.md \
65+
user/components/spatialdb/generator/Shaper.md \
66+
user/components/spatialdb/SimpleGridAscii.md \
67+
user/components/spatialdb/GravityField.md \
68+
user/components/spatialdb/index.md \
69+
user/components/spatialdb/TimeHistory.md \
70+
user/components/spatialdb/SpatialDBObj.md \
71+
user/components/spatialdb/SCECCVMH.md \
72+
user/components/spatialdb/UniformDB.md \
73+
user/components/spatialdb/SimpleIOAscii.md \
74+
user/nondimensionalization.md \
75+
user/spatialdb/simplegriddb.md \
76+
user/spatialdb/overview.md \
77+
user/spatialdb/compositedb.md \
78+
user/spatialdb/simpledb.md \
79+
user/spatialdb/index.md \
80+
user/spatialdb/gravity-field.md \
81+
user/spatialdb/uniformdb.md \
82+
user/coordsys.md
6183

6284

6385
# End of file

‎libsrc/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2017 University of California, Davis
10+
# Copyright (c) 2010-2022 University of California, Davis
1111
#
12-
# See COPYING for license information.
12+
# See LICENSE.md for license information.
1313
#
1414
# ----------------------------------------------------------------------
1515
#

‎libsrc/spatialdata/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2017 University of California, Davis
10+
# Copyright (c) 2010-2022 University of California, Davis
1111
#
12-
# See COPYING for license information.
12+
# See LICENSE.md for license information.
1313
#
1414
# ----------------------------------------------------------------------
1515
#

‎libsrc/spatialdata/geocoords/CSCart.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// This code was developed as part of the Computational Infrastructure
88
// for Geodynamics (http://geodynamics.org).
99
//
10-
// Copyright (c) 2010-2017 University of California, Davis
10+
// Copyright (c) 2010-2022 University of California, Davis
1111
//
12-
// See COPYING for license information.
12+
// See LICENSE.md for license information.
1313
//
1414
// ----------------------------------------------------------------------
1515
//

‎libsrc/spatialdata/geocoords/CSCart.hh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// This code was developed as part of the Computational Infrastructure
88
// for Geodynamics (http://geodynamics.org).
99
//
10-
// Copyright (c) 2010-2017 University of California, Davis
10+
// Copyright (c) 2010-2022 University of California, Davis
1111
//
12-
// See COPYING for license information.
12+
// See LICENSE.md for license information.
1313
//
1414
// ----------------------------------------------------------------------
1515
//

‎libsrc/spatialdata/geocoords/CSGeo.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// This code was developed as part of the Computational Infrastructure
88
// for Geodynamics (http://geodynamics.org).
99
//
10-
// Copyright (c) 2010-2017 University of California, Davis
10+
// Copyright (c) 2010-2022 University of California, Davis
1111
//
12-
// See COPYING for license information.
12+
// See LICENSE.md for license information.
1313
//
1414
// ----------------------------------------------------------------------
1515
//

0 commit comments

Comments
 (0)