[cig-commits] [commit] willic3/fix-plasticity: Cleanup of Makefiles for creating source distribution. (f34bab5)

[cig_noreply at geodynamics.org]

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

On branch  : willic3/fix-plasticity
Link       : https://github.com/geodynamics/pylith/compare/01bcfd4740438443647bd65ef58238ab10abcb7b...f34bab5c900421d8c52cbacc01a3da68dc85e663

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

commit f34bab5c900421d8c52cbacc01a3da68dc85e663
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Nov 18 13:33:46 2014 -0800

    Cleanup of Makefiles for creating source distribution.


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

f34bab5c900421d8c52cbacc01a3da68dc85e663
 configure.ac                                      |  1 +
 examples/2d/gravity/Makefile.am                   |  8 +-------
 examples/2d/gravity/{output => }/deform_view.pvsm |  0
 examples/2d/gravity/output/Makefile.am            | 23 -----------------------
 tests/3d/plasticity/Makefile.am                   |  5 +++--
 5 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/configure.ac b/configure.ac
index a76d264..adbb37d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,6 +346,7 @@ AC_CONFIG_FILES([Makefile
 		tests/2d/powerlaw/Makefile
 		tests/2d/slipdir/Makefile
 		tests/2d/frictionslide/Makefile
+		tests/2d/plasticity/Makefile
 		tests/2d/plasticity/initialstress/Makefile
 		tests/3d/Makefile
 		tests/3d/matprops/Makefile
diff --git a/examples/2d/gravity/Makefile.am b/examples/2d/gravity/Makefile.am
index ad0e959..b0fc743 100644
--- a/examples/2d/gravity/Makefile.am
+++ b/examples/2d/gravity/Makefile.am
@@ -18,7 +18,7 @@
 
 dist_noinst_DATA = \
 	README \
-	geometry.jou \
+	mesh.jou \
 	grav_stress-initial.spatialdb \
 	grav_stress.cfg \
 	grav_stress_finite_is2.cfg \
@@ -26,14 +26,8 @@ dist_noinst_DATA = \
 	grav_stress_infin_is2.cfg \
 	mat_elastic.spatialdb \
 	mat_maxwell.spatialdb \
-	mesh_tri3.exo \
-	mesh_tri3.jou \
 	pylithapp.cfg \
 	stress2spatialdb.py
 
 
-SUBDIRS = \
-	output
-
-
 # End of file 
diff --git a/examples/2d/gravity/output/deform_view.pvsm b/examples/2d/gravity/deform_view.pvsm
similarity index 100%
rename from examples/2d/gravity/output/deform_view.pvsm
rename to examples/2d/gravity/deform_view.pvsm
diff --git a/examples/2d/gravity/output/Makefile.am b/examples/2d/gravity/output/Makefile.am
deleted file mode 100644
index a73fd55..0000000
--- a/examples/2d/gravity/output/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Makefile -*-
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard, U.S. Geological Survey
-# Charles A. Williams, GNS Science
-# Matthew G. Knepley, University of Chicago
-#
-# This code was developed as part of the Computational Infrastructure
-# for Geodynamics (http://geodynamics.org).
-#
-# Copyright (c) 2010-2014 University of California, Davis
-#
-# See COPYING for license information.
-#
-# ----------------------------------------------------------------------
-#
-
-dist_noinst_DATA = \
-	deform_view.pvsm
-
-
-# End of file 
diff --git a/tests/3d/plasticity/Makefile.am b/tests/3d/plasticity/Makefile.am
index c34298b..ad61b63 100644
--- a/tests/3d/plasticity/Makefile.am
+++ b/tests/3d/plasticity/Makefile.am
@@ -18,7 +18,8 @@
 
 SUBDIRS = \
 	threehex8 \
-	dynamic \
-	initialstress
+	dynamic
+
+#	initialstress
 
 # End of file