No longer use the HDF5 HL interface

timj · timj · commit 5716d3d8212a · 2014-11-20T08:32:50.000-07:00
H5LT calls removed in commit 95467e0 and this commit removes the library from the link command and the include file from the source code.
diff --git a/Makefile.am b/Makefile.am
@@ -17,7 +17,7 @@ libhds_v5_la_SOURCES = \
 	$(PRIVATE_INCLUDES) \
 	$(C_ROUTINES)
 
-libhds_v5_la_LIBADD = `starmem_link` `ems_link` `one_link` -lhdf5 -lhdf5_hl
+libhds_v5_la_LIBADD = `starmem_link` `ems_link` `one_link` -lhdf5
 
 # Make all library code position independent. This is handy for creating
 # shareable libraries from the static ones (Java JNI libraries).
diff --git a/dat1Coords2CellName.c b/dat1Coords2CellName.c
@@ -89,7 +89,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1DumpLoc.c b/dat1DumpLoc.c
@@ -61,7 +61,6 @@
 #include <stdio.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/dat1EncodeSubscript.c b/dat1EncodeSubscript.c
@@ -96,7 +96,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1ExportDims.c b/dat1ExportDims.c
@@ -86,7 +86,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1FixNameCell.c b/dat1FixNameCell.c
@@ -95,7 +95,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1H5EtoEMS.c b/dat1H5EtoEMS.c
@@ -82,7 +82,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "dat1.h"
diff --git a/dat1ImportDims.c b/dat1ImportDims.c
@@ -86,7 +86,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1Index2Coords.c b/dat1Index2Coords.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1InitHDF5.c b/dat1InitHDF5.c
@@ -77,7 +77,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 void dat1InitHDF5(void) {
   static int DONE = 0;
diff --git a/dat1IsStructure.c b/dat1IsStructure.c
@@ -83,7 +83,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1NewPrim.c b/dat1NewPrim.c
@@ -94,7 +94,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dat1Type.c b/dat1Type.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/dat1TypeInfo.c b/dat1TypeInfo.c
@@ -77,7 +77,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datAlter.c b/datAlter.c
@@ -100,7 +100,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datBasic.c b/datBasic.c
@@ -87,7 +87,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datCcopy.c b/datCcopy.c
@@ -87,7 +87,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datClen.c b/datClen.c
@@ -92,7 +92,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datClone.c b/datClone.c
@@ -87,7 +87,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datCoerc.c b/datCoerc.c
@@ -91,7 +91,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datConv.c b/datConv.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datCopy.c b/datCopy.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datDrep.c b/datDrep.c
@@ -90,7 +90,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datExportFloc.c b/datExportFloc.c
@@ -108,7 +108,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datFind.c b/datFind.c
@@ -90,7 +90,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 
diff --git a/datGet.c b/datGet.c
@@ -89,7 +89,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datIndex.c b/datIndex.c
@@ -85,7 +85,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datLen.c b/datLen.c
@@ -79,7 +79,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datMap.c b/datMap.c
@@ -114,7 +114,6 @@
 #include <errno.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/util.h"
 #include "star/one.h"
diff --git a/datMould.c b/datMould.c
@@ -84,7 +84,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datMove.c b/datMove.c
@@ -95,7 +95,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datName.c b/datName.c
@@ -82,7 +82,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/datNcomp.c b/datNcomp.c
@@ -81,7 +81,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datNew.c b/datNew.c
@@ -94,7 +94,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "hds1.h"
 #include "dat1.h"
diff --git a/datParen.c b/datParen.c
@@ -101,7 +101,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datPrim.c b/datPrim.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datPrmry.c b/datPrmry.c
@@ -110,7 +110,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datRefct.c b/datRefct.c
@@ -88,7 +88,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datRenam.c b/datRenam.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datRetyp.c b/datRetyp.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datShape.c b/datShape.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datSize.c b/datSize.c
@@ -78,7 +78,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/datSlice.c b/datSlice.c
@@ -90,7 +90,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datState.c b/datState.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datStruc.c b/datStruc.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datThere.c b/datThere.c
@@ -80,7 +80,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/datType.c b/datType.c
@@ -79,7 +79,6 @@
 #include <string.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/one.h"
 #include "ems.h"
diff --git a/datVec.c b/datVec.c
@@ -82,7 +82,6 @@
 */
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "ems.h"
 #include "sae_par.h"
diff --git a/dau1CheckFileName.c b/dau1CheckFileName.c
@@ -92,7 +92,6 @@
 #include <ctype.h>
 
 #include "hdf5.h"
-#include "hdf5_hl.h"
 
 #include "star/util.h"
 #include "ems.h"
diff --git a/dau1HdsType.c b/dau1HdsType.c
diff --git a/hdsClose.c b/hdsClose.c
diff --git a/hdsCopy.c b/hdsCopy.c
diff --git a/hdsErase.c b/hdsErase.c
diff --git a/hdsEwild.c b/hdsEwild.c
diff --git a/hdsGroup.c b/hdsGroup.c
diff --git a/hdsLock.c b/hdsLock.c
diff --git a/hdsNew.c b/hdsNew.c
diff --git a/hdsOpen.c b/hdsOpen.c
diff --git a/hdsShow.c b/hdsShow.c
diff --git a/hdsState.c b/hdsState.c
diff --git a/hdsStop.c b/hdsStop.c
diff --git a/hdsTrace.c b/hdsTrace.c
diff --git a/hdsWild.c b/hdsWild.c
