[cig-commits] r7314 - 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
Tue Jun 19 19:33:39 PDT 2007 

Author: leif
Date: 2007-06-19 19:33:38 -0700 (Tue, 19 Jun 2007)
New Revision: 7314

Modified:
   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:
Tweaked libtool LDFLAGS so that DLLs are built on Windows.  The trick
is to add "-no-undefined" -- see issue37.

PYTHON_LA_LDFLAGS prevents Mac OS X from breaking.  See r7309.


Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -85,6 +85,8 @@
 	meshio/MeshIOCubit.cc
 endif
 
+libpylith_la_LDFLAGS = -no-undefined
+
 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-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/bc/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = bcmodule.la
 
-bcmodule_la_LDFLAGS = -module
+bcmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 bcmodule_la_SOURCES = bc.pyxe
 
@@ -24,7 +25,8 @@
 
 bcmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   bcmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/faults/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = faultsmodule.la
 
-faultsmodule_la_LDFLAGS = -module
+faultsmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 faultsmodule_la_SOURCES = faults.pyxe
 
@@ -24,7 +25,8 @@
 
 faultsmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   faultsmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = feassemblemodule.la
 
-feassemblemodule_la_LDFLAGS = -module
+feassemblemodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 feassemblemodule_la_SOURCES = feassemble.pyxe
 
@@ -24,7 +25,8 @@
 
 feassemblemodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   feassemblemodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/modulesrc/materials/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/materials/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = materialsmodule.la
 
-materialsmodule_la_LDFLAGS = -module
+materialsmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 materialsmodule_la_SOURCES = materials.pyxe
 
@@ -24,7 +25,8 @@
 
 materialsmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   materialsmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = meshiomodule.la
 
-meshiomodule_la_LDFLAGS = -module
+meshiomodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 meshiomodule_la_SOURCES = meshio.pyxe
 
@@ -24,7 +25,8 @@
 
 meshiomodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   meshiomodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/modulesrc/solver/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/solver/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/solver/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = solvermodule.la
 
-solvermodule_la_LDFLAGS = -module
+solvermodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 solvermodule_la_SOURCES = solver.pyxe
 
@@ -24,7 +25,8 @@
 
 solvermodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   solvermodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/topology/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = topologymodule.la
 
-topologymodule_la_LDFLAGS = -module
+topologymodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 topologymodule_la_SOURCES = topology.pyxe
 
@@ -24,7 +25,8 @@
 
 topologymodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   topologymodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/modulesrc/utils/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/modulesrc/utils/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -15,7 +15,8 @@
 
 subpkgpyexec_LTLIBRARIES = petscmodule.la
 
-petscmodule_la_LDFLAGS = -module
+petscmodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 petscmodule_la_SOURCES = petsc.pyxe
 
@@ -24,7 +25,8 @@
 
 petscmodule_la_LIBADD = \
 	$(top_builddir)/libsrc/libpylith.la \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 if ENABLE_CUBIT
   petscmodule_la_LIBADD += -lnetcdf_c++ -lnetcdf

Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am	2007-06-20 02:26:56 UTC (rev 7313)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am	2007-06-20 02:33:38 UTC (rev 7314)
@@ -29,7 +29,8 @@
 # module
 subpkgpyexec_LTLIBRARIES = testfeassemblemodule.la
 
-testfeassemblemodule_la_LDFLAGS = -module
+testfeassemblemodule_la_LDFLAGS = -module -no-undefined -avoid-version \
+	$(PYTHON_LA_LDFLAGS)
 
 testfeassemblemodule_la_SOURCES = testfeassemble.pyxe
 
@@ -37,7 +38,8 @@
 	testfeassemble.c testfeassemble_embed.cpp testfeassemble_embed.h
 
 testfeassemblemodule_la_LIBADD = \
-	$(PETSC_LIB)
+	$(PETSC_LIB) \
+	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)

More information about the cig-commits mailing list