[svn-r13359] Fixed a bug where the -shlib flag for h5cc would end up on the Dependency line

in the Makefile.

Makefile change only.  Tested on kagiso, to be used to test on cobalt.

5 files changed, 139 insertions, 22 deletions

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 00a5cbe..efd655b 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -30,6 +30,32 @@
 #
 # Top-level HDF5-C++ Makefile(.in)
 # 
+
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -296,11 +322,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
 # shared libraries instead of static libraries
-H5CC = $(bindir)/h5cc $(H5CCFLAGS)
-H5CC_PP = $(bindir)/h5pcc $(H5CCFLAGS)
-H5FC = $(bindir)/h5fc $(H5CCFLAGS)
-H5FC_PP = $(bindir)/h5pfc $(H5CCFLAGS)
-H5CPP = $(bindir)/h5c++ $(H5CCFLAGS)
+H5CC = $(bindir)/h5cc
+H5CC_PP = $(bindir)/h5pcc
+H5FC = $(bindir)/h5fc
+H5FC_PP = $(bindir)/h5pfc
+H5CPP = $(bindir)/h5c++
 
 # The trace script; this is used on source files from the C library to
 # insert tracing macros.
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index d490242..7f8bcfa 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -41,7 +41,7 @@ EXAMPLEDIR=$(docdir)/hdf5/examples/c++
 
 # How to build programs using h5c++
 $(EXTRA_PROG): $(H5CPP)
-	$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
+	$(H5CPP) $(H5CCFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
 
 # List dependencies for each program.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index e934855..e0ecc1d 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -31,9 +31,48 @@
 # HDF5 Library Examples Makefile(.in)
 #
 
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
 # We can't tell automake about example programs, because they need to be
 # built using h5cc (or h5fc, etc.) instead of the standard compilers.
 # This creates some extra work for us.
+
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -293,11 +332,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
 # shared libraries instead of static libraries
-H5CC = $(bindir)/h5cc $(H5CCFLAGS)
-H5CC_PP = $(bindir)/h5pcc $(H5CCFLAGS)
-H5FC = $(bindir)/h5fc $(H5CCFLAGS)
-H5FC_PP = $(bindir)/h5pfc $(H5CCFLAGS)
-H5CPP = $(bindir)/h5c++ $(H5CCFLAGS)
+H5CC = $(bindir)/h5cc
+H5CC_PP = $(bindir)/h5pcc
+H5FC = $(bindir)/h5fc
+H5FC_PP = $(bindir)/h5pfc
+H5CPP = $(bindir)/h5c++
 
 # The trace script; this is used on source files from the C library to
 # insert tracing macros.
@@ -530,7 +569,7 @@ chunks.chkexe_: extend_ds.chkexe_
 
 # How to build programs using h5c++
 $(EXTRA_PROG): $(H5CPP)
-	$(H5CPP) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
+	$(H5CPP) $(H5CCFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/$@.cpp
 
 # List dependencies for each program.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index e258690..be23745 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -31,6 +31,32 @@
 # HDF5-C++ Makefile(.in)
 #
 
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
 
 
 srcdir = @srcdir@
@@ -328,11 +354,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
 # shared libraries instead of static libraries
-H5CC = $(bindir)/h5cc $(H5CCFLAGS)
-H5CC_PP = $(bindir)/h5pcc $(H5CCFLAGS)
-H5FC = $(bindir)/h5fc $(H5CCFLAGS)
-H5FC_PP = $(bindir)/h5pfc $(H5CCFLAGS)
-H5CPP = $(bindir)/h5c++ $(H5CCFLAGS)
+H5CC = $(bindir)/h5cc
+H5CC_PP = $(bindir)/h5pcc
+H5FC = $(bindir)/h5fc
+H5FC_PP = $(bindir)/h5pfc
+H5CPP = $(bindir)/h5c++
 
 # The trace script; this is used on source files from the C library to
 # insert tracing macros.
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 6632cb8..1f39410 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -30,6 +30,32 @@
 #
 # HDF5-C++ Makefile(.in)
 #
+
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+# Copyright by The HDF Group.
+# 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://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -319,11 +345,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
 # shared libraries instead of static libraries
-H5CC = $(bindir)/h5cc $(H5CCFLAGS)
-H5CC_PP = $(bindir)/h5pcc $(H5CCFLAGS)
-H5FC = $(bindir)/h5fc $(H5CCFLAGS)
-H5FC_PP = $(bindir)/h5pfc $(H5CCFLAGS)
-H5CPP = $(bindir)/h5c++ $(H5CCFLAGS)
+H5CC = $(bindir)/h5cc
+H5CC_PP = $(bindir)/h5pcc
+H5FC = $(bindir)/h5fc
+H5FC_PP = $(bindir)/h5pfc
+H5CPP = $(bindir)/h5c++
 
 # The trace script; this is used on source files from the C library to
 # insert tracing macros.