summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2001-03-15 19:17:47 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2001-03-15 19:17:47 (GMT)
commitcb7823388b5018fe22498afc324c0a298a1a360f (patch)
treed7107c3f1ce07f9c35abc7e27576bc3a2e43b5a8
parent44047587c1d17823b7947652ab1e3ff1f123d7df (diff)
downloadhdf5-cb7823388b5018fe22498afc324c0a298a1a360f.zip
hdf5-cb7823388b5018fe22498afc324c0a298a1a360f.tar.gz
hdf5-cb7823388b5018fe22498afc324c0a298a1a360f.tar.bz2
[svn-r3645] Purpose:
Bug Fix Description: The test programs weren't compiling correctly. They weren't added to the TEST_OBJ macro, so make didn't know about them. Solution: Added them to the TeST_OBJ macro as in the C tests. Platforms tested: Linux
-rw-r--r--c++/test/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index bc3aa8a..f0bc1bd 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -30,11 +30,12 @@ LIBHDF5=$(hdf5_builddir)/libhdf5.la
## executed, generally most specific tests to least specific tests.
RUNTEST=$(LT_RUN)
-TEST_PROG_SRCS=dsets.cpp testhdf5.cpp
-TEST_SRC=tfile.cpp th5s.cpp
+TEST_SRC=dsets.cpp testhdf5.cpp tfile.cpp th5s.cpp
TEST_OBJ=$(TEST_SRC:.cpp=.lo)
TEST_PROGS=dsets testhdf5
+TESTHDF5_OBJ=testhdf5.lo tfile.lo th5s.lo
+
TEST_SCRIPTS=
DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o) *.h5
@@ -42,7 +43,7 @@ DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o) *.h5
$(TEST_PROGS): $(LIB) $(LIBHDF5)
testhdf5: $(TEST_OBJ)
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ testhdf5.lo $(TEST_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
dsets: dsets.lo
@$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)