1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
Description: Rename libdf to libdfalt and libmfhdf to libmfhdfalt.
Author: Johan Van de Wauw <johan.vandewauw@gmail.com>
--- a/HDF4_ALT/hdf/src/Makefile.am
+++ b/HDF4_ALT/hdf/src/Makefile.am
@@ -4,7 +4,7 @@
include $(top_srcdir)/config/commence.am
-lib_LTLIBRARIES = libdf.la
+lib_LTLIBRARIES = libdfalt.la
FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \
dfr8ff.f dfsdf.c dfsdff.f dfufp2iff.f dfutilf.c herrf.c hfilef.c \
@@ -27,14 +27,14 @@ CHEADERS = H4api_adpt.h df.h h4config.h
FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
if HDF_BUILD_FORTRAN
-libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
+libdfalt_la_SOURCES = $(CSOURCES) $(FSOURCES)
include_HEADERS = $(CHEADERS) hproto_fortran.h $(FHEADERS)
else
-libdf_la_SOURCES = $(CSOURCES)
+libdfalt_la_SOURCES = $(CSOURCES)
include_HEADERS = $(CHEADERS)
endif
-libdf_la_LIBADD = @LIBS@
+libdfalt_la_LIBADD = @LIBS@
# The following is a workaround. Since Fortran is included in this
# Makefile.am, automake will always try to use the Fortran linker, even when
--- a/HDF4_ALT/mfhdf/libsrc/Makefile.am
+++ b/HDF4_ALT/mfhdf/libsrc/Makefile.am
@@ -14,9 +14,9 @@ AM_CPPFLAGS = $(lib_INCLUDES) $(DEFINES)
## Library to build ##
#############################################################################
-lib_LTLIBRARIES = libmfhdf.la
+lib_LTLIBRARIES = libmfhdfalt.la
-## Information for building the "libmfhdf.la" library
+## Information for building the "libmfhdfalt.la" library
CSOURCES = array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c \
globdef.c mfsd.c mfdatainfo.c nssdc.c putget.c putgetg.c \
sharray.c string.c var.c h4_xdr.c
@@ -28,12 +28,12 @@ FSOURCES = $(top_srcdir)/mfhdf/fortran/m
endif
if HDF_BUILD_FORTRAN
-libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
+libmfhdfalt_la_SOURCES = $(CSOURCES) $(FSOURCES)
else
-libmfhdf_la_SOURCES = $(CSOURCES)
+libmfhdfalt_la_SOURCES = $(CSOURCES)
endif
-libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
+libmfhdfalt_la_LIBADD = $(top_builddir)/hdf/src/libdfalt.la
if HDF_BUILD_NETCDF
include_HEADERS = hdf2netcdf.h mfhdf.h netcdf.h mfdatainfo.h
--- a/HDF4_ALT/config/commence.am
+++ b/HDF4_ALT/config/commence.am
@@ -21,8 +21,8 @@ RM = rm -f
CP = cp
# Libraries to link to while building
-LIBHDF = $(top_builddir)/hdf/src/libdf.la
-LIBMFHDF = $(top_builddir)/mfhdf/libsrc/libmfhdf.la
+LIBHDF = $(top_builddir)/hdf/src/libdfalt.la
+LIBMFHDF = $(top_builddir)/mfhdf/libsrc/libmfhdfalt.la
H4CC = ${DESTDIR}$(bindir)/h4cc
H4FC = ${DESTDIR}$(bindir)/h4fc
--- a/HDF4_ALT/hdf/util/Makefile.am
+++ b/HDF4_ALT/hdf/util/Makefile.am
@@ -1,4 +1,4 @@
-#############################################################################
+############################################################################
## Setup for building programs ##
#############################################################################
@@ -107,8 +107,8 @@ vmake_DEPENDENCIES = $(LIBHDF)
vmake_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
vshow_SOURCES = vshow.c
-vshow_LDADD = ../src/libdf.la
-vshow_DEPENDENCIES = ../src/libdf.la
+vshow_LDADD = $(LIBHDF)
+vshow_DEPENDENCIES = $(LIBHDF)
vshow_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
#############################################################################
--- a/HDF4_ALT/mfhdf/ncgen/Makefile.am
+++ b/HDF4_ALT/mfhdf/ncgen/Makefile.am
@@ -5,9 +5,9 @@
include $(top_srcdir)/config/commence.am
if HDF_BUILD_SHARED
- SHLIBLOC = $(top_builddir)/mfhdf/libsrc/.libs/libmfhdf.$(SHARED_EXTENSION) $(top_builddir)/hdf/src/.libs/libdf.$(SHARED_EXTENSION)
+ SHLIBLOC = $(top_builddir)/mfhdf/libsrc/.libs/libmfhdfalt.$(SHARED_EXTENSION) $(top_builddir)/hdf/src/.libs/libdfalt.$(SHARED_EXTENSION)
else
- SHLIBLOC = $(top_builddir)/mfhdf/libsrc/.libs/libmfhdf.a $(top_builddir)/hdf/src/.libs/libdf.a
+ SHLIBLOC = $(top_builddir)/mfhdf/libsrc/.libs/libmfhdfalt.a $(top_builddir)/hdf/src/.libs/libdfalt.a
endif
## Setup the different includes and preprocessor #defines we need.
|
