[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: Updated Makfiles to eliminate warnings. (87981e9)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 15:45:08 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 87981e97bb95173ecc046a3e58ce22aba1161c34
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon Aug 18 13:12:45 2014 -0700

    Updated Makfiles to eliminate warnings.
    
    INCLUDES -> AM_CPPFLAGS
    Use subdir-objects option.


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

87981e97bb95173ecc046a3e58ce22aba1161c34
 configure.ac                              | 3 ++-
 libsrc/pylith/Makefile.am                 | 6 +++---
 modulesrc/bc/Makefile.am                  | 2 +-
 modulesrc/faults/Makefile.am              | 2 +-
 modulesrc/feassemble/Makefile.am          | 2 +-
 modulesrc/friction/Makefile.am            | 2 +-
 modulesrc/materials/Makefile.am           | 2 +-
 modulesrc/meshio/Makefile.am              | 2 +-
 modulesrc/mpi/Makefile.am                 | 2 +-
 modulesrc/problems/Makefile.am            | 2 +-
 modulesrc/topology/Makefile.am            | 2 +-
 modulesrc/utils/Makefile.am               | 2 +-
 subpackage.am                             | 2 +-
 templates/friction/Makefile.am            | 6 ++----
 templates/materials/Makefile.am           | 6 ++----
 tests/topology/Makefile.am                | 4 ++--
 unittests/libtests/bc/Makefile.am         | 2 +-
 unittests/libtests/faults/Makefile.am     | 2 +-
 unittests/libtests/feassemble/Makefile.am | 2 +-
 unittests/libtests/friction/Makefile.am   | 2 +-
 unittests/libtests/materials/Makefile.am  | 2 +-
 unittests/libtests/meshio/Makefile.am     | 2 +-
 unittests/libtests/topology/Makefile.am   | 2 +-
 unittests/libtests/utils/Makefile.am      | 2 +-
 24 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/configure.ac b/configure.ac
index fc5947e..e0e45be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_INIT([PyLith], [2.0.2], [cig-short at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 # ----------------------------------------------------------------------
 # PYTHON
@@ -151,6 +151,7 @@ AC_LANG(C++)
 #CIT_CHECK_LIB_MPI
 
 # PETSC
+AC_LANG(C)
 CIT_PATH_PETSC([3.5.0])
 CIT_HEADER_PETSC
 CIT_CHECK_LIB_PETSC
diff --git a/libsrc/pylith/Makefile.am b/libsrc/pylith/Makefile.am
index 8aa0550..8ab1287 100644
--- a/libsrc/pylith/Makefile.am
+++ b/libsrc/pylith/Makefile.am
@@ -157,10 +157,10 @@ libpylith_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES = -I$(top_srcdir)/libsrc
-INCLUDES += $(PETSC_CC_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/libsrc
+AM_CPPFLAGS += $(PETSC_CC_INCLUDES)
 
-AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_SIEVE_FLAGS)
+AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_SIEVE_FLAGS)
 
 if ENABLE_HDF5
   libpylith_la_SOURCES += \
diff --git a/modulesrc/bc/Makefile.am b/modulesrc/bc/Makefile.am
index e2d9ed0..9da4ce2 100644
--- a/modulesrc/bc/Makefile.am
+++ b/modulesrc/bc/Makefile.am
@@ -60,7 +60,7 @@ _bcmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/faults/Makefile.am b/modulesrc/faults/Makefile.am
index c937d8d..478ba33 100644
--- a/modulesrc/faults/Makefile.am
+++ b/modulesrc/faults/Makefile.am
@@ -65,7 +65,7 @@ _faultsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/feassemble/Makefile.am b/modulesrc/feassemble/Makefile.am
index e888733..639131a 100644
--- a/modulesrc/feassemble/Makefile.am
+++ b/modulesrc/feassemble/Makefile.am
@@ -68,7 +68,7 @@ _feassemblemodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/friction/Makefile.am b/modulesrc/friction/Makefile.am
index 5443093..1aefd40 100644
--- a/modulesrc/friction/Makefile.am
+++ b/modulesrc/friction/Makefile.am
@@ -57,7 +57,7 @@ _frictionmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/materials/Makefile.am b/modulesrc/materials/Makefile.am
index 8cda4eb..5a8941e 100644
--- a/modulesrc/materials/Makefile.am
+++ b/modulesrc/materials/Makefile.am
@@ -66,7 +66,7 @@ _materialsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/meshio/Makefile.am b/modulesrc/meshio/Makefile.am
index 3064570..62a0125 100644
--- a/modulesrc/meshio/Makefile.am
+++ b/modulesrc/meshio/Makefile.am
@@ -60,7 +60,7 @@ _meshiomodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/mpi/Makefile.am b/modulesrc/mpi/Makefile.am
index b899eaa..59816e0 100644
--- a/modulesrc/mpi/Makefile.am
+++ b/modulesrc/mpi/Makefile.am
@@ -47,7 +47,7 @@ _mpimodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
 
 if ENABLE_SWIG
 $(srcdir)/mpi_wrap.cxx $(srcdir)/mpi.py: $(swig_sources)
diff --git a/modulesrc/problems/Makefile.am b/modulesrc/problems/Makefile.am
index 466ec6b..5b36b5f 100644
--- a/modulesrc/problems/Makefile.am
+++ b/modulesrc/problems/Makefile.am
@@ -55,7 +55,7 @@ _problemsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/topology/Makefile.am b/modulesrc/topology/Makefile.am
index d007540..ee37267 100644
--- a/modulesrc/topology/Makefile.am
+++ b/modulesrc/topology/Makefile.am
@@ -54,7 +54,7 @@ _topologymodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/modulesrc/utils/Makefile.am b/modulesrc/utils/Makefile.am
index 77a2b7a..8f2bc3d 100644
--- a/modulesrc/utils/Makefile.am
+++ b/modulesrc/utils/Makefile.am
@@ -83,7 +83,7 @@ _utilsmodule_la_LIBADD += \
 endif
 
 
-INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
+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)
diff --git a/subpackage.am b/subpackage.am
index 7fcb715..62f3859 100644
--- a/subpackage.am
+++ b/subpackage.am
@@ -39,7 +39,7 @@ export-nobase_subpkgincludeHEADERS: $(nobase_subpkginclude_HEADERS)
 clean-nobase_subpkgincludeHEADERS:
 	$(MAKE) $(AM_MAKEFLAGS) pkgincludedir=$(export_incdir) uninstall-nobase_subpkgincludeHEADERS
 
-INCLUDES = -I$(top_srcdir)/libsrc
+AM_CPPFLAGS = -I$(top_srcdir)/libsrc
 
 
 # End of file 
diff --git a/templates/friction/Makefile.am b/templates/friction/Makefile.am
index 9392ac7..ff915ce 100644
--- a/templates/friction/Makefile.am
+++ b/templates/friction/Makefile.am
@@ -43,9 +43,7 @@ libfrictioncontrib_la_LIBADD += \
 endif
 
 AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
-
-INCLUDES = 
-INCLUDES += $(PETSC_CC_INCLUDES)
+AM_CPPFLAGS += $(PETSC_CC_INCLUDES)
 
 # MODULE ---------------------------------------------------------------
 
@@ -74,7 +72,7 @@ _frictioncontribmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
+AM_CPPFLAGS += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
 
 $(srcdir)/frictioncontrib_wrap.cxx $(srcdir)/frictioncontrib.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $(SWIG_FLAGS) $<
diff --git a/templates/materials/Makefile.am b/templates/materials/Makefile.am
index b27b60e..745dd2f 100644
--- a/templates/materials/Makefile.am
+++ b/templates/materials/Makefile.am
@@ -43,9 +43,7 @@ libmaterialscontrib_la_LIBADD += \
 endif
 
 AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
-
-INCLUDES = 
-INCLUDES += $(PETSC_CC_INCLUDES)
+AM_CPPFLAGS += $(PETSC_CC_INCLUDES)
 
 # MODULE ---------------------------------------------------------------
 
@@ -74,7 +72,7 @@ _materialscontribmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
+AM_CPPFLAGS += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
 
 $(srcdir)/materialscontrib_wrap.cxx $(srcdir)/materialscontrib.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $(SWIG_FLAGS) $<
diff --git a/tests/topology/Makefile.am b/tests/topology/Makefile.am
index fb08b48..116c0ec 100644
--- a/tests/topology/Makefile.am
+++ b/tests/topology/Makefile.am
@@ -27,9 +27,9 @@ testtopology_SOURCES = \
 	test_topology.cc
 
 
-INCLUDES = -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES) \
 	-I$(PYTHON_INCDIR) $(PYTHON_EGG_CPPFLAGS)
 
diff --git a/unittests/libtests/bc/Makefile.am b/unittests/libtests/bc/Makefile.am
index 5f9007a..d0dfb4f 100644
--- a/unittests/libtests/bc/Makefile.am
+++ b/unittests/libtests/bc/Makefile.am
@@ -130,7 +130,7 @@ noinst_HEADERS += \
 	data/PointForceDataHex8.hh
 
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES)
 
diff --git a/unittests/libtests/faults/Makefile.am b/unittests/libtests/faults/Makefile.am
index 9331cb1..aa17c75 100644
--- a/unittests/libtests/faults/Makefile.am
+++ b/unittests/libtests/faults/Makefile.am
@@ -211,7 +211,7 @@ noinst_HEADERS += \
 	data/CohesiveImpulsesDataTet4.hh \
 	data/CohesiveImpulsesDataHex8.hh
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES)
 
diff --git a/unittests/libtests/feassemble/Makefile.am b/unittests/libtests/feassemble/Makefile.am
index f9f6f2f..c5fd518 100644
--- a/unittests/libtests/feassemble/Makefile.am
+++ b/unittests/libtests/feassemble/Makefile.am
@@ -212,7 +212,7 @@ noinst_HEADERS += \
 	data/QuadratureData3DLinear.hh \
 	data/QuadratureData3DQuadratic.hh
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES)
 
diff --git a/unittests/libtests/friction/Makefile.am b/unittests/libtests/friction/Makefile.am
index 3ac6a91..393d0b2 100644
--- a/unittests/libtests/friction/Makefile.am
+++ b/unittests/libtests/friction/Makefile.am
@@ -66,7 +66,7 @@ noinst_HEADERS += \
 	data/RateStateAgeingData.hh \
 	data/TimeWeakeningData.hh
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES)
 
diff --git a/unittests/libtests/materials/Makefile.am b/unittests/libtests/materials/Makefile.am
index a95b1f1..5137fe8 100644
--- a/unittests/libtests/materials/Makefile.am
+++ b/unittests/libtests/materials/Makefile.am
@@ -117,7 +117,7 @@ noinst_HEADERS += \
 	data/DruckerPragerPlaneStrainTimeDepData.hh \
 	data/header.hh
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES)
 
diff --git a/unittests/libtests/meshio/Makefile.am b/unittests/libtests/meshio/Makefile.am
index b8df1c4..4d0d302 100644
--- a/unittests/libtests/meshio/Makefile.am
+++ b/unittests/libtests/meshio/Makefile.am
@@ -219,7 +219,7 @@ noinst_HEADERS += \
 	data/MeshDataLagritTet.hh
 
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES) \
 	-I$(PYTHON_INCDIR) $(PYTHON_EGG_CPPFLAGS)
 
diff --git a/unittests/libtests/topology/Makefile.am b/unittests/libtests/topology/Makefile.am
index f06cfba..0de9cb5 100644
--- a/unittests/libtests/topology/Makefile.am
+++ b/unittests/libtests/topology/Makefile.am
@@ -82,7 +82,7 @@ noinst_HEADERS += \
 	data/MeshDataCohesiveHex8Level1.hh \
 	data/MeshDataCohesiveHex8Level1Fault1.hh
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
 	$(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES) \
 	-I$(PYTHON_INCDIR) $(PYTHON_EGG_CPPFLAGS)
 
diff --git a/unittests/libtests/utils/Makefile.am b/unittests/libtests/utils/Makefile.am
index 77c89d6..c0c9216 100644
--- a/unittests/libtests/utils/Makefile.am
+++ b/unittests/libtests/utils/Makefile.am
@@ -31,7 +31,7 @@ testutils_SOURCES = \
 noinst_HEADERS = \
 	TestEventLogger.hh
 
-AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES)
+AM_CPPFLAGS += $(PETSC_SIEVE_FLAGS) $(PETSC_CC_INCLUDES)
 
 testutils_LDADD = \
 	-lcppunit -ldl \



More information about the CIG-COMMITS mailing list