From 0efd9ceadfe08f8d706c4f7c41bc60c4f11b35eb Mon Sep 17 00:00:00 2001 From: James Laird Date: Tue, 15 Nov 2005 14:20:06 -0500 Subject: [svn-r11726] Purpose: Bug fix Description: Fixed bug in hl/src Makefile that was deleting y.tab.c. Running bin/reconfigure changed a few other files as well (somebody probably updated Makefiles.am but forgot to bin/reconfigure). Solution: Automake in its wisdom adds the line "rm *.tab.c" to every distclean in every directory. I assume that it assumes that such files are generated during the build. Supplied an empty distclean-compile target to remove this line from the Makefiles.in. Platforms tested: mir, sleipnir, shanti --- configure | 22 ++++++++++++++++++++++ hl/src/Makefile.am | 4 ++++ hl/src/Makefile.in | 7 ++++--- src/H5config.h.in | 4 ++++ test/Makefile.in | 19 ++++++++++--------- 5 files changed, 44 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 112ebe3..13460a5 100755 --- a/configure +++ b/configure @@ -50169,6 +50169,28 @@ else echo "${ECHO_T}no" >&6 fi +echo "$as_me:$LINENO: checking if converting floating-point values to long long is not working" >&5 +echo $ECHO_N "checking if converting floating-point values to long long is not working... $ECHO_C" >&6 +if test "${hdf5_cv_convert_float_llong_not_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + hdf5_cv_convert_float_llong_not_works=yes +fi + + +if test ${hdf5_cv_convert_float_llong_not_works} = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HW_FP_TO_LLONG_NOT_WORKS 1 +_ACEOF + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + echo "$as_me:$LINENO: checking if converting from long double to integers is accurate" >&5 echo $ECHO_N "checking if converting from long double to integers is accurate... $ECHO_C" >&6 diff --git a/hl/src/Makefile.am b/hl/src/Makefile.am index a1ff4bf..b7410fe 100644 --- a/hl/src/Makefile.am +++ b/hl/src/Makefile.am @@ -30,4 +30,8 @@ libhdf5_hl_la_SOURCES=H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5HL_private.c y.tab.c # Public header files (to be installed) include_HEADERS=H5IM.h H5LT.h H5TB.h H5DS.h H5PT.h y.tab.h +# Automake naturally assumes that we want it to remove y.tab.c on distclean. +# Convince it otherwise. +distclean-compile: + include $(top_srcdir)/config/conclude.am diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 1869338..a2c6c30 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -423,9 +423,6 @@ libhdf5_hl.la: $(libhdf5_hl_la_OBJECTS) $(libhdf5_hl_la_DEPENDENCIES) mostlyclean-compile: -rm -f *.$(OBJEXT) -distclean-compile: - -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DS.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HL_private.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IM.Plo@am__quote@ @@ -665,6 +662,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \ # as well. check-install: installcheck +# Automake naturally assumes that we want it to remove y.tab.c on distclean. +# Convince it otherwise. +distclean-compile: + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. # BUILT_SOURCES contain targets that need to be built before anything else diff --git a/src/H5config.h.in b/src/H5config.h.in index e7d8e75..c518ce4 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -357,6 +357,10 @@ /* Define if `__tm_gmtoff' is a member of `struct tm' */ #undef HAVE___TM_GMTOFF +/* Define if your system can't handle converting floating-point values to long + long. */ +#undef HW_FP_TO_LLONG_NOT_WORKS + /* Define if your system can accurately convert from integers to long double values. */ #undef INTEGER_TO_LDOUBLE_ACCURATE diff --git a/test/Makefile.in b/test/Makefile.in index ac41b59..fe9ba5a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -332,10 +332,10 @@ SOURCES = $(libh5test_la_SOURCES) b+tree.c big.c bittests.c \ gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c \ gen_new_group.c gen_new_mtime.c gen_new_super.c \ gen_noencoder.c gen_nullspace.c getname.c gheap.c hyperslab.c \ - istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c ohdr.c \ - pool.c reserved.c set_extent.c sheap.c space_overflow.c stab.c \ - stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) \ - unlink.c vfd.c + istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c \ + ohdr.c pool.c reserved.c set_extent.c sheap.c space_overflow.c \ + stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c \ + $(ttsafe_SOURCES) unlink.c vfd.c DIST_SOURCES = $(libh5test_la_SOURCES) b+tree.c big.c bittests.c \ blocktrack.c btree2.c cache.c cmpd_dset.c dangle.c dsets.c \ dt_arith.c dtransform.c dtypes.c enum.c err_compat.c \ @@ -343,10 +343,10 @@ DIST_SOURCES = $(libh5test_la_SOURCES) b+tree.c big.c bittests.c \ gen_deflate.c gen_filters.c gen_new_array.c gen_new_fill.c \ gen_new_group.c gen_new_mtime.c gen_new_super.c \ gen_noencoder.c gen_nullspace.c getname.c gheap.c hyperslab.c \ - istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c ohdr.c \ - pool.c reserved.c set_extent.c sheap.c space_overflow.c stab.c \ - stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) \ - unlink.c vfd.c + istore.c lheap.c links.c mount.c mtime.c ntypes.c objcopy.c \ + ohdr.c pool.c reserved.c set_extent.c sheap.c space_overflow.c \ + stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c \ + $(ttsafe_SOURCES) unlink.c vfd.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -604,7 +604,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \ new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \ err_compat.h5 dtransform.h5 test_filters.h5 get_file_name.h5 \ tstint[1-2].h5 unlink_chunked.h5 btree2.h5 blocktrack.h5 \ - sheap.h5 b+tree.h5 + sheap.h5 b+tree.h5 objcopy_src.h5 objcopy_dst.h5 \ + objcopy_ext.dat INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src # Test script for error_test and err_compat -- cgit v0.12