[cig-commits] r9074 - in cs/benchmark/cigma/trunk/src: . tests

[luis at geodynamics.org]

Author: luis
Date: 2008-01-16 11:32:27 -0800 (Wed, 16 Jan 2008)
New Revision: 9074

Modified:
   cs/benchmark/cigma/trunk/src/Makefile
   cs/benchmark/cigma/trunk/src/tests/Makefile
Log:
Updates to src/ and src/tests/ makefiles
 * Added h5io dependency
 * Build Tri.o, Quad.o and corresponding tests

Modified: cs/benchmark/cigma/trunk/src/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile	2008-01-16 19:32:25 UTC (rev 9073)
+++ cs/benchmark/cigma/trunk/src/Makefile	2008-01-16 19:32:27 UTC (rev 9074)
@@ -6,16 +6,20 @@
 INCLUDES += $(PYTHON_INCLUDES)
 INCLUDES += $(VTK_INCLUDES)
 INCLUDES += $(HDF5_INCLUDES)
+INCLUDES += -I./h5io
 
 FLAGS += $(INCLUDES)
 
 LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
 
+H5IOLIB = ../lib/libh5io.a
 TARGETLIB = ../lib/libcigma.a
 
 OBJS = \
 	Numeric.o \
 	Cell.o \
+	Tri.o \
+	Quad.o \
 	Tet.o \
 	Hex.o \
 	Points.o \
@@ -49,7 +53,7 @@
 	Misc.o \
 
 
-default: testlib cigma vtkls tests
+default: libh5io testlib cigma vtkls tests
 
 %.o: %.cpp
 	$(CXX) $(FLAGS) -c $^
@@ -58,12 +62,14 @@
 
 testlib: purge $(TESTLIB)
 
+libh5io:
+	cd h5io && make
+
 $(TESTLIB): $(OBJS)
 	rm -f $@
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@
 
-
 cigma: cigma.o $(TESTLIB)
 	$(CXX) $(LDFLAGS) $^ -o $@
 

Modified: cs/benchmark/cigma/trunk/src/tests/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/Makefile	2008-01-16 19:32:25 UTC (rev 9073)
+++ cs/benchmark/cigma/trunk/src/tests/Makefile	2008-01-16 19:32:27 UTC (rev 9074)
@@ -16,6 +16,8 @@
 	TestAnyOption.o \
 	TestStringUtils.o \
 	TestNumeric.o \
+	TestTri.o \
+	TestQuad.o \
 	TestTet.o \
 	TestHex.o \
 	TestPoints.o \