8c300c42de
changes: -API additions -hdp and hrepack utilities can now display more compression information -build system updates -bugfixes pkgsrc notes: -we build shared libraries now although it is officially unsupported if Fortran is enabled (works for me) -The 24-bit-jpeg selftest fails. It also failed with the previous version. (perhaps jpeg-7 related?) The test contains too much magic to tell what happens.
82 lines
4.1 KiB
Text
82 lines
4.1 KiB
Text
$NetBSD: patch-aj,v 1.8 2009/12/10 17:10:14 drochner Exp $
|
|
|
|
--- mfhdf/ncgen/Makefile.in.orig 2008-10-13 21:39:11.000000000 +0200
|
|
+++ mfhdf/ncgen/Makefile.in
|
|
@@ -37,7 +37,7 @@ build_triplet = @build@
|
|
host_triplet = @host@
|
|
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
|
$(top_srcdir)/config/commence.am
|
|
-bin_PROGRAMS = ncgen$(EXEEXT)
|
|
+bin_PROGRAMS = hdfncgen$(EXEEXT)
|
|
@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_NETCDF_TRUE@noinst_PROGRAMS = ctest0$(EXEEXT)
|
|
@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@noinst_PROGRAMS = ctest0$(EXEEXT) \
|
|
@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ ftest0$(EXEEXT)
|
|
@@ -242,11 +242,11 @@ ftest0_SOURCES =
|
|
|
|
#############################################################################
|
|
#############################################################################
|
|
-man1_MANS = ncgen.1
|
|
+man1_MANS = hdfncgen.1
|
|
|
|
#############################################################################
|
|
#############################################################################
|
|
-NCDUMP = ../ncdump/ncdump
|
|
+NCDUMP = ../ncdump/hdfncdump
|
|
|
|
#############################################################################
|
|
#############################################################################
|
|
@@ -328,7 +328,7 @@ clean-noinstPROGRAMS:
|
|
@HDF_BUILD_NETCDF_FALSE@ftest0$(EXEEXT): $(ftest0_OBJECTS) $(ftest0_DEPENDENCIES)
|
|
@HDF_BUILD_NETCDF_FALSE@ @rm -f ftest0$(EXEEXT)
|
|
@HDF_BUILD_NETCDF_FALSE@ $(LINK) $(ftest0_OBJECTS) $(ftest0_LDADD) $(LIBS)
|
|
-ncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES)
|
|
+hdfncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES)
|
|
@rm -f ncgen$(EXEEXT)
|
|
$(LINK) $(ncgen_OBJECTS) $(ncgen_LDADD) $(LIBS)
|
|
|
|
@@ -613,13 +613,13 @@ ncgenyy.c: ncgen.l
|
|
$(LEX) $(srcdir)/ncgen.l
|
|
mv lex.yy.c ncgenyy.c
|
|
|
|
-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@check: ncgen $(srcdir)/test0.cdl b-check c-check f-check
|
|
-@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_NETCDF_TRUE@check: ncgen $(srcdir)/test0.cdl b-check c-check
|
|
+@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@check: hdfncgen $(srcdir)/test0.cdl b-check c-check f-check
|
|
+@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_NETCDF_TRUE@check: hdfncgen $(srcdir)/test0.cdl b-check c-check
|
|
|
|
-@HDF_BUILD_NETCDF_FALSE@check: ncgen $(srcdir)/test0.cdl b-check c-check
|
|
+@HDF_BUILD_NETCDF_FALSE@check: hdfncgen $(srcdir)/test0.cdl b-check c-check
|
|
|
|
-b-check: ncgen $(srcdir)/test0.cdl test1.cdl
|
|
- $(TESTS_ENVIRONMENT) ./ncgen -b test1.cdl
|
|
+b-check: hdfncgen $(srcdir)/test0.cdl test1.cdl
|
|
+ $(TESTS_ENVIRONMENT) ./hdfncgen -b test1.cdl
|
|
$(TESTS_ENVIRONMENT) $(NCDUMP) test1.nc > test2.cdl
|
|
@if $(DIFF) test1.cdl test2.cdl; then \
|
|
echo "*** ncgen -b test successful ***"; \
|
|
@@ -645,8 +645,8 @@ c-check: test2.cdl ctest0
|
|
@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ echo "*** ncgen -f test failed (but roundoff differences are OK) ***"; \
|
|
@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ fi
|
|
|
|
-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ftest0$(EXEEXT): ncgen test0.cdl netcdf.inc
|
|
-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ $(TESTS_ENVIRONMENT) ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
|
|
+@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ftest0$(EXEEXT): hdfncgen test0.cdl netcdf.inc
|
|
+@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ $(TESTS_ENVIRONMENT) ./hdfncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
|
|
@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(SHLIBLOC) $(LIBS)
|
|
|
|
netcdf.inc:
|
|
@@ -655,11 +655,11 @@ netcdf.inc:
|
|
test1.cdl: test0.nc
|
|
$(TESTS_ENVIRONMENT) $(NCDUMP) -n test1 test0.nc > $@
|
|
|
|
-test0.nc: ncgen $(srcdir)/test0.cdl
|
|
- $(TESTS_ENVIRONMENT) ./ncgen -b -o test0.nc $(srcdir)/test0.cdl
|
|
+test0.nc: hdfncgen $(srcdir)/test0.cdl
|
|
+ $(TESTS_ENVIRONMENT) ./hdfncgen -b -o test0.nc $(srcdir)/test0.cdl
|
|
|
|
-ctest0$(EXEEXT): ncgen $(srcdir)/test0.cdl
|
|
- $(TESTS_ENVIRONMENT) ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
|
|
+ctest0$(EXEEXT): hdfncgen $(srcdir)/test0.cdl
|
|
+ $(TESTS_ENVIRONMENT) ./hdfncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
|
|
$(COMPILE) -c -o ctest0$(EXEEXT).o test0.c
|
|
$(LINK) ctest0$(EXEEXT).o $(ctest0_LDADD) $(LDFLAGS) $(SHLIBLOC) $(LIBS)
|
|
|