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

[luis at geodynamics.org]

Author: luis
Date: 2008-01-25 07:37:30 -0800 (Fri, 25 Jan 2008)
New Revision: 9139

Modified:
   cs/benchmark/cigma/trunk/src/Makefile
   cs/benchmark/cigma/trunk/src/tests/Makefile
Log:
Added Locator classes to makefiles


Modified: cs/benchmark/cigma/trunk/src/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile	2008-01-25 15:37:28 UTC (rev 9138)
+++ cs/benchmark/cigma/trunk/src/Makefile	2008-01-25 15:37:30 UTC (rev 9139)
@@ -16,6 +16,7 @@
 ANNLIB = ../lib/libann.a
 H5IOLIB = ../lib/libh5io.a
 TARGETLIB = ../lib/libcigma.a
+TESTLIB = ../lib/libcigma_d.a
 
 OBJS = \
 	Numeric.o \
@@ -52,6 +53,8 @@
 	CompareCmd.o \
 	CubeCmd.o \
 	Misc.o \
+	Locator.o \
+	AnnLocator.o \
 
 
 default: libann libh5io testlib cigma vtkls tests
@@ -59,8 +62,6 @@
 %.o: %.cpp
 	$(CXX) $(FLAGS) -c $^
 
-TESTLIB = ../lib/libcigma_d.a
-
 testlib: purge $(TESTLIB)
 
 libh5io:
@@ -74,7 +75,7 @@
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@
 
-cigma: cigma.o $(TESTLIB)
+cigma: cigma.o $(TESTLIB) $(H5IOLIB) $(ANNLIB)
 	$(CXX) $(LDFLAGS) $^ -o $@
 
 vtkls: vtkls.o $(TESTLIB)

Modified: cs/benchmark/cigma/trunk/src/tests/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/Makefile	2008-01-25 15:37:28 UTC (rev 9138)
+++ cs/benchmark/cigma/trunk/src/tests/Makefile	2008-01-25 15:37:30 UTC (rev 9139)
@@ -32,6 +32,7 @@
 	TestDofHandler.o \
 	TestFiatProxy.o \
 	TestAnn.o \
+	TestAnnLocator.o \
 
 
 TESTS = $(TESTOBJS:.o=.out)