diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-01-10 01:41:13 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-01-10 01:41:13 (GMT) |
| commit | 987f5d5e4de41c02b682464fa8e94252553ed57c (patch) | |
| tree | 2bf74eb88dee718490af7b7dda0e585b0d1b8a95 /c++/test/Makefile.in | |
| parent | 12dca9ab3c362fc190feb330232bec4bd552df3c (diff) | |
| download | hdf5-987f5d5e4de41c02b682464fa8e94252553ed57c.zip hdf5-987f5d5e4de41c02b682464fa8e94252553ed57c.tar.gz hdf5-987f5d5e4de41c02b682464fa8e94252553ed57c.tar.bz2 | |
[svn-r8048] Purpose:
Code cleanup & reorganization
Description:
Move further in the testing framework cleanup, eliminating all the
global variables (moving them into testframe.c as static variables) from the
testing framework code and moving it into the libh5test.a.
Platforms tested:
FreeBSD 4.9 (sleipnir) w & w/o thread-safety, c++ & parallel
h5committested
Diffstat (limited to 'c++/test/Makefile.in')
| -rw-r--r-- | c++/test/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 094849c..f70b871 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -22,6 +22,7 @@ HDF_CXX="yes" hdf5_srcdir=$(top_srcdir)/src hdf5_builddir=$(top_builddir)/src +hdf5_testdir=$(top_builddir)/test ## Add include directory to the cpp preprocessor flags; note that the ## hdf5/test directory is needed for the use of h5test @@ -30,6 +31,7 @@ CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(top_srcdir)/test -I$(hdf5_builddir) ## Add the C++ API library and the hdf5 library to the library lists LIB=../src/libhdf5_cpp.la LIBHDF5=$(hdf5_builddir)/libhdf5.la +LIBH5TEST=$(hdf5_testdir)/libh5test.la ## These are our main targets. They should be listed in the order to be ## executed, generally most specific tests to least specific tests. @@ -47,12 +49,12 @@ TEST_SCRIPTS= DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o) -$(TEST_PROGS): $(LIB) $(LIBHDF5) +$(TEST_PROGS): $(LIB) $(LIBHDF5) $(LIBH5TEST) testhdf5: $(TEST_OBJ) - @$(LT_LINK_CXX_EXE) $(CXXFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS) + @$(LT_LINK_CXX_EXE) $(CXXFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBH5TEST) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS) dsets: dsets.lo h5cpputil.lo - @$(LT_LINK_CXX_EXE) $(CXXFLAGS) -o $@ dsets.lo h5cpputil.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS) + @$(LT_LINK_CXX_EXE) $(CXXFLAGS) -o $@ dsets.lo h5cpputil.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBH5TEST) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS) @CONCLUDE@ |