diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2000-12-04 20:25:14 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2000-12-04 20:25:14 (GMT) |
| commit | e552b96ce3289133b462c1cb2be92ca667b2fb12 (patch) | |
| tree | e97cd2a632c4716455cbca4cd56725df9063129f | |
| parent | ca459c1d43f8fc6837f31dec774b7947c49a318a (diff) | |
| download | hdf5-e552b96ce3289133b462c1cb2be92ca667b2fb12.zip hdf5-e552b96ce3289133b462c1cb2be92ca667b2fb12.tar.gz hdf5-e552b96ce3289133b462c1cb2be92ca667b2fb12.tar.bz2 | |
[svn-r3074] Purpose:
Improvement
Description:
Made the Makefiles better.
Solution:
Added standard macros concerning where things are place. Like
libraries and so forth.
Platforms tested:
Linux
| -rw-r--r-- | c++/examples/Makefile.in | 5 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 2 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index a11dc08..ac6233d 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -1,4 +1,4 @@ -## HDF5-C++ test/Makefile(.in) +## HDF5-C++ examples/Makefile(.in) ## ## Copyright (C) 2000 National Center for Supercomputing Applications. ## All rights reserved. @@ -9,12 +9,13 @@ top_builddir=../.. srcdir=@srcdir@ @COMMENCE@ +hdf5_srcdir=$(top_srcdir)/src hdf5_builddir=$(top_builddir)/src ## Add include directory to the C++ preprocessor flags and the hdf5 ## library to the library list. LIB=../src/libhdf5_cpp.la -CPPFLAGS=-I. -I$(srcdir) -I../src -I../../src -I$(top_srcdir)/src -I$(srcdir)/../src @CPPFLAGS@ +CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@ LIBHDF5=$(hdf5_builddir)/libhdf5.la ## List all source files here. The list of object files will be diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index d978f21..05453ad 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -31,4 +31,6 @@ LIB_OBJ=$(LIB_SRC:.C=.lo) PUB_HDR=H5Cpp.h +ARFLAGS=rs + @CONCLUDE@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index f1c4d80..230f24d 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -9,21 +9,28 @@ top_builddir=../.. srcdir=@srcdir@ @COMMENCE@ +hdf5_srcdir=$(top_srcdir)/src hdf5_builddir=$(top_builddir)/src ## Add include directory to the C preprocessor flags and the h5test and hdf5 ## libraries to the library list. LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir) LIB=../src/libhdf5_cpp.la -CPPFLAGS=-I. -I$(srcdir) -I../src -I../../src -I$(top_srcdir)/src -I$(srcdir)/../src @CPPFLAGS@ +CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@ HDF5LIB=$(hdf5_builddir)/libhdf5.la +## These are our main targets. They should be listed in the order to be +## executed, generally most specific tests to least specific tests. +RUNTEST=$(LT_RUN) + TEST_PROGS_SRC= TEST_PROGS= TEST_SRC= TEST_OBJ=$(TEST_SRC:.C=.lo) +TEST_SCRIPTS=testexamples.sh + DISTCLEAN=$(TEST_PROGS_SRC:.C=.lo) $(TEST_PROGS_SRC:.C=.o) *.h5 $(TEST_PROGS): $(LIB) |