[svn-r15020] Purpose: Configure Fix

Description: The test program h52gifgentst was getting installed in the bin
             directory during 'make install', and it shouldn't. Make now
             builds the program for use in testing but doesn't install it
             during 'make install'.

Tested: kagiso

4 files changed, 41 insertions, 31 deletions

diff --git a/configure b/configure
index 93744e7..67a6b8b 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 15014 2008-05-15 21:35:13Z mcgreevy .
+# From configure.in Id: configure.in 15017 2008-05-16 04:00:28Z acheng .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.9.6.
 #
diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am
index 9707b76..076b915 100644
--- a/hl/tools/gif2h5/Makefile.am
+++ b/hl/tools/gif2h5/Makefile.am
@@ -28,7 +28,8 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src
 TEST_SCRIPT=$(srcdir)/h52giftest.sh
 check_SCRIPTS=$(TEST_SCRIPT)
 
-bin_PROGRAMS=gif2h5 h52gif h52gifgentst
+bin_PROGRAMS=gif2h5 h52gif
+noinst_PROGRAMS=h52gifgentst
 
 gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c 
 
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index a67df6c..adba1b7 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -52,7 +52,8 @@ host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/config/commence.am \
 	$(top_srcdir)/config/conclude.am
-bin_PROGRAMS = gif2h5$(EXEEXT) h52gif$(EXEEXT) h52gifgentst$(EXEEXT)
+bin_PROGRAMS = gif2h5$(EXEEXT) h52gif$(EXEEXT)
+noinst_PROGRAMS = h52gifgentst$(EXEEXT)
 TESTS = $(check_SCRIPTS)
 subdir = hl/tools/gif2h5
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -64,7 +65,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \
 	decompress.$(OBJEXT) gifread.$(OBJEXT) writehdf.$(OBJEXT)
 gif2h5_OBJECTS = $(am_gif2h5_OBJECTS)
@@ -434,6 +435,13 @@ clean-binPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
 gif2h5$(EXEEXT): $(gif2h5_OBJECTS) $(gif2h5_DEPENDENCIES) 
 	@rm -f gif2h5$(EXEEXT)
 	$(LINK) $(gif2h5_OBJECTS) $(gif2h5_LDADD) $(LIBS)
@@ -594,7 +602,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -653,19 +662,19 @@ uninstall-am: uninstall-binPROGRAMS
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
-	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-	pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+	clean clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS
 
 
 # List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
diff --git a/test/Makefile.in b/test/Makefile.in
index 12787a2..e26e2e9 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -613,19 +613,19 @@ TRACE = perl $(top_srcdir)/bin/trace
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
 	compact_dataset.h5 dataset.h5 dset_offset.h5 \
 	max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \
-	extend.h5 istore.h5 tfile[1-4].h5 th5s[1-3].h5 lheap.h5 \
-	fheap.h5 ohdr.h5 stab.h5 extern_[1-3].h5 extern_[1-4][ab].raw \
-	gheap[0-4].h5 dt_arith[1-2] links.h5 links[0-6]*.h5 \
-	extlinks[0-15].h5 tmp big.data big[0-9][0-9][0-9][0-9][0-9].h5 \
-	stdio.h5 sec2.h5 dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 \
-	tselect.h5 mtime.h5 unlink.h5 unicode.h5 coord.h5 \
-	fillval_[0-9].h5 fillval.raw mount_[0-9].h5 testmeta.h5 \
-	ttime.h5 trefer[1-3].h5 tvltypes.h5 tvlstr.h5 tvlstr2.h5 \
-	flush.h5 enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 tgenprop.h5 \
-	tmisc[0-9]*.h5 set_extent_read.h5 set_extent_create.h5 \
-	getname.h5 getname[1-3].h5 sec2_file.h5 direct_file.h5 \
-	family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
-	new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
+	huge_chunks.h5 extend.h5 istore.h5 tfile[1-4].h5 th5s[1-3].h5 \
+	lheap.h5 fheap.h5 ohdr.h5 stab.h5 extern_[1-3].h5 \
+	extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2] links.h5 \
+	links[0-6]*.h5 extlinks[0-15].h5 tmp big.data \
+	big[0-9][0-9][0-9][0-9][0-9].h5 stdio.h5 sec2.h5 \
+	dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
+	unlink.h5 unicode.h5 coord.h5 fillval_[0-9].h5 fillval.raw \
+	mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
+	tvlstr.h5 tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 \
+	tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
+	set_extent_create.h5 getname.h5 getname[1-3].h5 sec2_file.h5 \
+	direct_file.h5 family_file000[0-3][0-9].h5 multi_file-[rs].h5 \
+	core_file 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 objcopy_src.h5 \
 	objcopy_dst.h5 objcopy_ext.dat trefer1.h5 trefer2.h5