summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2003-06-09 15:25:42 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2003-06-09 15:25:42 (GMT)
commit47f9421dd546b7bc1e1616d3beb6e288ac0e637c (patch)
treef8ee6db04b4a31fba9928f8094b3044433b9f787 /fortran/test
parent1be010d74f72687e2f5fd69f75a833bc480eb11e (diff)
downloadhdf5-47f9421dd546b7bc1e1616d3beb6e288ac0e637c.zip
hdf5-47f9421dd546b7bc1e1616d3beb6e288ac0e637c.tar.gz
hdf5-47f9421dd546b7bc1e1616d3beb6e288ac0e637c.tar.bz2
[svn-r6996] Purpose:
bug fix and cleanup Description: Previous change messed things up that fortranlib_test was linked with multiple MAIN because $(TEST_OBJ) was used as if it was for fortranlib_test only. Solution: Created a separated $(FORTLIBTEST_OBJ) for the fortranlib_test test. Adjusted other related symbol names. Also, removed DISTCLEAN=* which held files that should have been removed in MOSTLYCLEAN. Platforms tested: "h5committested" (modi4, sol, verbena). In the process of running fortran tests in arabica and kelgia. Misc. update:
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/Makefile.in18
1 files changed, 10 insertions, 8 deletions
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 159627b..920f06f 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -36,20 +36,22 @@ LIB_OBJ=$(LIB_FSRC:.f90=.lo) $(LIB_CSRC:.c=.lo)
TEST_PROGS_SRC=fortranlib_test.f90 fflush1.f90 fflush2.f90
TEST_PROGS=$(TEST_PROGS_SRC:.f90=)
-TEST_FSRC= tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90\
- tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90
-TEST_CSRC = t.c
-TEST_OBJ=$(TEST_FSRC:.f90=.lo) $(TEST_CSRC:.c=.lo) $(TEST_PROGS_SRC:.f90=.lo)
+# fortranlib_test settting
+FORTLIBTEST_FSRC=fortranlib_test.f90 \
+ tH5F.f90 tH5D.f90 tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90\
+ tH5Sselect.f90 tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90
+FORTLIBTEST_CSRC = t.c
+FORTLIBTEST_OBJ=$(FORTLIBTEST_FSRC:.f90=.lo) $(FORTLIBTEST_CSRC:.c=.lo)
+
+TEST_OBJ=$(FORTLIBTEST_OBJ) $(TEST_PROGS_SRC:.f90=.lo)
## Temporary files
MOSTLYCLEAN=*.h5 *.tmp
-DISTCLEAN=$(TEST_PROGS_SRC:.f90=.lo) $(TEST_PROGS_SRC:.f90=.o)
-
$(TEST_PROGS): $(LIB) $(FLIB)
-fortranlib_test: fortranlib_test.lo $(TEST_OBJ)
- @$(LT_LINK_FEXE) $(FFLAGS) -o $@ fortranlib_test.lo $(TEST_OBJ) $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
+fortranlib_test: $(FORTLIBTEST_OBJ)
+ @$(LT_LINK_FEXE) $(FFLAGS) -o $@ $(FORTLIBTEST_OBJ) $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)
fflush1: fflush1.lo
@$(LT_LINK_FEXE) $(FFLAGS) -o $@ fflush1.lo $(LIB) $(TCLIB) $(FLIB) $(LIBS) $(HDF5LIB)