From 30366c9f226593f37623bfd235274aeac1e575ad Mon Sep 17 00:00:00 2001 From: Bob Friesenhahn Date: Sun, 5 Jun 2016 19:53:59 +0000 Subject: [PATCH] * 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 | 10 ++ {html => archive/html}/man/bmp2tiff.1.html | 0 {html => archive/html}/man/gif2tiff.1.html | 0 {html => archive/html}/man/ras2tiff.1.html | 0 {html => archive/html}/man/sgi2tiff.1.html | 0 {html => archive/html}/man/tiffsv.1.html | 0 {man => archive/man}/bmp2tiff.1 | 2 +- {man => archive/man}/gif2tiff.1 | 2 +- {man => archive/man}/ras2tiff.1 | 2 +- {man => archive/man}/sgi2tiff.1 | 2 +- {man => archive/man}/tiffsv.1 | 2 +- {tools => archive/tools}/bmp2tiff.c | 2 +- {tools => archive/tools}/gif2tiff.c | 2 +- {tools => archive/tools}/ras2tiff.c | 2 +- {tools => archive/tools}/rasterfile.h | 2 +- {tools => archive/tools}/sgi2tiff.c | 2 +- {tools => archive/tools}/sgisv.c | 2 +- {tools => archive/tools}/ycbcr.c | 0 html/man/CMakeLists.txt | 7 +- html/man/Makefile.am | 7 +- html/man/Makefile.in | 7 +- html/tools.html | 29 +---- man/CMakeLists.txt | 7 +- man/Makefile.am | 7 +- man/Makefile.in | 7 +- test/Makefile.am | 12 -- test/Makefile.in | 46 +------ test/bmp2tiff_palette.sh | 7 -- test/bmp2tiff_rgb.sh | 7 -- test/common.sh | 8 -- test/gif2tiff.sh | 7 -- test/images/palette-1c-8b.bmp | Bin 24954 -> 0 bytes test/images/palette-1c-8b.gif | Bin 21614 -> 0 bytes test/images/rgb-3c-8b.bmp | Bin 71298 -> 0 bytes tools/CMakeLists.txt | 16 +-- tools/Makefile.am | 21 +--- tools/Makefile.in | 135 +++++++-------------- tools/Makefile.lcc | 11 +- tools/Makefile.vc | 8 +- 39 files changed, 91 insertions(+), 290 deletions(-) rename {html => archive/html}/man/bmp2tiff.1.html (100%) rename {html => archive/html}/man/gif2tiff.1.html (100%) rename {html => archive/html}/man/ras2tiff.1.html (100%) rename {html => archive/html}/man/sgi2tiff.1.html (100%) rename {html => archive/html}/man/tiffsv.1.html (100%) rename {man => archive/man}/bmp2tiff.1 (97%) rename {man => archive/man}/gif2tiff.1 (97%) rename {man => archive/man}/ras2tiff.1 (97%) rename {man => archive/man}/sgi2tiff.1 (97%) rename {man => archive/man}/tiffsv.1 (98%) rename {tools => archive/tools}/bmp2tiff.c (99%) rename {tools => archive/tools}/gif2tiff.c (99%) rename {tools => archive/tools}/ras2tiff.c (99%) rename {tools => archive/tools}/rasterfile.h (93%) rename {tools => archive/tools}/sgi2tiff.c (99%) rename {tools => archive/tools}/sgisv.c (99%) rename {tools => archive/tools}/ycbcr.c (100%) delete mode 100755 test/bmp2tiff_palette.sh delete mode 100755 test/bmp2tiff_rgb.sh delete mode 100755 test/gif2tiff.sh delete mode 100644 test/images/palette-1c-8b.bmp delete mode 100644 test/images/palette-1c-8b.gif delete mode 100644 test/images/rgb-3c-8b.bmp diff --git a/ChangeLog b/ChangeLog index a0f0ae25..e90e92fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2016-06-05 Bob Friesenhahn + + * 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 * libtiff/tif_config.vc.h (HAVE_SNPRINTF): Add a '1' to the diff --git a/html/man/bmp2tiff.1.html b/archive/html/man/bmp2tiff.1.html similarity index 100% rename from html/man/bmp2tiff.1.html rename to archive/html/man/bmp2tiff.1.html diff --git a/html/man/gif2tiff.1.html b/archive/html/man/gif2tiff.1.html similarity index 100% rename from html/man/gif2tiff.1.html rename to archive/html/man/gif2tiff.1.html diff --git a/html/man/ras2tiff.1.html b/archive/html/man/ras2tiff.1.html similarity index 100% rename from html/man/ras2tiff.1.html rename to archive/html/man/ras2tiff.1.html diff --git a/html/man/sgi2tiff.1.html b/archive/html/man/sgi2tiff.1.html similarity index 100% rename from html/man/sgi2tiff.1.html rename to archive/html/man/sgi2tiff.1.html diff --git a/html/man/tiffsv.1.html b/archive/html/man/tiffsv.1.html similarity index 100% rename from html/man/tiffsv.1.html rename to archive/html/man/tiffsv.1.html diff --git a/man/bmp2tiff.1 b/archive/man/bmp2tiff.1 similarity index 97% rename from man/bmp2tiff.1 rename to archive/man/bmp2tiff.1 index f5d68ce0..a4a6c08c 100644 --- a/man/bmp2tiff.1 +++ b/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 .\" diff --git a/man/gif2tiff.1 b/archive/man/gif2tiff.1 similarity index 97% rename from man/gif2tiff.1 rename to archive/man/gif2tiff.1 index 5f01d8dc..e57285eb 100644 --- a/man/gif2tiff.1 +++ b/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. diff --git a/man/ras2tiff.1 b/archive/man/ras2tiff.1 similarity index 97% rename from man/ras2tiff.1 rename to archive/man/ras2tiff.1 index 0c78ddb6..ed5a4a2c 100644 --- a/man/ras2tiff.1 +++ b/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. diff --git a/man/sgi2tiff.1 b/archive/man/sgi2tiff.1 similarity index 97% rename from man/sgi2tiff.1 rename to archive/man/sgi2tiff.1 index 650adb3c..c2564db4 100644 --- a/man/sgi2tiff.1 +++ b/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. diff --git a/man/tiffsv.1 b/archive/man/tiffsv.1 similarity index 98% rename from man/tiffsv.1 rename to archive/man/tiffsv.1 index 206df567..7e349cb6 100644 --- a/man/tiffsv.1 +++ b/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. diff --git a/tools/bmp2tiff.c b/archive/tools/bmp2tiff.c similarity index 99% rename from tools/bmp2tiff.c rename to archive/tools/bmp2tiff.c index 797dabdf..ca903f97 100644 --- a/tools/bmp2tiff.c +++ b/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. diff --git a/tools/gif2tiff.c b/archive/tools/gif2tiff.c similarity index 99% rename from tools/gif2tiff.c rename to archive/tools/gif2tiff.c index 4c4f7bb2..55eedef5 100644 --- a/tools/gif2tiff.c +++ b/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 diff --git a/tools/ras2tiff.c b/archive/tools/ras2tiff.c similarity index 99% rename from tools/ras2tiff.c rename to archive/tools/ras2tiff.c index a8fa0dfd..b45f725d 100644 --- a/tools/ras2tiff.c +++ b/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 diff --git a/tools/rasterfile.h b/archive/tools/rasterfile.h similarity index 93% rename from tools/rasterfile.h rename to archive/tools/rasterfile.h index dc70a143..1bd69341 100644 --- a/tools/rasterfile.h +++ b/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" diff --git a/tools/sgi2tiff.c b/archive/tools/sgi2tiff.c similarity index 99% rename from tools/sgi2tiff.c rename to archive/tools/sgi2tiff.c index b7fef0c1..985915e5 100644 --- a/tools/sgi2tiff.c +++ b/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 diff --git a/tools/sgisv.c b/archive/tools/sgisv.c similarity index 99% rename from tools/sgisv.c rename to archive/tools/sgisv.c index 3bc57609..13aa2932 100644 --- a/tools/sgisv.c +++ b/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 diff --git a/tools/ycbcr.c b/archive/tools/ycbcr.c similarity index 100% rename from tools/ycbcr.c rename to archive/tools/ycbcr.c diff --git a/html/man/CMakeLists.txt b/html/man/CMakeLists.txt index f7c98ac0..cb92ea21 100644 --- a/html/man/CMakeLists.txt +++ b/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 - tiffsv.1.html) + tiffsplit.1.html) set(doc_DATA ${indexfile} ${docfiles}) diff --git a/html/man/Makefile.am b/html/man/Makefile.am index 175067e6..587296c5 100644 --- a/html/man/Makefile.am +++ b/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 \ - tiffsv.1.html + tiffsplit.1.html dist_doc_DATA = $(indexfile) $(docfiles) diff --git a/html/man/Makefile.in b/html/man/Makefile.in index ca0d257c..7f4648c9 100644 --- a/html/man/Makefile.in +++ b/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 \ - tiffsv.1.html + tiffsplit.1.html dist_doc_DATA = $(indexfile) $(docfiles) INDEXSTART = 'Libtiff HTML manpage index