[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.

2 files changed, 48 insertions, 5 deletions

diff --git a/src/H5A.c b/src/H5A.c
index 71801c3..f93f7a5 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -1261,6 +1261,8 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     ssize_t	ret_value;      /* Return value */
 
     FUNC_ENTER_API(H5Aget_name_by_idx, FAIL)
+    H5TRACE8("Zs", "isIiIohxzi", loc_id, obj_name, idx_type, order, n, name, size,
+             lapl_id);
 
     /* Check args */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -1717,6 +1719,7 @@ H5Adelete2(hid_t loc_id, const char *obj_name, const char *attr_name,
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Adelete2, FAIL)
+    H5TRACE4("e", "issi", loc_id, obj_name, attr_name, lapl_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
@@ -1792,6 +1795,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     herr_t	ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(H5Adelete_by_idx, FAIL)
+    H5TRACE6("e", "isIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id);
 
     /* check arguments */
     if(H5I_ATTR == H5I_get_type(loc_id))
diff --git a/src/Makefile.in b/src/Makefile.in
index 18b07ec..fda342a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,6 +31,32 @@
 # HDF5 Library 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.
+
 
 
 
@@ -365,11 +391,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.
@@ -1029,6 +1055,19 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
         build-tests check-clean check-install check-p check-s check-vfd \
         install-doc lib progs tests uninstall-doc _exec_check-s _test
 
+# 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.
+
 # Error header generation
 #
 # Actually, H5Einit.h, H5Eterm.h, H5Edefin.h and H5Epubgen.h all