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

[luis at geodynamics.org]

Author: luis
Date: 2008-01-23 18:10:28 -0800 (Wed, 23 Jan 2008)
New Revision: 9123

Modified:
   cs/benchmark/cigma/trunk/src/Makefile
   cs/benchmark/cigma/trunk/src/tests/Makefile
Log:
Added h5io and ann libraries to makefiles

Modified: cs/benchmark/cigma/trunk/src/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile	2008-01-24 02:10:25 UTC (rev 9122)
+++ cs/benchmark/cigma/trunk/src/Makefile	2008-01-24 02:10:28 UTC (rev 9123)
@@ -7,11 +7,13 @@
 INCLUDES += $(VTK_INCLUDES)
 INCLUDES += $(HDF5_INCLUDES)
 INCLUDES += -I./h5io
+INCLUDES += -I./ann/include
 
 FLAGS += $(INCLUDES)
 
 LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
 
+ANNLIB = ../lib/libann.a
 H5IOLIB = ../lib/libh5io.a
 TARGETLIB = ../lib/libcigma.a
 
@@ -52,7 +54,7 @@
 	Misc.o \
 
 
-default: libh5io testlib cigma vtkls tests
+default: libann libh5io testlib cigma vtkls tests
 
 %.o: %.cpp
 	$(CXX) $(FLAGS) -c $^
@@ -64,6 +66,9 @@
 libh5io:
 	cd h5io && make
 
+libann:
+	cd ann && make
+
 $(TESTLIB): $(OBJS)
 	rm -f $@
 	$(AR) $@ $(OBJS)

Modified: cs/benchmark/cigma/trunk/src/tests/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/Makefile	2008-01-24 02:10:25 UTC (rev 9122)
+++ cs/benchmark/cigma/trunk/src/tests/Makefile	2008-01-24 02:10:28 UTC (rev 9123)
@@ -2,14 +2,20 @@
 FLAGS = -Wall -Wno-deprecated
 FLAGS += -g
 FLAGS += -I..
+FLAGS += -I../h5io
+FLAGS += -I../ann/include
 FLAGS += $(VTK_INCLUDES)
 FLAGS += $(PYTHON_INCLUDES)
 FLAGS += $(HDF5_INCLUDES)
+
+
 LDFLAGS += -L..
 LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
 LDFLAGS += $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
 LDFLAGS += $(HDF5_LDFLAGS) $(HDF5_LIBS)
 
+ANNLIB = ../../lib/libann.a
+H5IOLIB = ../../lib/libh5io.a
 TESTLIB = ../../lib/libcigma_d.a
 
 TESTOBJS = \
@@ -25,6 +31,7 @@
 	TestMeshPart.o \
 	TestDofHandler.o \
 	TestFiatProxy.o \
+	TestAnn.o \
 
 
 TESTS = $(TESTOBJS:.o=.out)
@@ -35,7 +42,7 @@
 	$(CXX) $(FLAGS) -c $^
 
 Test%.out: Test%.o
-	$(CXX) $(LDFLAGS) $^ $(TESTLIB) -o $@
+	$(CXX) $(LDFLAGS) $^ $(TESTLIB) $(H5IOLIB) $(ANNLIB) -o $@
 
 clean:
 	rm -f $(TESTOBJS)