[cig-commits] r5957 - in short/3D/PyLith/trunk: libsrc libsrc/feassemble libsrc/meshio modulesrc/feassemble modulesrc/meshio unittests/libtests/feassemble unittests/libtests/meshio

[brad at geodynamics.org]

Author: brad
Date: 2007-02-02 15:38:56 -0800 (Fri, 02 Feb 2007)
New Revision: 5957

Modified:
   short/3D/PyLith/trunk/libsrc/Makefile.am
   short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am
   short/3D/PyLith/trunk/libsrc/meshio/Makefile.am
   short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
   short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
Log:
Updated to use consolidated spatialdata library. Consolidated pylith libraries.

Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am	2007-02-02 23:30:07 UTC (rev 5956)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am	2007-02-02 23:38:56 UTC (rev 5957)
@@ -17,7 +17,26 @@
 
 # materials
 
-# version
-# $Id$
+lib_LTLIBRARIES = libpylith.la
 
+libpylith_la_SOURCES = \
+	feassemble/Integrator.cc \
+	feassemble/IntegratorElasticity3D.cc \
+	feassemble/IntegratorInertia.cc \
+	feassemble/Quadrature.cc \
+	feassemble/Quadrature1D.cc \
+	feassemble/Quadrature1Din2D.cc \
+	feassemble/Quadrature1Din3D.cc \
+	feassemble/Quadrature2D.cc \
+	feassemble/Quadrature2Din3D.cc \
+	feassemble/Quadrature3D.cc \
+	meshio/MeshIO.cc \
+	meshio/MeshIOAscii.cc
+
+
+INCLUDES = -I$(top_builddir)/include
+INCLUDES += $(PETSC_INCLUDE)
+
+AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
+
 # End of file 

Modified: short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am	2007-02-02 23:30:07 UTC (rev 5956)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am	2007-02-02 23:38:56 UTC (rev 5957)
@@ -13,20 +13,6 @@
 subpackage = feassemble
 include $(top_srcdir)/subpackage.am
 
-lib_LTLIBRARIES = libpylithfeassemble.la
-
-libpylithfeassemble_la_SOURCES = \
-	Integrator.cc \
-	IntegratorElasticity3D.cc \
-	IntegratorInertia.cc \
-	Quadrature.cc \
-	Quadrature1D.cc \
-	Quadrature1Din2D.cc \
-	Quadrature1Din3D.cc \
-	Quadrature2D.cc \
-	Quadrature2Din3D.cc \
-	Quadrature3D.cc
-
 subpkginclude_HEADERS = \
 	Integrator.hh \
 	IntegratorElasticity3D.hh \
@@ -50,15 +36,10 @@
 
 noinst_HEADERS =
 
-INCLUDES += $(PETSC_INCLUDE)
-AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
-
 # export
 clean-local: clean-subpkgincludeHEADERS
 BUILT_SOURCES = export-subpkgincludeHEADERS
 CLEANFILES = export-subpkgincludeHEADERS
 
-# version
-# $Id$
 
 # End of file 

Modified: short/3D/PyLith/trunk/libsrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/Makefile.am	2007-02-02 23:30:07 UTC (rev 5956)
+++ short/3D/PyLith/trunk/libsrc/meshio/Makefile.am	2007-02-02 23:38:56 UTC (rev 5957)
@@ -13,12 +13,6 @@
 subpackage = meshio
 include $(top_srcdir)/subpackage.am
 
-lib_LTLIBRARIES = libpylithmeshio.la
-
-libpylithmeshio_la_SOURCES = \
-	MeshIO.cc \
-	MeshIOAscii.cc
-
 subpkginclude_HEADERS = \
 	MeshIO.hh \
 	MeshIO.icc \
@@ -27,15 +21,10 @@
 
 noinst_HEADERS =
 
-INCLUDES += $(PETSC_INCLUDE)
-AM_CPPFLAGS = $(PETSC_SIEVE_FLAGS)
-
 # export
 clean-local: clean-subpkgincludeHEADERS
 BUILT_SOURCES = export-subpkgincludeHEADERS
 CLEANFILES = export-subpkgincludeHEADERS
 
-# version
-# $Id$
 
 # End of file 

Modified: short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-02-02 23:30:07 UTC (rev 5956)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am	2007-02-02 23:38:56 UTC (rev 5957)
@@ -23,7 +23,7 @@
 	feassemble.c feassemble_embed.cpp feassemble_embed.h
 
 feassemblemodule_la_LIBADD = \
-	$(top_builddir)/libsrc/feassemble/libpylithfeassemble.la \
+	$(top_builddir)/libsrc/libpylith.la \
 	$(PETSC_LIB)
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-02-02 23:30:07 UTC (rev 5956)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2007-02-02 23:38:56 UTC (rev 5957)
@@ -23,7 +23,8 @@
 	meshio.c meshio_embed.cpp meshio_embed.h
 
 meshiomodule_la_LIBADD = \
-	$(top_builddir)/libsrc/meshio/libpylithmeshio.la $(PETSC_LIB)
+	$(top_builddir)/libsrc/libpylith.la \
+	$(PETSC_LIB)
 
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 

Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2007-02-02 23:30:07 UTC (rev 5956)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/Makefile.am	2007-02-02 23:38:56 UTC (rev 5957)
@@ -104,6 +104,6 @@
 
 testfeassemble_LDADD = \
 	-lcppunit -ldl \
-	$(top_builddir)/libsrc/feassemble/libpylithfeassemble.la
+	$(top_builddir)/libsrc/libpylith.la
 
 # End of file 

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am	2007-02-02 23:30:07 UTC (rev 5956)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am	2007-02-02 23:38:56 UTC (rev 5957)
@@ -52,7 +52,7 @@
 
 testmeshio_LDADD = \
 	-lcppunit -ldl \
-	$(top_builddir)/libsrc/meshio/libpylithmeshio.la
+	$(top_builddir)/libsrc/libpylith.la
 
 noinst_tmp = \
 	mesh1D.txt \