[cig-commits] r7391 - in short/3D/PyLith/trunk: . libsrc modulesrc/bc modulesrc/faults modulesrc/feassemble modulesrc/materials modulesrc/meshio modulesrc/solver modulesrc/topology modulesrc/utils unittests/pytests/feassemble

leif at geodynamics.org leif at geodynamics.org
Fri Jun 22 13:34:33 PDT 2007


Author: leif
Date: 2007-06-22 13:34:32 -0700 (Fri, 22 Jun 2007)
New Revision: 7391

Modified:
   short/3D/PyLith/trunk/configure.ac
   short/3D/PyLith/trunk/libsrc/Makefile.am
   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/solver/Makefile.am
   short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
   short/3D/PyLith/trunk/modulesrc/utils/Makefile.am
   short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
Log:
Add "-no-undefined" only on Windows.  See issue119.


Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/configure.ac	2007-06-22 20:34:32 UTC (rev 7391)
@@ -67,7 +67,14 @@
 AC_PROG_CXX
 AC_PROG_CC
 AC_DISABLE_STATIC
+
 AC_PROG_LIBTOOL
+if test "$allow_undefined_flag" = unsupported; then
+    # See issue119.
+    AM_LDFLAGS="-no-undefined $AM_LDFLAGS"
+fi
+AC_SUBST(AM_LDFLAGS)
+
 AC_PROG_INSTALL
 
 # PYTHON

Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -80,7 +80,7 @@
 	meshio/SolutionIOVTK.cc \
 	topology/FieldsManager.cc
 
-libpylith_la_LDFLAGS = -no-undefined $(PYTHON_LA_LDFLAGS)
+libpylith_la_LDFLAGS = $(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 libpylith_la_LIBADD = \
 	-lspatialdata \
 	$(PETSC_LIB) \

Modified: short/3D/PyLith/trunk/modulesrc/bc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/bc/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/bc/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = bcmodule.la
 
-bcmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+bcmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 bcmodule_la_SOURCES = bc.pyxe
 

Modified: short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = faultsmodule.la
 
-faultsmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+faultsmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 faultsmodule_la_SOURCES = faults.pyxe
 

Modified: short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = feassemblemodule.la
 
-feassemblemodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+feassemblemodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 feassemblemodule_la_SOURCES = feassemble.pyxe
 

Modified: short/3D/PyLith/trunk/modulesrc/materials/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = materialsmodule.la
 
-materialsmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+materialsmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 materialsmodule_la_SOURCES = materials.pyxe
 

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = meshiomodule.la
 
-meshiomodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+meshiomodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 meshiomodule_la_SOURCES = meshio.pyxe
 

Modified: short/3D/PyLith/trunk/modulesrc/solver/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/solver/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/solver/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = solvermodule.la
 
-solvermodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+solvermodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 solvermodule_la_SOURCES = solver.pyxe
 

Modified: short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = topologymodule.la
 
-topologymodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+topologymodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 topologymodule_la_SOURCES = topology.pyxe
 

Modified: short/3D/PyLith/trunk/modulesrc/utils/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -15,8 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = petscmodule.la
 
-petscmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+petscmodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 petscmodule_la_SOURCES = petsc.pyxe
 

Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am	2007-06-22 20:28:34 UTC (rev 7390)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am	2007-06-22 20:34:32 UTC (rev 7391)
@@ -29,8 +29,8 @@
 # module
 subpkgpyexec_LTLIBRARIES = testfeassemblemodule.la
 
-testfeassemblemodule_la_LDFLAGS = -module -no-undefined -avoid-version \
-	$(PYTHON_LA_LDFLAGS)
+testfeassemblemodule_la_LDFLAGS = -module -avoid-version \
+	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 testfeassemblemodule_la_SOURCES = testfeassemble.pyxe
 



More information about the cig-commits mailing list