* tools/Makefile.am: The libtiff tools bmp2tiff, gif2tiff,

ras2tiff, sgi2tiff, sgisv, and ycbcr are completely removed from
the distribution.  The libtiff tools rgb2ycbcr and thumbnail are
only built in the build tree for testing.  Old files are put in
new 'archive' subdirectory of the source repository, but not in
distribution archives.  These changes are made in order to lessen
the maintenance burden.

9 files changed, 6 insertions, 81 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 0aca56fc..df5c082d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -66,9 +66,6 @@ check_PROGRAMS = \
 
 # Test scripts to execute
 TESTSCRIPTS = \
-	bmp2tiff_palette.sh \
-	bmp2tiff_rgb.sh \
-	gif2tiff.sh \
 	ppm2tiff_pbm.sh \
 	ppm2tiff_pgm.sh \
 	ppm2tiff_ppm.sh \
@@ -157,13 +154,6 @@ TIFFIMAGES = \
 	images/rgb-3c-8b.tiff \
 	images/quad-tile.jpg.tiff
 
-BMPIMAGES = \
-	images/palette-1c-8b.bmp \
-	images/rgb-3c-8b.bmp
-
-GIFIMAGES = \
-	images/palette-1c-8b.gif
-
 PNMIMAGES = \
 	images/minisblack-1c-8b.pgm \
 	images/miniswhite-1c-1b.pbm \
@@ -174,8 +164,6 @@ PNMIMAGES = \
 # files which are not currently used by the tests.
 IMAGES_EXTRA_DIST = \
 	images/README.txt \
-	$(BMPIMAGES) \
-	$(GIFIMAGES) \
 	$(PNMIMAGES) \
 	$(TIFFIMAGES)
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 0617b868..92a41653 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -410,13 +410,12 @@ am__set_TESTS_bases = \
 RECHECK_LOGS = $(TEST_LOGS)
 AM_RECURSIVE_TARGETS = check recheck
 @HAVE_JPEG_TRUE@am__EXEEXT_2 = tiff2rgba-quad-tile.jpg.sh
-am__EXEEXT_3 = bmp2tiff_palette.sh bmp2tiff_rgb.sh gif2tiff.sh \
-	ppm2tiff_pbm.sh ppm2tiff_pgm.sh ppm2tiff_ppm.sh tiffcp-g3.sh \
-	tiffcp-g3-1d.sh tiffcp-g3-1d-fill.sh tiffcp-g3-2d.sh \
-	tiffcp-g3-2d-fill.sh tiffcp-g4.sh tiffcp-logluv.sh \
-	tiffcp-thumbnail.sh tiffdump.sh tiffinfo.sh tiffcp-split.sh \
-	tiffcp-split-join.sh tiff2ps-PS1.sh tiff2ps-PS2.sh \
-	tiff2ps-PS3.sh tiff2ps-EPS1.sh tiff2pdf.sh \
+am__EXEEXT_3 = ppm2tiff_pbm.sh ppm2tiff_pgm.sh ppm2tiff_ppm.sh \
+	tiffcp-g3.sh tiffcp-g3-1d.sh tiffcp-g3-1d-fill.sh \
+	tiffcp-g3-2d.sh tiffcp-g3-2d-fill.sh tiffcp-g4.sh \
+	tiffcp-logluv.sh tiffcp-thumbnail.sh tiffdump.sh tiffinfo.sh \
+	tiffcp-split.sh tiffcp-split-join.sh tiff2ps-PS1.sh \
+	tiff2ps-PS2.sh tiff2ps-PS3.sh tiff2ps-EPS1.sh tiff2pdf.sh \
 	tiffcrop-doubleflip-logluv-3c-16b.sh \
 	tiffcrop-doubleflip-minisblack-1c-16b.sh \
 	tiffcrop-doubleflip-minisblack-1c-8b.sh \
@@ -658,9 +657,6 @@ CLEANFILES = test_packbits.tif o-*
 
 # Test scripts to execute
 TESTSCRIPTS = \
-	bmp2tiff_palette.sh \
-	bmp2tiff_rgb.sh \
-	gif2tiff.sh \
 	ppm2tiff_pbm.sh \
 	ppm2tiff_pgm.sh \
 	ppm2tiff_ppm.sh \
@@ -750,13 +746,6 @@ TIFFIMAGES = \
 	images/rgb-3c-8b.tiff \
 	images/quad-tile.jpg.tiff
 
-BMPIMAGES = \
-	images/palette-1c-8b.bmp \
-	images/rgb-3c-8b.bmp
-
-GIFIMAGES = \
-	images/palette-1c-8b.gif
-
 PNMIMAGES = \
 	images/minisblack-1c-8b.pgm \
 	images/miniswhite-1c-1b.pbm \
@@ -768,8 +757,6 @@ PNMIMAGES = \
 # files which are not currently used by the tests.
 IMAGES_EXTRA_DIST = \
 	images/README.txt \
-	$(BMPIMAGES) \
-	$(GIFIMAGES) \
 	$(PNMIMAGES) \
 	$(TIFFIMAGES)
 
@@ -1146,27 +1133,6 @@ raw_decode.log: raw_decode$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-bmp2tiff_palette.sh.log: bmp2tiff_palette.sh
-	@p='bmp2tiff_palette.sh'; \
-	b='bmp2tiff_palette.sh'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-bmp2tiff_rgb.sh.log: bmp2tiff_rgb.sh
-	@p='bmp2tiff_rgb.sh'; \
-	b='bmp2tiff_rgb.sh'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-gif2tiff.sh.log: gif2tiff.sh
-	@p='gif2tiff.sh'; \
-	b='gif2tiff.sh'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 ppm2tiff_pbm.sh.log: ppm2tiff_pbm.sh
 	@p='ppm2tiff_pbm.sh'; \
 	b='ppm2tiff_pbm.sh'; \
diff --git a/test/bmp2tiff_palette.sh b/test/bmp2tiff_palette.sh
deleted file mode 100755
index 1992623e..00000000
--- a/test/bmp2tiff_palette.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Generated file, master is Makefile.am
-. ${srcdir:-.}/common.sh
-infile="$IMG_PALETTE_1C_8B_BMP"
-outfile="o-bmp2tiff_palette.tiff"
-f_test_convert "$BMP2TIFF" $infile $outfile
-f_tiffinfo_validate $outfile
diff --git a/test/bmp2tiff_rgb.sh b/test/bmp2tiff_rgb.sh
deleted file mode 100755
index 2e940ce4..00000000
--- a/test/bmp2tiff_rgb.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Generated file, master is Makefile.am
-. ${srcdir:-.}/common.sh
-infile="$IMG_RGB_3C_8B_BMP"
-outfile="o-bmp2tiff_rgb.tiff"
-f_test_convert "$BMP2TIFF" $infile $outfile
-f_tiffinfo_validate $outfile
diff --git a/test/common.sh b/test/common.sh
index 643104b2..6f9b2820 100644
--- a/test/common.sh
+++ b/test/common.sh
@@ -9,13 +9,10 @@ TOOLS=`cd ../tools && pwd`
 IMAGES="${SRCDIR}/images"
 
 # Aliases for built tools
-BMP2TIFF=${TOOLS}/bmp2tiff
 FAX2PS=${TOOLS}/fax2ps
 FAX2TIFF=${TOOLS}/fax2tiff
-GIF2TIFF=${TOOLS}/gif2tiff
 PAL2RGB=${TOOLS}/pal2rgb
 PPM2TIFF=${TOOLS}/ppm2tiff
-RAS2TIFF=${TOOLS}/ras2tiff
 RAW2TIFF=${TOOLS}/raw2tiff
 RGB2YCBCR=${TOOLS}/rgb2ycbcr
 THUMBNAIL=${TOOLS}/thumbnail
@@ -44,11 +41,6 @@ IMG_RGB_3C_16B=${IMAGES}/rgb-3c-16b.tiff
 IMG_RGB_3C_8B=${IMAGES}/rgb-3c-8b.tiff
 IMG_MINISBLACK_2C_8B_ALPHA=${IMAGES}/minisblack-2c-8b-alpha.tiff
 
-IMG_PALETTE_1C_8B_BMP=${IMAGES}/palette-1c-8b.bmp
-IMG_RGB_3C_8B_BMP=${IMAGES}/rgb-3c-8b.bmp
-
-IMG_PALETTE_1C_8B_GIF=${IMAGES}/palette-1c-8b.gif
-
 IMG_MINISWHITE_1C_1B_PBM=${IMAGES}/miniswhite-1c-1b.pbm
 IMG_MINISBLACK_1C_8B_PGM=${IMAGES}/minisblack-1c-8b.pgm
 IMG_RGB_3C_8B_PPM=${IMAGES}/rgb-3c-8b.ppm
diff --git a/test/gif2tiff.sh b/test/gif2tiff.sh
deleted file mode 100755
index 6bf9a124..00000000
--- a/test/gif2tiff.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Generated file, master is Makefile.am
-. ${srcdir:-.}/common.sh
-infile="$IMG_PALETTE_1C_8B_GIF"
-outfile="o-gif2tiff.tiff"
-f_test_convert "$GIF2TIFF" $infile $outfile
-f_tiffinfo_validate $outfile
diff --git a/test/images/palette-1c-8b.bmp b/test/images/palette-1c-8b.bmp
deleted file mode 100644
index 215f4c50..00000000
--- a/test/images/palette-1c-8b.bmp
+++ /dev/null
diff --git a/test/images/palette-1c-8b.gif b/test/images/palette-1c-8b.gif
deleted file mode 100644
index f83dfa38..00000000
--- a/test/images/palette-1c-8b.gif
+++ /dev/null
diff --git a/test/images/rgb-3c-8b.bmp b/test/images/rgb-3c-8b.bmp
deleted file mode 100644
index e6a86dcb..00000000
--- a/test/images/rgb-3c-8b.bmp
+++ /dev/null