[cig-commits] r9288 - cs/benchmark/cigma/trunk/src/tests
luis at geodynamics.org
luis at geodynamics.org
Wed Feb 13 01:51:06 PST 2008
Author: luis
Date: 2008-02-13 01:51:06 -0800 (Wed, 13 Feb 2008)
New Revision: 9288
Modified:
cs/benchmark/cigma/trunk/src/tests/Makefile
Log:
Updated Makefile for tests
Modified: cs/benchmark/cigma/trunk/src/tests/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/Makefile 2008-02-13 09:51:05 UTC (rev 9287)
+++ cs/benchmark/cigma/trunk/src/tests/Makefile 2008-02-13 09:51:06 UTC (rev 9288)
@@ -1,4 +1,4 @@
-include ../../build/variables
+include ../../variables
FLAGS = -Wall -Wno-deprecated
FLAGS += -g
FLAGS += -I..
@@ -14,9 +14,9 @@
LDFLAGS += $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
LDFLAGS += $(HDF5_LDFLAGS) $(HDF5_LIBS)
-ANNLIB = ../../lib/libann.a
-H5IOLIB = ../../lib/libh5io.a
-TESTLIB = ../../lib/libcigma_d.a
+ANNLIB = ../libann.a
+H5IOLIB = ../libh5io.a
+CIGMALIB = ../libcigma.a
TESTOBJS = \
TestAnyOption.o \
@@ -44,7 +44,7 @@
$(CXX) $(FLAGS) -c $^
Test%.out: Test%.o
- $(CXX) $(LDFLAGS) $^ $(TESTLIB) $(H5IOLIB) $(ANNLIB) -o $@
+ $(CXX) $(LDFLAGS) $^ $(CIGMALIB) $(H5IOLIB) $(ANNLIB) -o $@
clean:
rm -f $(TESTOBJS)
More information about the cig-commits
mailing list