[cig-commits] r4544 - in short/3D/PyLith/trunk: libsrc/meshio modulesrc/meshio pylith/topology

[knepley at geodynamics.org]

Author: knepley
Date: 2006-09-14 19:27:46 -0700 (Thu, 14 Sep 2006)
New Revision: 4544

Modified:
   short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh
   short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
   short/3D/PyLith/trunk/pylith/topology/MeshImporter.py
Log:
Small fixes for embedding


Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh	2006-09-15 01:55:10 UTC (rev 4543)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh	2006-09-15 02:27:46 UTC (rev 4544)
@@ -15,7 +15,7 @@
 
 #include <iosfwd> // USES std::istream, std::ostream
 #include <string> // HASA std::string
-#include <MeshIO.hh>
+#include "MeshIO.hh"
 
 using ALE::Obj;
 

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2006-09-15 01:55:10 UTC (rev 4543)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2006-09-15 02:27:46 UTC (rev 4544)
@@ -28,7 +28,7 @@
 INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
 meshio.pyx meshio_embed.cpp  meshio_embed.h: meshio.pyxe
-	cp $< . && pyrexembed.py meshio.pyxe && rm -f meshio.pyxe
+	if [ "${VPATH}" != "" ]; then cp $< .; fi && pyrexembed meshio.pyxe && if [ "${VPATH}" != "" ]; then rm -f meshio.pyxe; fi
 meshio_embed.cpp: meshio_embed.h
 meshio_embed.h: meshio.pyx
 

Modified: short/3D/PyLith/trunk/pylith/topology/MeshImporter.py
===================================================================
--- short/3D/PyLith/trunk/pylith/topology/MeshImporter.py	2006-09-15 01:55:10 UTC (rev 4543)
+++ short/3D/PyLith/trunk/pylith/topology/MeshImporter.py	2006-09-15 02:27:46 UTC (rev 4544)
@@ -16,7 +16,7 @@
 from MeshGenerator import MeshGenerator
 
 # MeshImporter class
-class MeshImporter(Component):
+class MeshImporter(MeshGenerator):
   """
   Python implementation of importing a mesh.
   """