From 0f125bf0fc16748f69161ef405ea7ec2123d1371 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 14 Feb 2003 16:17:16 -0500 Subject: [svn-r6404] Purpose: Bug Fix (Bug #806) Description: When compiling/installing with the command "make install" (without performing a "make" beforehand) the tools weren't being made. This was because the `install' command in the Makefiles only relied upon public libraries, not private ones (which the one in the tools directory is). Solution: Had the `install' command be dependent upon an "AUX_LIB" macro which includes libraries which are needed but aren't distributed (that is, they're staticly compiled). Platforms tested: Linux --- config/conclude.in | 2 +- tools/lib/Makefile.in | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/config/conclude.in b/config/conclude.in index 1605a72..1381cbb 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -100,7 +100,7 @@ $(EXAMPLEDIR): ## Install the library, the public header files, and public programs. ## -install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir) +install: $(AUX_LIB) $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir) @for f in X $(PUB_LIB); do \ if test $$f != X; then \ ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index d620d7f..594c9c4 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -1,8 +1,16 @@ ## HDF5 Library Makefile(.in) ## -## Copyright (C) 2001 National Center for Supercomputing Applications. -## All rights reserved. +## Copyright by the Board of Trustees of the University of Illinois. +## All rights reserved. ## +## This file is part of HDF5. The full HDF5 copyright notice, including +## terms governing use, modification, and redistribution, is contained in +## the files COPYING and Copyright.html. COPYING can be found at the root +## of the source code distribution tree; Copyright.html can be found at the +## root level of an installed copy of the electronic HDF5 document set and +## is linked from the top-level documents page. It can also be found at +## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have +## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. ## top_srcdir=@top_srcdir@ top_builddir=../.. @@ -36,6 +44,7 @@ PROGS=$(PUB_PROGS) $(TEST_PROGS) LIB_SRC=h5tools.c h5tools_str.c h5tools_utils.c LIB_OBJ=$(LIB_SRC:.c=.lo) PUB_LIB= +AUX_LIB=$(LIB) TEST_SRC=talign.c TEST_OBJ=$(TEST_SRC:.c=.lo) -- cgit v0.12