summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2000-11-15 16:06:32 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2000-11-15 16:06:32 (GMT)
commit80429f7f45c9ff631d2c1524ae9efb649bf8ebe1 (patch)
treeae2315b312a6c802a5e0103875c67ab18aa5c712
parent8dcb33c00ecaaa6f885a31aad0122632e4340e83 (diff)
downloadhdf5-80429f7f45c9ff631d2c1524ae9efb649bf8ebe1.zip
hdf5-80429f7f45c9ff631d2c1524ae9efb649bf8ebe1.tar.gz
hdf5-80429f7f45c9ff631d2c1524ae9efb649bf8ebe1.tar.bz2
[svn-r2914] Purpose:
Bug fix Description: libtool complained that the library name didn't have a ``lib'' prefix. Also, the $(top_srcdir) macro points to the top of the c++/ directory, which was messing up the -I$(top_srcdir)/src stuff. It needed to be changed to the correct value. Solution: Made it so Platforms tested: Linux
-rw-r--r--c++/examples/Makefile.in4
-rw-r--r--c++/src/Makefile.in2
-rw-r--r--c++/test/Makefile.in3
3 files changed, 5 insertions, 4 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 20d5707..f767c35 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -13,8 +13,8 @@ hdf5_builddir=$(top_builddir)/src
## Add include directory to the C++ preprocessor flags and the hdf5
## library to the library list.
-LIB=../src/hdf5_cpp.la
-CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
+LIB=../src/libhdf5_cpp.la
+CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/../src @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 a70b801..fb4b35d 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -18,7 +18,7 @@ TRACE=perl $(top_srcdir)/bin/trace
CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@
## This is our main target
-LIB=hdf5_cpp.la
+LIB=libhdf5_cpp.la
## Source and object files for the library
LIB_SRC=H5Exception.C H5RefCounter.C H5IdComponent.C H5Library.C \
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 3eb60a7..c1ee0dc 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -14,7 +14,8 @@ 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/hdf5_cpp.la
+LIB=../src/libhdf5_cpp.la
+CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/../src @CPPFLAGS@
HDF5LIB=$(hdf5_builddir)/libhdf5.la
TEST_PROGS_SRC=