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

[luis at geodynamics.org]

Author: luis
Date: 2007-12-19 12:01:58 -0800 (Wed, 19 Dec 2007)
New Revision: 8913

Modified:
   cs/benchmark/cigma/trunk/src/Makefile
   cs/benchmark/cigma/trunk/src/tests/Makefile
Log:
Changed makefiles to rebuild libcigma_d.a by default

Modified: cs/benchmark/cigma/trunk/src/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile	2007-12-19 20:01:46 UTC (rev 8912)
+++ cs/benchmark/cigma/trunk/src/Makefile	2007-12-19 20:01:58 UTC (rev 8913)
@@ -25,16 +25,16 @@
 	Command.o \
 
 
-default: $(OBJS)
+default: testlib
 
 %.o: %.cpp
 	$(CXX) $(FLAGS) -c $^
 
 
 
-TESTLIB = ./tests/libcigma_d.a
+TESTLIB = ../lib/libcigma_d.a
 
-testlib: $(TESTLIB)
+testlib: clean $(TESTLIB)
 
 $(TESTLIB): $(OBJS)
 	rm -f $@

Modified: cs/benchmark/cigma/trunk/src/tests/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/Makefile	2007-12-19 20:01:46 UTC (rev 8912)
+++ cs/benchmark/cigma/trunk/src/tests/Makefile	2007-12-19 20:01:58 UTC (rev 8913)
@@ -1,28 +1,22 @@
 include ../../build/variables
 FLAGS = -Wall -Wno-deprecated
 FLAGS += -g
-#FLAGS += -I..
+FLAGS += -I..
 FLAGS += $(VTK_INCLUDES)
 FLAGS += $(PYTHON_INCLUDES)
-LDFLAGS += -L.
+LDFLAGS += -L..
 LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
 LDFLAGS += $(PYTHON_LIBS)
 
-TESTLIB = libcigma_d.a
+TESTLIB = ../../lib/libcigma_d.a
 
 TESTOBJS = \
-	TestFiatProxy.o \
-	TestDofHandler.o \
-	TestMeshPart.o \
-	TestVtkReader1.o \
-	TestVtkReader2.o \
-	TestVtkMeshPart1.o \
+	TestVtkUgReader.o \
 
 
-
 TESTS = $(TESTOBJS:.o=)
 
-all: $(TESTS)
+default: clean $(TESTOBJS) $(TESTS)
 
 Test%.o: Test%.cpp
 	$(CXX) $(FLAGS) -c $^