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

[luis at geodynamics.org]

Author: luis
Date: 2007-12-19 12:08:11 -0800 (Wed, 19 Dec 2007)
New Revision: 8958

Modified:
   cs/benchmark/cigma/trunk/src/Makefile
   cs/benchmark/cigma/trunk/src/h5io/Makefile
   cs/benchmark/cigma/trunk/src/tests/Makefile
Log:
Updating makefiles

Modified: cs/benchmark/cigma/trunk/src/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile	2007-12-19 20:08:05 UTC (rev 8957)
+++ cs/benchmark/cigma/trunk/src/Makefile	2007-12-19 20:08:11 UTC (rev 8958)
@@ -5,6 +5,7 @@
 
 INCLUDES += $(PYTHON_INCLUDES)
 INCLUDES += $(VTK_INCLUDES)
+INCLUDES += $(HDF5_INCLUDES)
 
 FLAGS += $(INCLUDES)
 
@@ -15,26 +16,40 @@
 	Cell.o \
 	Tet.o \
 	Hex.o \
+	Points.o \
+	Quadrature.o \
+	FiatProxy.o \
+	MeshPart.o \
+	VtkUgMeshPart.o \
+	DofHandler.o \
+	FEValues.o \
 	Field.o \
-	DofHandler.o \
-	FiatProxy.o \
+	FEField.o \
+	ExternalField.o \
 	TextReader.o \
 	TextWriter.o \
 	VtkUgReader.o \
 	VtkUgSimpleWriter.o \
+	AnyOption.o \
+	StringUtils.o \
 	Command.o \
+	CommandSet.o \
+	SkelCmd.o \
+	HelpCmd.o \
+	ExtractCmd.o \
+	EvalCmd.o \
+	CompareCmd.o \
+	Misc.o \
 
 
-default: testlib
+default: testlib cigma tests
 
 %.o: %.cpp
 	$(CXX) $(FLAGS) -c $^
 
-
-
 TESTLIB = ../lib/libcigma_d.a
 
-testlib: clean $(TESTLIB)
+testlib: purge $(TESTLIB)
 
 $(TESTLIB): $(OBJS)
 	rm -f $@
@@ -42,10 +57,16 @@
 	$(RANLIB) $@
 
 
+cigma: cigma.o $(TESTLIB)
+	$(CXX) $(FLAGS) $^ -o $@
+
+tests: $(TESTLIB)
+	cd tests/ && make
+
 clean:
 	rm -f $(OBJS)
 
 purge: clean
-	rm -f $(TARGETLIB)
+	rm -f $(TESTLIB)
 
 .PHONY: clean purge

Modified: cs/benchmark/cigma/trunk/src/h5io/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/h5io/Makefile	2007-12-19 20:08:05 UTC (rev 8957)
+++ cs/benchmark/cigma/trunk/src/h5io/Makefile	2007-12-19 20:08:11 UTC (rev 8958)
@@ -2,7 +2,7 @@
 
 LIB = ../../lib/libh5io.a
 
-CFLAGS = $(OPTIM) $(FLAGS)
+CFLAGS = $(OPTIM) $(FLAGS) $(HDF5_INCLUDES)
 
 SRC = \
 	h5array.c \

Modified: cs/benchmark/cigma/trunk/src/tests/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/Makefile	2007-12-19 20:08:05 UTC (rev 8957)
+++ cs/benchmark/cigma/trunk/src/tests/Makefile	2007-12-19 20:08:11 UTC (rev 8958)
@@ -4,14 +4,24 @@
 FLAGS += -I..
 FLAGS += $(VTK_INCLUDES)
 FLAGS += $(PYTHON_INCLUDES)
+FLAGS += $(HDF5_INCLUDES)
 LDFLAGS += -L..
 LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
-LDFLAGS += $(PYTHON_LIBS)
+LDFLAGS += $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
+LDFLAGS += $(HDF5_LDFLAGS) $(HDF5_LIBS)
 
 TESTLIB = ../../lib/libcigma_d.a
 
 TESTOBJS = \
-	TestVtkUgReader.o \
+	TestAnyOption.o \
+	TestStringUtils.o \
+	TestTet.o \
+	TestHex.o \
+	TestPoints.o \
+	TestQuadrature.o \
+	TestMeshPart.o \
+	TestDofHandler.o \
+	TestFiatProxy.o \
 
 
 TESTS = $(TESTOBJS:.o=)
@@ -32,3 +42,4 @@
 	rm -f $(TESTS)
 
 .PHONY: clean
+