Skip to content

Commit c3fd72c

Browse files
baagaard-usgsbaagaard-usgs
committed
Merge branch 'baagaard/update-autoconf' into maint
* baagaard/update-autoconf: Add checks for Python header file and shared library. Create module.am for stuff common to all Python modules. More cleanup for changes in automake test target. Add local target for verbose test running. Update pytest files for automake 1.13. Remove obsolete mesh generation test files. Updated Makfiles to eliminate warnings.
2 parents 27f8233 + cdf4794 commit c3fd72c

Some content is hidden

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

63 files changed

+135
-307
lines changed

‎check.am‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- Makefile -*-
2+
#
3+
# ----------------------------------------------------------------------
4+
#
5+
# Brad T. Aagaard, U.S. Geological Survey
6+
# Charles A. Williams, GNS Science
7+
# Matthew G. Knepley, University of Chicago
8+
#
9+
# This code was developed as part of the Computational Infrastructure
10+
# for Geodynamics (http://geodynamics.org).
11+
#
12+
# Copyright (c) 2010-2014 University of California, Davis
13+
#
14+
# See COPYING for license information.
15+
#
16+
# ----------------------------------------------------------------------
17+
#
18+
19+
AM_CPPFLAGS = -I$(top_srcdir)/libsrc
20+
21+
22+
check-local: $(TEST_LOGS)
23+
for f in $(TEST_LOGS); do printf "\n=== $$f ===\n\n"; cat $$f; done
24+
25+
26+
# End of file

‎configure.ac‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ AC_INIT([PyLith], [2.0.2], [[email protected]])
2121
AC_CONFIG_AUX_DIR([./aux-config])
2222
AC_CONFIG_HEADER([portinfo])
2323
AC_CONFIG_MACRO_DIR([m4])
24-
AM_INIT_AUTOMAKE([foreign])
24+
AM_INIT_AUTOMAKE([foreign subdir-objects])
2525

2626
# ----------------------------------------------------------------------
2727
# PYTHON
@@ -143,6 +143,8 @@ AC_PROG_INSTALL
143143
CIT_PATH_NEMESIS
144144
AM_PATH_PYTHON([2.4])
145145
CIT_PYTHON_SYSCONFIG
146+
CIT_CHECK_PYTHON_HEADER
147+
CIT_CHECK_PYTHON_SHARED
146148

147149
# MPI
148150
AC_LANG(C++)
@@ -151,6 +153,7 @@ AC_LANG(C++)
151153
#CIT_CHECK_LIB_MPI
152154

153155
# PETSC
156+
AC_LANG(C)
154157
CIT_PATH_PETSC([3.5.0])
155158
CIT_HEADER_PETSC
156159
CIT_CHECK_LIB_PETSC

‎libsrc/pylith/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ libpylith_la_LIBADD += \
157157
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
158158
endif
159159

160-
INCLUDES = -I$(top_srcdir)/libsrc
161-
INCLUDES += $(PETSC_CC_INCLUDES)
160+
AM_CPPFLAGS = -I$(top_srcdir)/libsrc
161+
AM_CPPFLAGS += $(PETSC_CC_INCLUDES)
162162

163-
AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_SIEVE_FLAGS)
163+
AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_SIEVE_FLAGS)
164164

165165
if ENABLE_HDF5
166166
libpylith_la_SOURCES += \

‎modulesrc/bc/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
subpackage = bc
2020
include $(top_srcdir)/subpackage.am
21+
include $(top_srcdir)/modulesrc/module.am
2122

2223
subpkgpyexec_LTLIBRARIES = _bcmodule.la
2324

@@ -60,8 +61,6 @@ _bcmodule_la_LIBADD += \
6061
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
6162
endif
6263

63-
INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
64-
6564
if ENABLE_SWIG
6665
$(srcdir)/bc_wrap.cxx $(srcdir)/bc.py: $(swig_sources)
6766
$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<

‎modulesrc/faults/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
subpackage = faults
2020
include $(top_srcdir)/subpackage.am
21+
include $(top_srcdir)/modulesrc/module.am
2122

2223
subpkgpyexec_LTLIBRARIES = _faultsmodule.la
2324

@@ -65,8 +66,6 @@ _faultsmodule_la_LIBADD += \
6566
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
6667
endif
6768

68-
INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
69-
7069
if ENABLE_SWIG
7170
$(srcdir)/faults_wrap.cxx $(srcdir)/faults.py: $(swig_sources)
7271
$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<

‎modulesrc/feassemble/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
subpackage = feassemble
2020
include $(top_srcdir)/subpackage.am
21+
include $(top_srcdir)/modulesrc/module.am
2122

2223
subpkgpyexec_LTLIBRARIES = _feassemblemodule.la
2324

@@ -68,8 +69,6 @@ _feassemblemodule_la_LIBADD += \
6869
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
6970
endif
7071

71-
INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
72-
7372
if ENABLE_SWIG
7473
$(srcdir)/feassemble_wrap.cxx $(srcdir)/feassemble.py: $(swig_sources)
7574
$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<

‎modulesrc/friction/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
subpackage = friction
2020
include $(top_srcdir)/subpackage.am
21+
include $(top_srcdir)/modulesrc/module.am
2122

2223
subpkgpyexec_LTLIBRARIES = _frictionmodule.la
2324

@@ -57,8 +58,6 @@ _frictionmodule_la_LIBADD += \
5758
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
5859
endif
5960

60-
INCLUDES += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
61-
6261
if ENABLE_SWIG
6362
$(srcdir)/friction_wrap.cxx $(srcdir)/friction.py: $(swig_sources)
6463
$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<

‎modulesrc/materials/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
subpackage = materials
2020
include $(top_srcdir)/subpackage.am
21+
include $(top_srcdir)/modulesrc/module.am
2122

2223
subpkgpyexec_LTLIBRARIES = _materialsmodule.la
2324

@@ -66,8 +67,6 @@ _materialsmodule_la_LIBADD += \
6667
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
6768
endif
6869

69-
INCLUDES += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
70-
7170
if ENABLE_SWIG
7271
$(srcdir)/materials_wrap.cxx $(srcdir)/materials.py: $(swig_sources)
7372
$(SWIG) $(PETSC_CC_INCLUDES) -Wall -c++ -python $<

‎modulesrc/meshio/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
subpackage = meshio
2020
include $(top_srcdir)/subpackage.am
21+
include $(top_srcdir)/modulesrc/module.am
2122

2223
subpkgpyexec_LTLIBRARIES = _meshiomodule.la
2324

@@ -60,8 +61,6 @@ _meshiomodule_la_LIBADD += \
6061
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
6162
endif
6263

63-
INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_CC_INCLUDES)
64-
6564
if ENABLE_SWIG
6665
$(srcdir)/meshio_wrap.cxx $(srcdir)/meshio.py: $(swig_sources)
6766
$(SWIG) $(PETSC_CC_INCLUDES) $(PYLITH_SWIG_CPPFLAGS) -Wall -c++ -python $<

‎modulesrc/module.am‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- Makefile -*-
2+
#
3+
# ----------------------------------------------------------------------
4+
#
5+
# Brad T. Aagaard, U.S. Geological Survey
6+
# Charles A. Williams, GNS Science
7+
# Matthew G. Knepley, University of Chicago
8+
#
9+
# This code was developed as part of the Computational Infrastructure
10+
# for Geodynamics (http://geodynamics.org).
11+
#
12+
# Copyright (c) 2010-2014 University of California, Davis
13+
#
14+
# See COPYING for license information.
15+
#
16+
# ----------------------------------------------------------------------
17+
#
18+
19+
AM_CPPFLAGS = \
20+
$(PYTHON_EGG_CPPFLAGS) \
21+
-I$(top_srcdir)/libsrc \
22+
-I$(NUMPY_INCDIR) \
23+
-I$(PYTHON_INCDIR) \
24+
$(PETSC_CC_INCLUDES)
25+
26+
# End of file

0 commit comments

Comments
 (0)