[svn-r12323] Purpose: Maintenance/bug fixes

Description: Some VMS command files were broken, some needed
             an update to catch up with the current code distribution.

Solution: Fixed

Platforms tested: VMS server with IEEE option. Will do more testing after
                  checking out a fresh CVS version.

Misc. update:

7 files changed, 28 insertions, 32 deletions

diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com
index 267883a..3755214 100644
--- a/vms/tools/h5diff/make.com
+++ b/vms/tools/h5diff/make.com
@@ -15,22 +15,20 @@ $! Makefile for VAX/VMX systems.
 $!
 $! Make h5diff tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! ccopt = "/float=ieee_float"
 $
-$ ccc := cc 'ccopt /debug/define=H5_VMS/include=([-.-.src], [-.lib])
+$ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
        Creating h5diff  
 $!
-$ cobj= "h5diff_main, h5diff_common, testh5diff_main, testh5diff_attr, " +-
-        "testh5diff_basic, testh5diff_dset, testh5diff_util"
+$ cobj= "h5diff_main, h5diff_common, h5diffgentest"
 
 $!                               
 $ ccc 'cobj 
 $ type sys$input
-       Creating h5ddifftst
-$ link/exe=h5difftst.exe -
-           testh5diff_main, testh5diff_attr, -
-           testh5diff_basic, testh5diff_dset, testh5diff_util, -
+       Creating h5diffgentest
+$ link/exe=h5diffgentest.exe -
+           h5diffgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib 
 $ type sys$input
        Created  h5difftest
@@ -44,3 +42,4 @@ $ link/exe=h5diff.exe -
 $ type sys$input
        Created  h5diff
 $!
+$ exit
diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com
index 435fb6c..44b03ed 100644
--- a/vms/tools/h5dump/make.com
+++ b/vms/tools/h5dump/make.com
@@ -15,9 +15,9 @@ $! Makefile for VMS systems.
 $!
 $! Make h5dump tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! ccopt = "/float=ieee_float"
 $
-$ ccc := cc 'ccopt /debug/define=H5_VMS/include=([-.-.src], [-.lib])
+$ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ 
 $
 $ cobj= "h5dump.c, h5dumpgentest.c "
@@ -26,8 +26,8 @@ $
 $ ccc 'cobj 
 $ type sys$input
        Creating h5dumpgentest
-$ link     h5dumpgentest
-$
+$ link     h5dumpgentest, -
+           [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib 
 $ type sys$input
  	Created  h5dumpgentest
 $
@@ -35,7 +35,7 @@ $ type sys$input
        Creating h5dump
 $ link     h5dump, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-               sys$clib/lib
 $ type sys$input
 	Created  h5dump
 $!
+$ exit
diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com
index 41bcc92..810fddc 100644
--- a/vms/tools/h5import/make.com
+++ b/vms/tools/h5import/make.com
@@ -15,9 +15,9 @@ $! Makefile for VMS systems.
 $!
 $! Make h5import tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! ccopt = "/float=ieee_float"
 $
-$ ccc := cc 'ccopt /debug/define=H5_VMS/include=([-.-.src], [-.lib])
+$ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
 	Creating  h5import
 $!
@@ -30,7 +30,6 @@ $ type sys$input
        Creating h5import
 $ link     h5import,-
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
 $ type sys$input
 	Created  h5import
 $!
@@ -38,7 +37,7 @@ $ type sys$input
        Creating h5importtest
 $ link     h5importtest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
 $ type sys$input
 	Created  h5importtest
 $!
+$ exit
diff --git a/vms/tools/h5jam/make.com b/vms/tools/h5jam/make.com
index 2819936..e6e7218 100644
--- a/vms/tools/h5jam/make.com
+++ b/vms/tools/h5jam/make.com
@@ -15,9 +15,9 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! ccopt = "/float=ieee_float"
 $
-$ ccc := cc 'ccopt /debug/define=VMS/include=([-.-.src], [-.lib])
+$ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
 	Creating h5jam
 $!
@@ -30,14 +30,12 @@ $ type sys$input
        Creating tellub
 $ link     tellub -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
 $ type sys$input
 	Created  tellub
 $ type sys$input
        Creating getub
 $ link     getub -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
 $ type sys$input
 	Created  getub
 $!
@@ -46,7 +44,6 @@ $ type sys$input
        Creating h5jamgentest
 $ link     h5jamgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
 $ type sys$input
 	Created  h5jamgentest
 $!
@@ -54,7 +51,6 @@ $ type sys$input
        Creating h5jam
 $ link     h5jam, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
 $ type sys$input
 	Created  h5jam
 $!
@@ -66,3 +62,4 @@ $ link     h5unjam, -
 $ type sys$input
 	Created  h5unjam
 $!
+$ exit
diff --git a/vms/tools/h5ls/make.com b/vms/tools/h5ls/make.com
index 19eb6be..57c8be5 100644
--- a/vms/tools/h5ls/make.com
+++ b/vms/tools/h5ls/make.com
@@ -15,9 +15,9 @@ $! Makefile for VMS systems.
 $!
 $! Make h5ls tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! ccopt = "/float=ieee_float"
 $
-$ ccc := cc 'ccopt /debug/define=H5_VMS/include=([-.-.src], [-.lib])
+$ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
 	Creating h5ls
 $!
@@ -30,7 +30,7 @@ $ type sys$input
        Creating h5ls
 $ link     h5ls, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib
-!               sys$clib/lib
 $ type sys$input
 	Created  h5ls
 $!
+$ exit
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index dd264d8..a06a5de 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -15,9 +15,9 @@ $! Makefile for VMS systems.
 $!
 $! Make h5repack tool 
 $!
-$ ccopt = "/float=ieee_float"
+$! ccopt = "/float=ieee_float"
 $
-$ ccc := cc 'ccopt /debug/define=H5_VMS/include=([-.-.src], [-.lib], [-.-.test])
+$ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
 	Creating h5repack
 $!
@@ -52,3 +52,4 @@ $ link/exe=h5repacktst.exe -
 $ type sys$input
 	Created  h5repacktst
 $!
+$ exit
diff --git a/vms/tools/lib/make.com b/vms/tools/lib/make.com
index 6070fd3..5254d3f 100644
--- a/vms/tools/lib/make.com
+++ b/vms/tools/lib/make.com
@@ -15,19 +15,19 @@ $! Makefile for VMS systems.
 $!
 $! Make HDF5 tools library
 $!
-$ ccopt = "/float=ieee_float"
-$ ccc := cc 'ccopt /debug/define=H5_VMS/include=([-.-.src])
-$
+$! ccopt = "/float=ieee_float"
+$ ccc := cc 'ccopt /include=([-.-.src])
+$!
 $ type sys$input
 	Creating  HDF5 Tools library
 $!
 $ cobj="h5tools, h5tools_str, h5tools_utils, h5diff, h5diff_array, "+-
         "h5diff_attr, h5diff_dset, h5diff_util, h5trav,"+- 
         " h5trav_table, h5tools_filters, h5tools_ref, h5tools_type"
-
 $!
 $ ccc 'cobj 
 $ library/create []libh5tools  'cobj
 $ type sys$input
 	Created HDF5 tools library
 $!
+$ exit