[cig-commits] r9070 - in cs/benchmark/cigma/trunk/src/h5io: . t

[luis at geodynamics.org]

Author: luis
Date: 2008-01-16 11:32:20 -0800 (Wed, 16 Jan 2008)
New Revision: 9070

Modified:
   cs/benchmark/cigma/trunk/src/h5io/Makefile
   cs/benchmark/cigma/trunk/src/h5io/t/Makefile
Log:
Fixes to h5io makefiles

Modified: cs/benchmark/cigma/trunk/src/h5io/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/h5io/Makefile	2008-01-16 19:32:18 UTC (rev 9069)
+++ cs/benchmark/cigma/trunk/src/h5io/Makefile	2008-01-16 19:32:20 UTC (rev 9070)
@@ -2,7 +2,8 @@
 
 LIB = ../../lib/libh5io.a
 
-CFLAGS = $(OPTIM) $(FLAGS) $(HDF5_INCLUDES)
+INCLUDES += $(HDF5_INCLUDES)
+CFLAGS = $(OPTIM) $(FLAGS) $(INCLUDES)
 
 SRC = \
 	h5array.c \

Modified: cs/benchmark/cigma/trunk/src/h5io/t/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/h5io/t/Makefile	2008-01-16 19:32:18 UTC (rev 9069)
+++ cs/benchmark/cigma/trunk/src/h5io/t/Makefile	2008-01-16 19:32:20 UTC (rev 9070)
@@ -1,11 +1,18 @@
-include ../../variables
+include ../../../build/variables
 
-LFLAGS = -L../../lib
-LIBS = $(CIGMA_LIBS) -lh5io
+H5IO_LIB = ../../../lib/libh5io.a
 
+INCLUDES += $(HDF5_INCLUDES)
+LIBS += $(CIGMA_LIBS)
+LIBS += -lh5io
+LIBS += -lhdf5
+LDFLAGS += -L../../../lib
+LDFLAGS += $(HDF5_LDFLAGS)
+
 OPTIM += -fno-strict-aliasing
+FLAGS += $(INCLUDES)
 
-CFLAGS = $(OPTIM) $(FLAGS) $(LFLAGS)
+CFLAGS = $(OPTIM) $(FLAGS) $(LDFLAGS)
 
 TESTS = \
 	test_h5file \
@@ -14,7 +21,7 @@
 
 tests: $(TESTS)
 
-test_%: test_%.c
+test_%: test_%.c $(H5IO_LIB)
 	$(CC) $(CFLAGS) $< -o $@ $(LIBS)
 
 clean: