* 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.

ChangeLog

@@ -1,3 +1,13 @@
+2016-06-05  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* 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.
+
 2016-05-10  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* libtiff/tif_config.vc.h (HAVE_SNPRINTF): Add a '1' to the

archive/man/bmp2tiff.1

@@ -1,4 +1,4 @@
-.\" $Id: bmp2tiff.1,v 1.7 2006-04-20 12:17:19 dron Exp $
+.\" $Id: bmp2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 2004, Andrey Kiselev <dron@ak4719.spb.edu> 
 .\"

archive/man/gif2tiff.1

@@ -1,4 +1,4 @@
-.\" $Id: gif2tiff.1,v 1.4 2006-04-20 12:17:19 dron Exp $
+.\" $Id: gif2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.

archive/man/ras2tiff.1

@@ -1,4 +1,4 @@
-.\" $Id: ras2tiff.1,v 1.4 2006-04-20 12:17:19 dron Exp $
+.\" $Id: ras2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1990-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.

archive/man/sgi2tiff.1

@@ -1,4 +1,4 @@
-.\" $Id: sgi2tiff.1,v 1.4 2006-04-20 12:17:19 dron Exp $
+.\" $Id: sgi2tiff.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1991-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.

archive/man/tiffsv.1

@@ -1,4 +1,4 @@
-.\" $Id: tiffsv.1,v 1.3 2005-11-02 11:07:19 dron Exp $
+.\" $Id: tiffsv.1,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.

archive/tools/bmp2tiff.c

@@ -1,4 +1,4 @@
-/* $Id: bmp2tiff.c,v 1.27 2015-08-19 02:31:04 bfriesen Exp $
+/* $Id: bmp2tiff.c,v 1.1 2016-06-05 19:53:59 bfriesen Exp $
  *
  * Project:  libtiff tools
  * Purpose:  Convert Windows BMP files in TIFF.

archive/tools/gif2tiff.c

@@ -1,4 +1,4 @@
-/* $Id: gif2tiff.c,v 1.18 2015-06-21 01:09:10 bfriesen Exp $ */
+/* $Id: gif2tiff.c,v 1.1 2016-06-05 19:53:59 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler

archive/tools/ras2tiff.c

@@ -1,4 +1,4 @@
-/* $Id: ras2tiff.c,v 1.22 2015-06-21 01:09:10 bfriesen Exp $ */
+/* $Id: ras2tiff.c,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler

archive/tools/rasterfile.h

@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/rasterfile.h,v 1.4 2015-05-28 03:30:42 bfriesen Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/archive/tools/rasterfile.h,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
 
 #include "tiff.h"
 

archive/tools/sgi2tiff.c

@@ -1,4 +1,4 @@
-/* $Id: sgi2tiff.c,v 1.7 2015-06-21 01:09:10 bfriesen Exp $ */
+/* $Id: sgi2tiff.c,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler

archive/tools/sgisv.c

@@ -1,4 +1,4 @@
-/* $Id: sgisv.c,v 1.7 2015-06-21 01:09:10 bfriesen Exp $ */
+/* $Id: sgisv.c,v 1.1 2016-06-05 19:54:00 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler

html/man/CMakeLists.txt

@@ -69,16 +69,12 @@ set(docfiles
     TIFFWriteRawTile.3tiff.html
     TIFFWriteScanline.3tiff.html
     TIFFWriteTile.3tiff.html
-    bmp2tiff.1.html
     fax2ps.1.html
     fax2tiff.1.html
-    gif2tiff.1.html
     pal2rgb.1.html
     ppm2tiff.1.html
-    ras2tiff.1.html
     raw2tiff.1.html
     rgb2ycbcr.1.html
-    sgi2tiff.1.html
     thumbnail.1.html
     tiff2bw.1.html
     tiff2pdf.1.html
@@ -93,8 +89,7 @@ set(docfiles
     tiffinfo.1.html
     tiffmedian.1.html
     tiffset.1.html
-    tiffsplit.1.html
+    tiffsplit.1.html)
-    tiffsv.1.html)
 
 set(doc_DATA ${indexfile} ${docfiles})
 

html/man/Makefile.am

@@ -76,16 +76,12 @@ docfiles = \
 	TIFFWriteRawTile.3tiff.html \
 	TIFFWriteScanline.3tiff.html \
 	TIFFWriteTile.3tiff.html \
-	bmp2tiff.1.html \
 	fax2ps.1.html \
 	fax2tiff.1.html \
-	gif2tiff.1.html \
 	pal2rgb.1.html \
 	ppm2tiff.1.html \
-	ras2tiff.1.html \
 	raw2tiff.1.html \
 	rgb2ycbcr.1.html \
-	sgi2tiff.1.html \
 	thumbnail.1.html \
 	tiff2bw.1.html \
 	tiff2pdf.1.html \
@@ -100,8 +96,7 @@ docfiles = \
 	tiffinfo.1.html \
 	tiffmedian.1.html \
 	tiffset.1.html \
-	tiffsplit.1.html \
+	tiffsplit.1.html
-	tiffsv.1.html
 
 dist_doc_DATA = $(indexfile) $(docfiles)
 

html/man/Makefile.in

@@ -378,16 +378,12 @@ docfiles = \
 	TIFFWriteRawTile.3tiff.html \
 	TIFFWriteScanline.3tiff.html \
 	TIFFWriteTile.3tiff.html \
-	bmp2tiff.1.html \
 	fax2ps.1.html \
 	fax2tiff.1.html \
-	gif2tiff.1.html \
 	pal2rgb.1.html \
 	ppm2tiff.1.html \
-	ras2tiff.1.html \
 	raw2tiff.1.html \
 	rgb2ycbcr.1.html \
-	sgi2tiff.1.html \
 	thumbnail.1.html \
 	tiff2bw.1.html \
 	tiff2pdf.1.html \
@@ -402,8 +398,7 @@ docfiles = \
 	tiffinfo.1.html \
 	tiffmedian.1.html \
 	tiffset.1.html \
-	tiffsplit.1.html \
+	tiffsplit.1.html
-	tiffsv.1.html
 
 dist_doc_DATA = $(indexfile) $(docfiles)
 INDEXSTART = '<HTML><HEAD><TITLE>Libtiff HTML manpage index</TITLE></HEAD><BODY BGCOLOR=white><ul><H2>Man Pages</h2><p>'

html/tools.html

@@ -26,21 +26,10 @@ examples for writing programs to display and save TIFF images.
 The software makes extensive use of the <tt>TIFFRGBAImage</tt>
 facilities described elsewhere.</td>
 </tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/tiffsv.1.html">tiffsv</a></tt></td>
-<td>A program to save all or part of a screen dump on a Silicon
-Graphics system. As for <tt>tiffgt</tt> this code, while written to
-use the IRIS GL, can be easily tailored to other devices.</td>
-</tr>
 </table>
 <h3>Device-independent Programs</h3>
 The remaining programs should be device-independent:
 <table border cellpadding="3">
-<tr>
-<td valign="top" width="10%"><tt><a href="man/bmp2tiff.1.html">bmp2tiff</a></tt></td>
-<td>Convert BMP images to TIFF</td>
-</tr>
-<tr>
 <td valign="top" width="10%"><tt><a href="man/fax2ps.1.html">fax2ps</a></tt></td>
 <td>Convert a Group 3- or Group 4- compressed TIFF to PostScript
 that is significantly more compressed than is generated by
@@ -50,11 +39,6 @@ that is significantly more compressed than is generated by
 <td valign="top" width="10%"><tt><a href="man/fax2tiff.1.html">fax2tiff</a></tt></td>
 <td>Convert raw Group 3 or Group 4 facsimile data to TIFF</td>
 </tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/gif2tiff.1.html">gif2tiff</a></tt></td>
-<td>A quick hack that converts GIF 87a (old) format images to TIFF</td>
-</tr>
-<tr>
 <td valign="top" width="10%"><tt><a href="man/pal2rgb.1.html">pal2rgb</a></tt></td>
 <td>Convert a Palette-style image to a full color RGB image by
 applying the colormap</td>
@@ -63,12 +47,6 @@ applying the colormap</td>
 <td valign="top" width="10%"><tt><a href="man/ppm2tiff.1.html">ppm2tiff</a></tt></td>
 <td>A quick hack that converts 8-bit PPM format images to TIFF</td>
 </tr>
-<tr>
-<td valign="top" width="10%"><tt><a href="man/ras2tiff.1.html">ras2tiff</a></tt></td>
-<td>A quick hack that converts Sun rasterfile format images to TIFF
--- it's less than complete</td>
-</tr>
-<tr>
 <td valign="top" width="10%"><tt><a href="man/raw2tiff.1.html">raw2tiff</a></tt></td>
 <td>Create a TIFF file from raw data</td>
 </tr>
@@ -78,11 +56,6 @@ applying the colormap</td>
 TIFF image; it's mainly provided for testing</td>
 </tr>
 <tr>
-<td valign="top" width="10%"><tt><a href="man/sgi2tiff.1.html">sgi2tiff</a></tt></td>
-<td>A program to convert SGI image files to TIFF. This program is
-only useful on SGI machines as it uses <tt>-limage</tt>.</td>
-</tr>
-<tr>
 <td valign="top" width="10%"><tt><a href="man/thumbnail.1.html">thumbnail</a></tt></tt></td>
 <td>Copy a bilevel TIFF to one that includes 8-bit greyscale
 "thumbnail images" for each page; it is provided as an example of
@@ -159,6 +132,6 @@ multi-image file</td>
 <p>Check out the manual pages for details about the above
 programs.</p>
 <hr>
-Last updated: $Date: 2009-10-28 22:13:37 $
+Last updated: $Date: 2016-06-05 19:54:00 $
 </body>
 </html>

man/CMakeLists.txt

@@ -23,16 +23,12 @@
 # OF THIS SOFTWARE.
 
 set(man1_MANS
-  bmp2tiff.1
   fax2ps.1
   fax2tiff.1
-  gif2tiff.1
   pal2rgb.1
   ppm2tiff.1
-  ras2tiff.1
   raw2tiff.1
   rgb2ycbcr.1
-  sgi2tiff.1
   thumbnail.1
   tiff2bw.1
   tiff2pdf.1
@@ -47,8 +43,7 @@ set(man1_MANS
   tiffinfo.1
   tiffmedian.1
   tiffset.1
-  tiffsplit.1
+  tiffsplit.1)
-  tiffsv.1)
 
 set(man3_MANS
   libtiff.3tiff

man/Makefile.am

@@ -24,16 +24,12 @@
 # Process this file with automake to produce Makefile.in.
 
 dist_man1_MANS = \
-	bmp2tiff.1 \
 	fax2ps.1 \
 	fax2tiff.1 \
-	gif2tiff.1 \
 	pal2rgb.1 \
 	ppm2tiff.1 \
-	ras2tiff.1 \
 	raw2tiff.1 \
 	rgb2ycbcr.1 \
-	sgi2tiff.1 \
 	thumbnail.1 \
 	tiff2bw.1 \
 	tiff2pdf.1 \
@@ -48,8 +44,7 @@ dist_man1_MANS = \
 	tiffinfo.1 \
 	tiffmedian.1 \
 	tiffset.1 \
-	tiffsplit.1 \
+	tiffsplit.1
-	tiffsv.1
 
 dist_man3_MANS = \
 	libtiff.3tiff \

man/Makefile.in

@@ -330,16 +330,12 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 dist_man1_MANS = \
-	bmp2tiff.1 \
 	fax2ps.1 \
 	fax2tiff.1 \
-	gif2tiff.1 \
 	pal2rgb.1 \
 	ppm2tiff.1 \
-	ras2tiff.1 \
 	raw2tiff.1 \
 	rgb2ycbcr.1 \
-	sgi2tiff.1 \
 	thumbnail.1 \
 	tiff2bw.1 \
 	tiff2pdf.1 \
@@ -354,8 +350,7 @@ dist_man1_MANS = \
 	tiffinfo.1 \
 	tiffmedian.1 \
 	tiffset.1 \
-	tiffsplit.1 \
+	tiffsplit.1
-	tiffsv.1
 
 dist_man3_MANS = \
 	libtiff.3tiff \

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)
 

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 \
+am__EXEEXT_3 = ppm2tiff_pbm.sh ppm2tiff_pgm.sh ppm2tiff_ppm.sh \
-	ppm2tiff_pbm.sh ppm2tiff_pgm.sh ppm2tiff_ppm.sh tiffcp-g3.sh \
+	tiffcp-g3.sh tiffcp-g3-1d.sh tiffcp-g3-1d-fill.sh \
-	tiffcp-g3-1d.sh tiffcp-g3-1d-fill.sh tiffcp-g3-2d.sh \
+	tiffcp-g3-2d.sh tiffcp-g3-2d-fill.sh tiffcp-g4.sh \
-	tiffcp-g3-2d-fill.sh tiffcp-g4.sh tiffcp-logluv.sh \
+	tiffcp-logluv.sh tiffcp-thumbnail.sh tiffdump.sh tiffinfo.sh \
-	tiffcp-thumbnail.sh tiffdump.sh tiffinfo.sh tiffcp-split.sh \
+	tiffcp-split.sh tiffcp-split-join.sh tiff2ps-PS1.sh \
-	tiffcp-split-join.sh tiff2ps-PS1.sh tiff2ps-PS2.sh \
+	tiff2ps-PS2.sh tiff2ps-PS3.sh tiff2ps-EPS1.sh tiff2pdf.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'; \

test/bmp2tiff_palette.sh

@@ -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

test/bmp2tiff_rgb.sh

@@ -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

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

test/gif2tiff.sh

@@ -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

tools/CMakeLists.txt

@@ -29,27 +29,18 @@ include_directories(${PROJECT_SOURCE_DIR}/libtiff
                     ${PROJECT_SOURCE_DIR}/port
                     ${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(bmp2tiff bmp2tiff.c)
-target_link_libraries(bmp2tiff tiff port)
-
 add_executable(fax2ps fax2ps.c)
 target_link_libraries(fax2ps tiff port)
 
 add_executable(fax2tiff fax2tiff.c)
 target_link_libraries(fax2tiff tiff port)
 
-add_executable(gif2tiff gif2tiff.c)
-target_link_libraries(gif2tiff tiff port)
-
 add_executable(pal2rgb pal2rgb.c)
 target_link_libraries(pal2rgb tiff port)
 
 add_executable(ppm2tiff ppm2tiff.c)
 target_link_libraries(ppm2tiff tiff port)
 
-add_executable(ras2tiff ras2tiff.c rasterfile.h)
-target_link_libraries(ras2tiff tiff port)
-
 add_executable(raw2tiff raw2tiff.c)
 target_link_libraries(raw2tiff tiff port)
 
@@ -98,16 +89,11 @@ target_link_libraries(tiffset tiff port)
 add_executable(tiffsplit tiffsplit.c)
 target_link_libraries(tiffsplit tiff port)
 
-install(TARGETS bmp2tiff
+install(TARGETS fax2ps
-                fax2ps
                 fax2tiff
-                gif2tiff
                 pal2rgb
                 ppm2tiff
-                ras2tiff
                 raw2tiff
-                rgb2ycbcr
-                thumbnail
                 tiff2bw
                 tiff2pdf
                 tiff2ps

tools/Makefile.am

@@ -31,16 +31,11 @@ EXTRA_DIST = \
 	Makefile.vc
 
 bin_PROGRAMS = \
-	bmp2tiff \
 	fax2ps \
 	fax2tiff \
-	gif2tiff \
 	pal2rgb \
 	ppm2tiff \
-	ras2tiff \
 	raw2tiff \
-	rgb2ycbcr \
-	thumbnail \
 	tiff2bw \
 	tiff2pdf \
 	tiff2ps \
@@ -58,33 +53,29 @@ if HAVE_OPENGL
 bin_PROGRAMS += tiffgt
 endif
 
-EXTRA_PROGRAMS = sgi2tiff sgisv ycbcr
+EXTRA_PROGRAMS = rgb2ycbcr thumbnail
+
+# Executable programs which need to be built in order to support tests
+check_PROGRAMS = \
+	rgb2ycbcr \
+	thumbnail
 
 if HAVE_RPATH
 AM_LDFLAGS = $(LIBDIR)
 endif
 
-bmp2tiff_SOURCES = bmp2tiff.c
-bmp2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
-
 fax2ps_SOURCES = fax2ps.c
 fax2ps_LDADD = $(LIBTIFF) $(LIBPORT)
 
 fax2tiff_SOURCES = fax2tiff.c
 fax2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
 
-gif2tiff_SOURCES = gif2tiff.c
-gif2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
-
 pal2rgb_SOURCES = pal2rgb.c
 pal2rgb_LDADD = $(LIBTIFF) $(LIBPORT)
 
 ppm2tiff_SOURCES = ppm2tiff.c
 ppm2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
 
-ras2tiff_SOURCES = ras2tiff.c rasterfile.h
-ras2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
-
 raw2tiff_SOURCES = raw2tiff.c
 raw2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
 

tools/Makefile.in

@@ -113,16 +113,16 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = bmp2tiff$(EXEEXT) fax2ps$(EXEEXT) fax2tiff$(EXEEXT) \
+bin_PROGRAMS = fax2ps$(EXEEXT) fax2tiff$(EXEEXT) pal2rgb$(EXEEXT) \
-	gif2tiff$(EXEEXT) pal2rgb$(EXEEXT) ppm2tiff$(EXEEXT) \
+	ppm2tiff$(EXEEXT) raw2tiff$(EXEEXT) tiff2bw$(EXEEXT) \
-	ras2tiff$(EXEEXT) raw2tiff$(EXEEXT) rgb2ycbcr$(EXEEXT) \
+	tiff2pdf$(EXEEXT) tiff2ps$(EXEEXT) tiff2rgba$(EXEEXT) \
-	thumbnail$(EXEEXT) tiff2bw$(EXEEXT) tiff2pdf$(EXEEXT) \
+	tiffcmp$(EXEEXT) tiffcp$(EXEEXT) tiffcrop$(EXEEXT) \
-	tiff2ps$(EXEEXT) tiff2rgba$(EXEEXT) tiffcmp$(EXEEXT) \
+	tiffdither$(EXEEXT) tiffdump$(EXEEXT) tiffinfo$(EXEEXT) \
-	tiffcp$(EXEEXT) tiffcrop$(EXEEXT) tiffdither$(EXEEXT) \
+	tiffmedian$(EXEEXT) tiffset$(EXEEXT) tiffsplit$(EXEEXT) \
-	tiffdump$(EXEEXT) tiffinfo$(EXEEXT) tiffmedian$(EXEEXT) \
+	$(am__EXEEXT_1)
-	tiffset$(EXEEXT) tiffsplit$(EXEEXT) $(am__EXEEXT_1)
 @HAVE_OPENGL_TRUE@am__append_1 = tiffgt
-EXTRA_PROGRAMS = sgi2tiff$(EXEEXT) sgisv$(EXEEXT) ycbcr$(EXEEXT)
+EXTRA_PROGRAMS = rgb2ycbcr$(EXEEXT) thumbnail$(EXEEXT)
+check_PROGRAMS = rgb2ycbcr$(EXEEXT) thumbnail$(EXEEXT)
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
@@ -140,43 +140,28 @@ CONFIG_CLEAN_VPATH_FILES =
 @HAVE_OPENGL_TRUE@am__EXEEXT_1 = tiffgt$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_bmp2tiff_OBJECTS = bmp2tiff.$(OBJEXT)
+am_fax2ps_OBJECTS = fax2ps.$(OBJEXT)
-bmp2tiff_OBJECTS = $(am_bmp2tiff_OBJECTS)
+fax2ps_OBJECTS = $(am_fax2ps_OBJECTS)
-bmp2tiff_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
+fax2ps_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-am_fax2ps_OBJECTS = fax2ps.$(OBJEXT)
-fax2ps_OBJECTS = $(am_fax2ps_OBJECTS)
-fax2ps_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
 am_fax2tiff_OBJECTS = fax2tiff.$(OBJEXT)
 fax2tiff_OBJECTS = $(am_fax2tiff_OBJECTS)
 fax2tiff_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
-am_gif2tiff_OBJECTS = gif2tiff.$(OBJEXT)
-gif2tiff_OBJECTS = $(am_gif2tiff_OBJECTS)
-gif2tiff_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
 am_pal2rgb_OBJECTS = pal2rgb.$(OBJEXT)
 pal2rgb_OBJECTS = $(am_pal2rgb_OBJECTS)
 pal2rgb_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
 am_ppm2tiff_OBJECTS = ppm2tiff.$(OBJEXT)
 ppm2tiff_OBJECTS = $(am_ppm2tiff_OBJECTS)
 ppm2tiff_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
-am_ras2tiff_OBJECTS = ras2tiff.$(OBJEXT)
-ras2tiff_OBJECTS = $(am_ras2tiff_OBJECTS)
-ras2tiff_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
 am_raw2tiff_OBJECTS = raw2tiff.$(OBJEXT)
 raw2tiff_OBJECTS = $(am_raw2tiff_OBJECTS)
 raw2tiff_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
 am_rgb2ycbcr_OBJECTS = rgb2ycbcr.$(OBJEXT)
 rgb2ycbcr_OBJECTS = $(am_rgb2ycbcr_OBJECTS)
 rgb2ycbcr_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
-sgi2tiff_SOURCES = sgi2tiff.c
-sgi2tiff_OBJECTS = sgi2tiff.$(OBJEXT)
-sgi2tiff_LDADD = $(LDADD)
-sgisv_SOURCES = sgisv.c
-sgisv_OBJECTS = sgisv.$(OBJEXT)
-sgisv_LDADD = $(LDADD)
 am_thumbnail_OBJECTS = thumbnail.$(OBJEXT)
 thumbnail_OBJECTS = $(am_thumbnail_OBJECTS)
 thumbnail_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
@@ -227,9 +212,6 @@ tiffset_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
 am_tiffsplit_OBJECTS = tiffsplit.$(OBJEXT)
 tiffsplit_OBJECTS = $(am_tiffsplit_OBJECTS)
 tiffsplit_DEPENDENCIES = $(LIBTIFF) $(LIBPORT)
-ycbcr_SOURCES = ycbcr.c
-ycbcr_OBJECTS = ycbcr.$(OBJEXT)
-ycbcr_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -264,24 +246,21 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(bmp2tiff_SOURCES) $(fax2ps_SOURCES) $(fax2tiff_SOURCES) \
+SOURCES = $(fax2ps_SOURCES) $(fax2tiff_SOURCES) $(pal2rgb_SOURCES) \
-	$(gif2tiff_SOURCES) $(pal2rgb_SOURCES) $(ppm2tiff_SOURCES) \
+	$(ppm2tiff_SOURCES) $(raw2tiff_SOURCES) $(rgb2ycbcr_SOURCES) \
-	$(ras2tiff_SOURCES) $(raw2tiff_SOURCES) $(rgb2ycbcr_SOURCES) \
+	$(thumbnail_SOURCES) $(tiff2bw_SOURCES) $(tiff2pdf_SOURCES) \
-	sgi2tiff.c sgisv.c $(thumbnail_SOURCES) $(tiff2bw_SOURCES) \
+	$(tiff2ps_SOURCES) $(tiff2rgba_SOURCES) $(tiffcmp_SOURCES) \
+	$(tiffcp_SOURCES) $(tiffcrop_SOURCES) $(tiffdither_SOURCES) \
+	$(tiffdump_SOURCES) $(tiffgt_SOURCES) $(tiffinfo_SOURCES) \
+	$(tiffmedian_SOURCES) $(tiffset_SOURCES) $(tiffsplit_SOURCES)
+DIST_SOURCES = $(fax2ps_SOURCES) $(fax2tiff_SOURCES) \
+	$(pal2rgb_SOURCES) $(ppm2tiff_SOURCES) $(raw2tiff_SOURCES) \
+	$(rgb2ycbcr_SOURCES) $(thumbnail_SOURCES) $(tiff2bw_SOURCES) \
 	$(tiff2pdf_SOURCES) $(tiff2ps_SOURCES) $(tiff2rgba_SOURCES) \
 	$(tiffcmp_SOURCES) $(tiffcp_SOURCES) $(tiffcrop_SOURCES) \
 	$(tiffdither_SOURCES) $(tiffdump_SOURCES) $(tiffgt_SOURCES) \
 	$(tiffinfo_SOURCES) $(tiffmedian_SOURCES) $(tiffset_SOURCES) \
-	$(tiffsplit_SOURCES) ycbcr.c
+	$(tiffsplit_SOURCES)
-DIST_SOURCES = $(bmp2tiff_SOURCES) $(fax2ps_SOURCES) \
-	$(fax2tiff_SOURCES) $(gif2tiff_SOURCES) $(pal2rgb_SOURCES) \
-	$(ppm2tiff_SOURCES) $(ras2tiff_SOURCES) $(raw2tiff_SOURCES) \
-	$(rgb2ycbcr_SOURCES) sgi2tiff.c sgisv.c $(thumbnail_SOURCES) \
-	$(tiff2bw_SOURCES) $(tiff2pdf_SOURCES) $(tiff2ps_SOURCES) \
-	$(tiff2rgba_SOURCES) $(tiffcmp_SOURCES) $(tiffcp_SOURCES) \
-	$(tiffcrop_SOURCES) $(tiffdither_SOURCES) $(tiffdump_SOURCES) \
-	$(tiffgt_SOURCES) $(tiffinfo_SOURCES) $(tiffmedian_SOURCES) \
-	$(tiffset_SOURCES) $(tiffsplit_SOURCES) ycbcr.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -464,20 +443,14 @@ EXTRA_DIST = \
 	Makefile.vc
 
 @HAVE_RPATH_TRUE@AM_LDFLAGS = $(LIBDIR)
-bmp2tiff_SOURCES = bmp2tiff.c
-bmp2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
 fax2ps_SOURCES = fax2ps.c
 fax2ps_LDADD = $(LIBTIFF) $(LIBPORT)
 fax2tiff_SOURCES = fax2tiff.c
 fax2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
-gif2tiff_SOURCES = gif2tiff.c
-gif2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
 pal2rgb_SOURCES = pal2rgb.c
 pal2rgb_LDADD = $(LIBTIFF) $(LIBPORT)
 ppm2tiff_SOURCES = ppm2tiff.c
 ppm2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
-ras2tiff_SOURCES = ras2tiff.c rasterfile.h
-ras2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
 raw2tiff_SOURCES = raw2tiff.c
 raw2tiff_LDADD = $(LIBTIFF) $(LIBPORT)
 rgb2ycbcr_SOURCES = rgb2ycbcr.c
@@ -597,9 +570,14 @@ clean-binPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list
 
-bmp2tiff$(EXEEXT): $(bmp2tiff_OBJECTS) $(bmp2tiff_DEPENDENCIES) $(EXTRA_bmp2tiff_DEPENDENCIES) 
+clean-checkPROGRAMS:
-	@rm -f bmp2tiff$(EXEEXT)
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	$(AM_V_CCLD)$(LINK) $(bmp2tiff_OBJECTS) $(bmp2tiff_LDADD) $(LIBS)
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 fax2ps$(EXEEXT): $(fax2ps_OBJECTS) $(fax2ps_DEPENDENCIES) $(EXTRA_fax2ps_DEPENDENCIES) 
 	@rm -f fax2ps$(EXEEXT)
@@ -609,10 +587,6 @@ fax2tiff$(EXEEXT): $(fax2tiff_OBJECTS) $(fax2tiff_DEPENDENCIES) $(EXTRA_fax2tiff
 	@rm -f fax2tiff$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(fax2tiff_OBJECTS) $(fax2tiff_LDADD) $(LIBS)
 
-gif2tiff$(EXEEXT): $(gif2tiff_OBJECTS) $(gif2tiff_DEPENDENCIES) $(EXTRA_gif2tiff_DEPENDENCIES) 
-	@rm -f gif2tiff$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(gif2tiff_OBJECTS) $(gif2tiff_LDADD) $(LIBS)
-
 pal2rgb$(EXEEXT): $(pal2rgb_OBJECTS) $(pal2rgb_DEPENDENCIES) $(EXTRA_pal2rgb_DEPENDENCIES) 
 	@rm -f pal2rgb$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pal2rgb_OBJECTS) $(pal2rgb_LDADD) $(LIBS)
@@ -621,10 +595,6 @@ ppm2tiff$(EXEEXT): $(ppm2tiff_OBJECTS) $(ppm2tiff_DEPENDENCIES) $(EXTRA_ppm2tiff
 	@rm -f ppm2tiff$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(ppm2tiff_OBJECTS) $(ppm2tiff_LDADD) $(LIBS)
 
-ras2tiff$(EXEEXT): $(ras2tiff_OBJECTS) $(ras2tiff_DEPENDENCIES) $(EXTRA_ras2tiff_DEPENDENCIES) 
-	@rm -f ras2tiff$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(ras2tiff_OBJECTS) $(ras2tiff_LDADD) $(LIBS)
-
 raw2tiff$(EXEEXT): $(raw2tiff_OBJECTS) $(raw2tiff_DEPENDENCIES) $(EXTRA_raw2tiff_DEPENDENCIES) 
 	@rm -f raw2tiff$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(raw2tiff_OBJECTS) $(raw2tiff_LDADD) $(LIBS)
@@ -633,14 +603,6 @@ rgb2ycbcr$(EXEEXT): $(rgb2ycbcr_OBJECTS) $(rgb2ycbcr_DEPENDENCIES) $(EXTRA_rgb2y
 	@rm -f rgb2ycbcr$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(rgb2ycbcr_OBJECTS) $(rgb2ycbcr_LDADD) $(LIBS)
 
-sgi2tiff$(EXEEXT): $(sgi2tiff_OBJECTS) $(sgi2tiff_DEPENDENCIES) $(EXTRA_sgi2tiff_DEPENDENCIES) 
-	@rm -f sgi2tiff$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(sgi2tiff_OBJECTS) $(sgi2tiff_LDADD) $(LIBS)
-
-sgisv$(EXEEXT): $(sgisv_OBJECTS) $(sgisv_DEPENDENCIES) $(EXTRA_sgisv_DEPENDENCIES) 
-	@rm -f sgisv$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(sgisv_OBJECTS) $(sgisv_LDADD) $(LIBS)
-
 thumbnail$(EXEEXT): $(thumbnail_OBJECTS) $(thumbnail_DEPENDENCIES) $(EXTRA_thumbnail_DEPENDENCIES) 
 	@rm -f thumbnail$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS)
@@ -701,27 +663,18 @@ tiffsplit$(EXEEXT): $(tiffsplit_OBJECTS) $(tiffsplit_DEPENDENCIES) $(EXTRA_tiffs
 	@rm -f tiffsplit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(tiffsplit_OBJECTS) $(tiffsplit_LDADD) $(LIBS)
 
-ycbcr$(EXEEXT): $(ycbcr_OBJECTS) $(ycbcr_DEPENDENCIES) $(EXTRA_ycbcr_DEPENDENCIES) 
-	@rm -f ycbcr$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(ycbcr_OBJECTS) $(ycbcr_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bmp2tiff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fax2ps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fax2tiff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif2tiff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pal2rgb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppm2tiff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ras2tiff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw2tiff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb2ycbcr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgi2tiff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgisv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thumbnail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tiff2bw.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tiff2pdf.Po@am__quote@
@@ -737,7 +690,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tiffmedian.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tiffset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tiffsplit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ycbcr.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -863,6 +815,7 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
@@ -901,7 +854,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-checkPROGRAMS clean-generic \
+	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -969,18 +923,19 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	ctags ctags-am distclean distclean-compile distclean-generic \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	distclean-compile distclean-generic distclean-libtool \
-	html-am info info-am install install-am install-binPROGRAMS \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install-data install-data-am install-dvi install-dvi-am \
+	install install-am install-binPROGRAMS install-data \
-	install-exec install-exec-am install-html install-html-am \
+	install-data-am install-dvi install-dvi-am install-exec \
-	install-info install-info-am install-man install-pdf \
+	install-exec-am install-html install-html-am install-info \
-	install-pdf-am install-ps install-ps-am install-strip \
+	install-info-am install-man install-pdf install-pdf-am \
-	installcheck installcheck-am installdirs maintainer-clean \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS

tools/Makefile.lcc

@@ -1,4 +1,4 @@
-# $Header: /cvs/maptools/cvsroot/libtiff/tools/Makefile.lcc,v 1.4 2006-04-20 12:36:23 dron Exp $
+# $Header: /cvs/maptools/cvsroot/libtiff/tools/Makefile.lcc,v 1.5 2016-06-05 19:54:03 bfriesen Exp $
 #
 # TIFF Library Tools
 #
@@ -47,7 +47,6 @@ LIBS=	-l${LIBTIFF} -lm
 MACHALL=ras2tiff.ttp
 OBJS=\
 	fax2tiff.o \
-	gif2tiff.o \
 	pal2rgb.o \
 	ppm2tiff.o \
 	rgb2ycbcr.o \
@@ -61,13 +60,11 @@ OBJS=\
 	tiffinfo.o \
 	tiffmedian.o \
 	tiffsplit.o \
-	ras2tiff.o \
 	raw2tiff.o \
 	${GETOPT} \
 	${NULL}
 ALL=\
 	fax2tiff.ttp \
-	gif2tiff.ttp \
 	pal2rgb.ttp \
 	ppm2tiff.ttp \
 	rgb2ycbcr.ttp \
@@ -120,15 +117,9 @@ pal2rgb.ttp: pal2rgb.c ${LIBTIFF}
 # convert RGB image to YCbCr
 rgb2ycbcr.ttp: rgb2ycbcr.c ${GETOPT} ${LIBTIFF}
 	${CC} -o rgb2ycbcr.ttp ${CFLAGS} rgb2ycbcr.c ${GETOPT} ${LIBS}
-# GIF converter
-gif2tiff.ttp: gif2tiff.c ${LIBTIFF}
-	${CC} -o gif2tiff.ttp ${CFLAGS} gif2tiff.c ${LIBS}
 # PBM converter
 ppm2tiff.ttp: ppm2tiff.c ${LIBTIFF}
 	${CC} -o ppm2tiff.ttp ${CFLAGS} ppm2tiff.c ${LIBS}
-# Sun rasterfile converter
-ras2tiff.ttp: ras2tiff.c ${LIBTIFF}
-	${CC} -o ras2tiff.ttp ${CFLAGS} ras2tiff.c ${LIBS}
 # convert raw images to TIFFs
 raw2tiff.ttp: raw2tiff.c ${LIBTIFF}
 	${CC} -o raw2tiff.ttp ${CFLAGS} raw2tiff.c ${LIBS}

tools/Makefile.vc

@@ -1,4 +1,4 @@
-# $Id: Makefile.vc,v 1.15 2009-01-22 20:53:07 fwarmerdam Exp $
+# $Id: Makefile.vc,v 1.16 2016-06-05 19:54:03 bfriesen Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
 #
@@ -28,9 +28,9 @@
 
 !INCLUDE ..\nmake.opt
 
-TARGETS	=	bmp2tiff.exe tiffinfo.exe tiffdump.exe fax2tiff.exe \
+TARGETS	=	tiffinfo.exe tiffdump.exe fax2tiff.exe \
-		fax2ps.exe gif2tiff.exe pal2rgb.exe ppm2tiff.exe \
+		fax2ps.exe pal2rgb.exe ppm2tiff.exe \
-		rgb2ycbcr.exe thumbnail.exe ras2tiff.exe raw2tiff.exe \
+		rgb2ycbcr.exe thumbnail.exe raw2tiff.exe \
 		tiff2bw.exe tiff2rgba.exe tiff2pdf.exe tiff2ps.exe \
 		tiffcmp.exe tiffcp.exe tiffcrop.exe tiffdither.exe \
 		tiffmedian.exe tiffset.exe tiffsplit.exe