[cig-commits] r9048 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-01-14 21:28:22 -0800 (Mon, 14 Jan 2008)
New Revision: 9048

Modified:
   cs/benchmark/cigma/trunk/src/Makefile
Log:
Updated makefile

Modified: cs/benchmark/cigma/trunk/src/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile	2008-01-15 05:28:20 UTC (rev 9047)
+++ cs/benchmark/cigma/trunk/src/Makefile	2008-01-15 05:28:22 UTC (rev 9048)
@@ -9,6 +9,8 @@
 
 FLAGS += $(INCLUDES)
 
+LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
+
 TARGETLIB = ../lib/libcigma.a
 
 OBJS = \
@@ -21,14 +23,17 @@
 	FiatProxy.o \
 	MeshPart.o \
 	VtkUgMeshPart.o \
+	CubeMeshPart.o \
 	DofHandler.o \
-	FEValues.o \
+	FE.o \
 	Field.o \
-	FEField.o \
+	FE_Field.o \
 	ExternalField.o \
 	TextReader.o \
+	HdfReader.o \
+	VtkUgReader.o \
+	Writer.o \
 	TextWriter.o \
-	VtkUgReader.o \
 	VtkUgSimpleWriter.o \
 	AnyOption.o \
 	StringUtils.o \
@@ -39,6 +44,7 @@
 	ExtractCmd.o \
 	EvalCmd.o \
 	CompareCmd.o \
+	CubeCmd.o \
 	Misc.o \
 
 
@@ -58,13 +64,13 @@
 
 
 cigma: cigma.o $(TESTLIB)
-	$(CXX) $(FLAGS) $^ -o $@
+	$(CXX) $(LDFLAGS) $^ -o $@
 
 tests: $(TESTLIB)
 	cd tests/ && make
 
 clean:
-	rm -f $(OBJS)
+	rm -f $(OBJS) cigma.o
 
 purge: clean
 	rm -f $(TESTLIB)