[cig-commits] [commit] baagaard/add-release-2.0.3, baagaard/add-release-2.1.0, baagaard/dynrup-new-lagrange, baagaard/feature-output-station-names, baagaard/feature-progress-monitor, baagaard/fix-custom-faultpc, baagaard/fix-faults-intersect, baagaard/update-autoconf, knepley/feature-petsc-fe, knepley/upgrade-petsc-3.5, knepley/upgrade-petsc-master, maint, master, next, willic3/fix-plasticity: Create module.am for stuff common to all Python modules. (79f86a6)

Wed Nov 5 15:45:19 PST 2014

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

On branches: baagaard/add-release-2.0.3,baagaard/add-release-2.1.0,baagaard/dynrup-new-lagrange,baagaard/feature-output-station-names,baagaard/feature-progress-monitor,baagaard/fix-custom-faultpc,baagaard/fix-faults-intersect,baagaard/update-autoconf,knepley/feature-petsc-fe,knepley/upgrade-petsc-3.5,knepley/upgrade-petsc-master,maint,master,next,willic3/fix-plasticity
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

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

commit 79f86a6ba3a6e5f2736a9f98b4870b9cfd136aeb
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon Aug 18 17:30:55 2014 -0700

    Create module.am for stuff common to all Python modules.
    
    Move AM_CPPFLAGS to module.am.


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

79f86a6ba3a6e5f2736a9f98b4870b9cfd136aeb
 modulesrc/bc/Makefile.am         |  3 +--
 modulesrc/faults/Makefile.am     |  3 +--
 modulesrc/feassemble/Makefile.am |  3 +--
 modulesrc/friction/Makefile.am   |  3 +--
 modulesrc/materials/Makefile.am  |  3 +--
 modulesrc/meshio/Makefile.am     |  3 +--
 check.am => modulesrc/module.am  | 12 ++++++------
 modulesrc/mpi/Makefile.am        |  3 +--
 modulesrc/problems/Makefile.am   |  3 +--
 modulesrc/topology/Makefile.am   |  3 +--
 modulesrc/utils/Makefile.am      |  4 +---
 11 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/modulesrc/bc/Makefile.am b/modulesrc/bc/Makefile.am
index 9da4ce2..6ca4631 100644
--- a/modulesrc/bc/Makefile.am
+++ b/modulesrc/bc/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = bc
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _bcmodule.la
 
@@ -60,8 +61,6 @@ _bcmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/bc_wrap.cxx $(srcdir)/bc.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/faults/Makefile.am b/modulesrc/faults/Makefile.am
index 478ba33..c3d0359 100644
--- a/modulesrc/faults/Makefile.am
+++ b/modulesrc/faults/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = faults
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _faultsmodule.la
 
@@ -65,8 +66,6 @@ _faultsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/faults_wrap.cxx $(srcdir)/faults.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/feassemble/Makefile.am b/modulesrc/feassemble/Makefile.am
index 639131a..9016948 100644
--- a/modulesrc/feassemble/Makefile.am
+++ b/modulesrc/feassemble/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = feassemble
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _feassemblemodule.la
 
@@ -68,8 +69,6 @@ _feassemblemodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/feassemble_wrap.cxx $(srcdir)/feassemble.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/friction/Makefile.am b/modulesrc/friction/Makefile.am
index 1aefd40..19fad48 100644
--- a/modulesrc/friction/Makefile.am
+++ b/modulesrc/friction/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = friction
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _frictionmodule.la
 
@@ -57,8 +58,6 @@ _frictionmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/friction_wrap.cxx $(srcdir)/friction.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/materials/Makefile.am b/modulesrc/materials/Makefile.am
index 5a8941e..c6398b2 100644
--- a/modulesrc/materials/Makefile.am
+++ b/modulesrc/materials/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = materials
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _materialsmodule.la
 
@@ -66,8 +67,6 @@ _materialsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/materials_wrap.cxx $(srcdir)/materials.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/meshio/Makefile.am b/modulesrc/meshio/Makefile.am
index 62a0125..1cac4a6 100644
--- a/modulesrc/meshio/Makefile.am
+++ b/modulesrc/meshio/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = meshio
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _meshiomodule.la
 
@@ -60,8 +61,6 @@ _meshiomodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/meshio_wrap.cxx $(srcdir)/meshio.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) $(PYLITH_SWIG_CPPFLAGS) -Wall -c++ -python $<
diff --git a/check.am b/modulesrc/module.am
similarity index 79%
copy from check.am
copy to modulesrc/module.am
index 8498b93..c690fca 100644
--- a/check.am
+++ b/modulesrc/module.am
@@ -16,11 +16,11 @@
 # ----------------------------------------------------------------------
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/libsrc
-
-
-check-local: $(TEST_LOGS)
-	for f in $(TEST_LOGS); do printf "\n=== $$f ===\n\n"; cat $$f; done
-
+AM_CPPFLAGS = \
+	$(PYTHON_EGG_CPPFLAGS) \
+	-I$(top_srcdir)/libsrc \
+	-I$(NUMPY_INCDIR) \
+	-I$(PYTHON_INCDIR) \
+	$(PETSC_CC_INCLUDES)
 
 # End of file
diff --git a/modulesrc/mpi/Makefile.am b/modulesrc/mpi/Makefile.am
index 59816e0..521bc31 100644
--- a/modulesrc/mpi/Makefile.am
+++ b/modulesrc/mpi/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = mpi
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _mpimodule.la
 
@@ -47,8 +48,6 @@ _mpimodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/mpi_wrap.cxx $(srcdir)/mpi.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/problems/Makefile.am b/modulesrc/problems/Makefile.am
index 5b36b5f..630f57c 100644
--- a/modulesrc/problems/Makefile.am
+++ b/modulesrc/problems/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = problems
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _problemsmodule.la
 
@@ -55,8 +56,6 @@ _problemsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/problems_wrap.cxx $(srcdir)/problems.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/topology/Makefile.am b/modulesrc/topology/Makefile.am
index ee37267..12510fe 100644
--- a/modulesrc/topology/Makefile.am
+++ b/modulesrc/topology/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = topology
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _topologymodule.la
 
@@ -54,8 +55,6 @@ _topologymodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/topology_wrap.cxx $(srcdir)/topology.py: $(swig_sources)
 	$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<
diff --git a/modulesrc/utils/Makefile.am b/modulesrc/utils/Makefile.am
index 8f2bc3d..510c2bd 100644
--- a/modulesrc/utils/Makefile.am
+++ b/modulesrc/utils/Makefile.am
@@ -18,6 +18,7 @@
 
 subpackage = utils
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = \
 	_petscmodule.la \
@@ -82,9 +83,6 @@ _utilsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-
-AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
-
 if ENABLE_SWIG
 $(srcdir)/petsc_wrap.cxx $(srcdir)/petsc.py: $(petsc_swig_sources)
 	$(SWIG) -Wall -c++ -python $<

