[cig-commits] r7558 - 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
Thu Jun 28 18:21:14 PDT 2007 

Author: leif
Date: 2007-06-28 18:21:14 -0700 (Thu, 28 Jun 2007)
New Revision: 7558

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:
Another attempt at fixing issue119: conditionally add Python libs to
to the link line.


Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/configure.ac	2007-06-29 01:21:14 UTC (rev 7558)
@@ -73,6 +73,7 @@
     # See issue119.
     AM_LDFLAGS="-no-undefined $AM_LDFLAGS"
 fi
+AM_CONDITIONAL([NO_UNDEFINED], [test "$allow_undefined_flag" = unsupported])
 AC_SUBST(AM_LDFLAGS)
 
 AC_PROG_INSTALL

Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -83,8 +83,11 @@
 libpylith_la_LDFLAGS = $(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 libpylith_la_LIBADD = \
 	-lspatialdata \
-	$(PETSC_LIB) \
+	$(PETSC_LIB)
+if NO_UNDEFINED
+libpylith_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES = -I$(top_builddir)/include
 INCLUDES += $(PETSC_INCLUDE)

Modified: short/3D/PyLith/trunk/modulesrc/bc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/bc/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/bc/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -26,12 +26,14 @@
 bcmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
 	-lspatialdata \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   bcmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  bcmodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -26,12 +26,14 @@
 faultsmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
 	-lspatialdata \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   faultsmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  faultsmodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -26,12 +26,14 @@
 feassemblemodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
 	-lspatialdata \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   feassemblemodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  feassemblemodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/modulesrc/materials/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -26,12 +26,14 @@
 materialsmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
 	-lspatialdata \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   materialsmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  materialsmodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -26,12 +26,14 @@
 meshiomodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
 	-lspatialdata \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   meshiomodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  meshiomodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/modulesrc/solver/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/solver/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/solver/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -26,12 +26,14 @@
 solvermodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
 	-lspatialdata \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   solvermodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  solvermodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -26,12 +26,14 @@
 topologymodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
 	-lspatialdata \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   topologymodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  topologymodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/modulesrc/utils/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -25,12 +25,14 @@
 
 petscmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB) \
-	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+	$(PETSC_LIB)
 
 if ENABLE_CUBIT
   petscmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf
 endif
+if NO_UNDEFINED
+  petscmodule_la_LIBADD += $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am	2007-06-29 01:21:10 UTC (rev 7557)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am	2007-06-29 01:21:14 UTC (rev 7558)
@@ -38,8 +38,11 @@
 	testfeassemble.c testfeassemble_embed.cpp testfeassemble_embed.h
 
 testfeassemblemodule_la_LIBADD = \
-	$(PETSC_LIB) \
+	$(PETSC_LIB)
+if NO_UNDEFINED
+testfeassemblemodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
+endif
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)

More information about the cig-commits mailing list