[cig-commits] r15430 - in short/3D/PyLith/trunk: . modulesrc/bc modulesrc/faults modulesrc/feassemble modulesrc/materials modulesrc/meshio modulesrc/mpi modulesrc/problems modulesrc/topology modulesrc/utils

brad at geodynamics.org brad at geodynamics.org
Mon Jul 6 10:08:57 PDT 2009 

Author: brad
Date: 2009-07-06 10:08:57 -0700 (Mon, 06 Jul 2009)
New Revision: 15430

Modified:
   short/3D/PyLith/trunk/configure.ac
   short/3D/PyLith/trunk/modulesrc/bc/Makefile.am
   short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
   short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
   short/3D/PyLith/trunk/modulesrc/materials/Makefile.am
   short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
   short/3D/PyLith/trunk/modulesrc/mpi/Makefile.am
   short/3D/PyLith/trunk/modulesrc/problems/Makefile.am
   short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
   short/3D/PyLith/trunk/modulesrc/utils/Makefile.am
Log:
Use --enable-swig to conditionally use SWIG (source distribution contains SWIG generated files; SWIG is only needed when using the repository).

Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/configure.ac	2009-07-06 17:08:57 UTC (rev 15430)
@@ -28,6 +28,14 @@
     [want_embedding=no])
 AM_CONDITIONAL([COND_EMBEDDING], [test "$want_embedding" = yes])
 
+# SWIG
+AC_ARG_ENABLE([swig],
+    [AC_HELP_STRING([--enable-swig],
+        [enable generating modules with SWIG) @<:@default=no@:>@])],
+	[enable_swig=yes],
+	[enable_swig=no])
+AM_CONDITIONAL([ENABLE_SWIG], [test "$enable_swig" = yes])
+
 # TESTING w/cppunit
 AC_ARG_ENABLE([testing],
     [AC_HELP_STRING([--enable-testing],
@@ -114,7 +122,9 @@
 CIT_NUMPY_INCDIR
 
 # SWIG
-AC_PROG_SWIG(1.3.33)
+if test "$enable_swig" = "yes" ; then
+  AC_PROG_SWIG(1.3.33)
+fi
 
 # CPPUNIT
 if test "$enable_testing" = "yes" ; then

Modified: short/3D/PyLith/trunk/modulesrc/bc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/bc/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/bc/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -56,8 +56,10 @@
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/bc_wrap.cxx $(srcdir)/bc.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -56,8 +56,10 @@
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/faults_wrap.cxx $(srcdir)/faults.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -62,8 +62,10 @@
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/feassemble_wrap.cxx $(srcdir)/feassemble.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/materials/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -58,8 +58,10 @@
 
 INCLUDES += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/materials_wrap.cxx $(srcdir)/materials.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -55,8 +55,10 @@
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/meshio_wrap.cxx $(srcdir)/meshio.py: $(swig_sources)
 	$(SWIG) $(PYLITH_SWIG_CPPFLAGS) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/mpi/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/mpi/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/mpi/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -41,8 +41,10 @@
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/mpi_wrap.cxx $(srcdir)/mpi.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/problems/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/problems/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/problems/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -48,8 +48,10 @@
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/problems_wrap.cxx $(srcdir)/problems.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -49,8 +49,10 @@
 
 INCLUDES += -g $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/topology_wrap.cxx $(srcdir)/topology.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: short/3D/PyLith/trunk/modulesrc/utils/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2009-07-06 02:30:18 UTC (rev 15429)
+++ short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
@@ -77,11 +77,13 @@
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
+if ENABLE_SWIG
 $(srcdir)/petsc_wrap.cxx $(srcdir)/petsc.py: $(petsc_swig_sources)
 	$(SWIG) -Wall -c++ -python $<
 
 $(srcdir)/utils_wrap.cxx $(srcdir)/utils.py: $(utils_swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

More information about the CIG-COMMITS mailing list