v3.4beta034 releasev3.4beta034

23 files changed, 47 insertions, 44 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4b467ce1..193160cb 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-#	$Header: /usr/people/sam/tiff/tools/RCS/Makefile.in,v 1.18 1996/03/18 20:56:15 sam Rel $
+#	$Header: /usr/people/sam/tiff/tools/RCS/Makefile.in,v 1.19 1996/05/21 18:31:15 sam Exp $
 #
 # @WARNING@
 #
@@ -47,10 +47,13 @@ OPTIMIZER=-O
 IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
 CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
 #
-LIBTIFF	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
+TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
 LIBJPEG	= @LIBJPEG@
 LIBGZ	= @LIBGZ@
-LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} @LIBPORT@ @MACHDEPLIBS@
+LIBTIFF	= @TIFFLIBREF@
+LIBPORT	= @LIBPORT@
+MACHLIBS= @MACHDEPLIBS@
+LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
 #
 OBJS=	\
 	fax2tiff.o \
@@ -123,17 +126,17 @@ clean:
 # System-independent tools
 #
 
-tiffinfo: tiffinfo.o ${LIBTIFF}
+tiffinfo: tiffinfo.o ${TIFFLIB}
 	${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS}
 tiffinfo.o: ${SRCDIR}/tiffinfo.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffinfo.c
 
-tiffcmp:tiffcmp.o ${LIBTIFF}
+tiffcmp:tiffcmp.o ${TIFFLIB}
 	${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS}
 tiffcmp.o: ${SRCDIR}/tiffcmp.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcmp.c
 
-tiffcp:	tiffcp.o ${LIBTIFF}
+tiffcp:	tiffcp.o ${TIFFLIB}
 	${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS}
 tiffcp.o: ${SRCDIR}/tiffcp.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcp.c
@@ -143,17 +146,17 @@ tiffdump: tiffdump.o
 tiffdump.o: ${SRCDIR}/tiffdump.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdump.c
 
-tiffmedian: tiffmedian.o ${LIBTIFF}
+tiffmedian: tiffmedian.o ${TIFFLIB}
 	${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS}
 tiffmedian.o: ${SRCDIR}/tiffmedian.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffmedian.c
 
-tiffsplit: tiffsplit.o ${LIBTIFF}
+tiffsplit: tiffsplit.o ${TIFFLIB}
 	${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS}
 tiffsplit.o: ${SRCDIR}/tiffsplit.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffsplit.c
 
-tiff2ps: tiff2ps.o ${LIBTIFF}
+tiff2ps: tiff2ps.o ${TIFFLIB}
 	${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS}
 tiff2ps.o: ${SRCDIR}/tiff2ps.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2ps.c
@@ -164,61 +167,61 @@ tiff2ps.o: ${SRCDIR}/tiff2ps.c
 #
 
 # convert RGB image to B&W
-tiff2bw: tiff2bw.o ${LIBTIFF}
+tiff2bw: tiff2bw.o ${TIFFLIB}
 	${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS}
 tiff2bw.o: ${SRCDIR}/tiff2bw.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2bw.c
 
 # convert B&W image to bilevel w/ FS dithering
-tiffdither: tiffdither.o ${LIBTIFF}
+tiffdither: tiffdither.o ${TIFFLIB}
 	${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS}
 tiffdither.o: ${SRCDIR}/tiffdither.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdither.c
 
 # simple Sun rasterfile converter
-ras2tiff: ras2tiff.o ${LIBTIFF}
+ras2tiff: ras2tiff.o ${TIFFLIB}
 	${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS}
 ras2tiff.o: ${SRCDIR}/ras2tiff.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/ras2tiff.c
 
 # simple GIF converter
-gif2tiff: gif2tiff.o ${LIBTIFF}
+gif2tiff: gif2tiff.o ${TIFFLIB}
 	${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS}
 gif2tiff.o: ${SRCDIR}/gif2tiff.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/gif2tiff.c
 
 # very limited PBM converter
-ppm2tiff: ppm2tiff.o ${LIBTIFF}
+ppm2tiff: ppm2tiff.o ${TIFFLIB}
 	${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS}
 ppm2tiff.o: ${SRCDIR}/ppm2tiff.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/ppm2tiff.c
 
 # Group 3/4 FAX file converter
-fax2tiff: fax2tiff.o ${LIBTIFF}
+fax2tiff: fax2tiff.o ${TIFFLIB}
 	${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS}
 fax2tiff.o: ${SRCDIR}/fax2tiff.c
 	${CC} -c -I${LIBDIR} -I${DEPTH}/libtiff ${CFLAGS} ${SRCDIR}/fax2tiff.c
 
 # Group 3/4 FAX to encoded PS converter
-fax2ps: fax2ps.o ${LIBTIFF}
+fax2ps: fax2ps.o ${TIFFLIB}
 	${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS}
 fax2ps.o: ${SRCDIR}/fax2ps.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/fax2ps.c
 
 # convert Palette image to RGB
-pal2rgb: pal2rgb.o ${LIBTIFF}
+pal2rgb: pal2rgb.o ${TIFFLIB}
 	${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS}
 pal2rgb.o: ${SRCDIR}/pal2rgb.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/pal2rgb.c
 
 # convert RGB image to YCbCr
-rgb2ycbcr: rgb2ycbcr.o ${LIBTIFF}
+rgb2ycbcr: rgb2ycbcr.o ${TIFFLIB}
 	${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS}
 rgb2ycbcr.o: ${SRCDIR}/rgb2ycbcr.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/rgb2ycbcr.c
 
 # generate thumbnail images from fax (example of SubIFD usage)
-thumbnail: thumbnail.o ${LIBTIFF}
+thumbnail: thumbnail.o ${TIFFLIB}
 	${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS}
 thumbnail.o: ${SRCDIR}/thumbnail.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/thumbnail.c
@@ -231,18 +234,18 @@ thumbnail.o: ${SRCDIR}/thumbnail.c
 # sgi2tiff converts SGI RGB images to TIFF; it requires
 # the SGI image library -limage.
 #
-sgi2tiff: sgi2tiff.o ${LIBTIFF}
+sgi2tiff: sgi2tiff.o ${TIFFLIB}
 	${CC} -o sgi2tiff ${CFLAGS} sgi2tiff.o -limage ${LIBS}
 sgi2tiff.o: ${SRCDIR}/sgi2tiff.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/sgi2tiff.c
 
 # SGI versions of tiffgt & tiffsv that require -lgl
-tiffgt:	sgigt.o ${LIBTIFF}
+tiffgt:	sgigt.o ${TIFFLIB}
 	${CC} -o tiffgt ${CFLAGS} sgigt.o ${LIBS} -lgutil -lgl_s
 sgigt.o: ${SRCDIR}/sgigt.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/sgigt.c
 
-tiffsv:	sgisv.o ${LIBTIFF}
+tiffsv:	sgisv.o ${TIFFLIB}
 	${CC} -o tiffsv ${CFLAGS} sgisv.o ${LIBS} -lgutil -lgl_s
 sgisv.o: ${SRCDIR}/sgisv.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/sgisv.c
diff --git a/tools/Makefile.lcc b/tools/Makefile.lcc
index 079fed33..0e78b453 100644
--- a/tools/Makefile.lcc
+++ b/tools/Makefile.lcc
@@ -1,4 +1,4 @@
-# $Header: /usr/people/sam/tiff/tools/RCS/Makefile.lcc,v 1.4 1996/01/10 19:35:26 sam Rel $
+# $Header: /usr/people/sam/tiff/tools/RCS/Makefile.lcc,v 1.4 1996/01/10 19:35:26 sam Exp $
 #
 # TIFF Library Tools
 #
diff --git a/tools/fax2ps.c b/tools/fax2ps.c
index 426675db..65f68c90 100644
--- a/tools/fax2ps.c
+++ b/tools/fax2ps.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/fax2ps.c,v 1.10 1996/04/29 21:58:49 sam Rel $" */
+/* $Header: /usr/people/sam/tiff/tools/RCS/fax2ps.c,v 1.10 1996/04/29 21:58:49 sam Exp $" */
 
 /*
  * Copyright (c) 1991-1996 Sam Leffler
diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c
index d2e2a555..9ceb5278 100644
--- a/tools/fax2tiff.c
+++ b/tools/fax2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/fax2tiff.c,v 1.40 1996/01/10 19:35:27 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/fax2tiff.c,v 1.40 1996/01/10 19:35:27 sam Exp $ */
 
 /*
  * Copyright (c) 1990-1996 Sam Leffler
diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c
index 935c8cac..263bcff7 100644
--- a/tools/gif2tiff.c
+++ b/tools/gif2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/gif2tiff.c,v 1.27 1996/04/22 22:03:26 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/gif2tiff.c,v 1.27 1996/04/22 22:03:26 sam Exp $ */
 
 /*
  * Copyright (c) 1990-1996 Sam Leffler
diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c
index fec27334..e26d7318 100644
--- a/tools/pal2rgb.c
+++ b/tools/pal2rgb.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/pal2rgb.c,v 1.29 1996/01/10 19:35:29 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/pal2rgb.c,v 1.29 1996/01/10 19:35:29 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c
index 02be2604..b53e06b7 100644
--- a/tools/ppm2tiff.c
+++ b/tools/ppm2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/ppm2tiff.c,v 1.26 1996/04/22 22:03:26 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/ppm2tiff.c,v 1.26 1996/04/22 22:03:26 sam Exp $ */
 
 /*
  * Copyright (c) 1991-1996 Sam Leffler
diff --git a/tools/ras2tiff.c b/tools/ras2tiff.c
index d168a7c1..a82e9101 100644
--- a/tools/ras2tiff.c
+++ b/tools/ras2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/ras2tiff.c,v 1.29 1996/01/10 19:35:30 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/ras2tiff.c,v 1.29 1996/01/10 19:35:30 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/rasterfile.h b/tools/rasterfile.h
index 15126e86..30c09a7c 100644
--- a/tools/rasterfile.h
+++ b/tools/rasterfile.h
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/rasterfile.h,v 1.1 1990/10/08 17:24:23 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/rasterfile.h,v 1.1 1990/10/08 17:24:23 sam Exp $ */
 
 /*
  * Description of header for files containing raster images
diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c
index b96115ff..f034dc44 100644
--- a/tools/rgb2ycbcr.c
+++ b/tools/rgb2ycbcr.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/rgb2ycbcr.c,v 1.27 1996/01/10 19:35:31 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/rgb2ycbcr.c,v 1.27 1996/01/10 19:35:31 sam Exp $ */
 
 /*
  * Copyright (c) 1991-1996 Sam Leffler
diff --git a/tools/sgi2tiff.c b/tools/sgi2tiff.c
index 223cec59..01d3d7c6 100644
--- a/tools/sgi2tiff.c
+++ b/tools/sgi2tiff.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/sgi2tiff.c,v 1.26 1996/01/10 19:35:31 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/sgi2tiff.c,v 1.26 1996/01/10 19:35:31 sam Exp $ */
 
 /*
  * Copyright (c) 1991-1996 Sam Leffler
diff --git a/tools/sgigt.c b/tools/sgigt.c
index 59297181..4e5ed0e7 100644
--- a/tools/sgigt.c
+++ b/tools/sgigt.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/sgigt.c,v 1.66 1996/01/10 19:35:32 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/sgigt.c,v 1.66 1996/01/10 19:35:32 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/sgisv.c b/tools/sgisv.c
index 96123bfe..3b14ff11 100644
--- a/tools/sgisv.c
+++ b/tools/sgisv.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/sgisv.c,v 1.25 1996/01/10 19:35:33 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/sgisv.c,v 1.25 1996/01/10 19:35:33 sam Exp $ */
 
 /*
  * Copyright (c) 1990-1996 Sam Leffler
diff --git a/tools/thumbnail.c b/tools/thumbnail.c
index fe703197..a5f72cdb 100644
--- a/tools/thumbnail.c
+++ b/tools/thumbnail.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/thumbnail.c,v 1.11 1996/01/10 19:35:33 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/thumbnail.c,v 1.11 1996/01/10 19:35:33 sam Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Sam Leffler
diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c
index acae3b77..c0f0945c 100644
--- a/tools/tiff2bw.c
+++ b/tools/tiff2bw.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2bw.c,v 1.21 1996/01/10 19:35:34 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2bw.c,v 1.21 1996/01/10 19:35:34 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c
index ae704c81..d3e27558 100644
--- a/tools/tiff2ps.c
+++ b/tools/tiff2ps.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2ps.c,v 1.48 1996/01/10 19:35:35 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiff2ps.c,v 1.48 1996/01/10 19:35:35 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/tiffcmp.c b/tools/tiffcmp.c
index 13f0c926..570611ab 100644
--- a/tools/tiffcmp.c
+++ b/tools/tiffcmp.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcmp.c,v 1.29 1996/01/10 19:35:36 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcmp.c,v 1.29 1996/01/10 19:35:36 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
index 8663f4c4..c87cc46c 100644
--- a/tools/tiffcp.c
+++ b/tools/tiffcp.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcp.c,v 1.48 1996/01/10 19:35:36 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiffcp.c,v 1.48 1996/01/10 19:35:36 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/tiffdither.c b/tools/tiffdither.c
index 355721c3..cf1e671f 100644
--- a/tools/tiffdither.c
+++ b/tools/tiffdither.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdither.c,v 1.26 1996/01/10 19:35:37 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdither.c,v 1.26 1996/01/10 19:35:37 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/tiffdump.c b/tools/tiffdump.c
index 2b2a9b72..16a9f3a3 100644
--- a/tools/tiffdump.c
+++ b/tools/tiffdump.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdump.c,v 1.49 1996/03/29 16:38:33 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiffdump.c,v 1.49 1996/03/29 16:38:33 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c
index d80a99fb..fc53887f 100644
--- a/tools/tiffinfo.c
+++ b/tools/tiffinfo.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiffinfo.c,v 1.26 1996/01/10 19:35:39 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiffinfo.c,v 1.26 1996/01/10 19:35:39 sam Exp $ */
 
 /*
  * Copyright (c) 1988-1996 Sam Leffler
diff --git a/tools/tiffmedian.c b/tools/tiffmedian.c
index ff354fed..967bb185 100644
--- a/tools/tiffmedian.c
+++ b/tools/tiffmedian.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiffmedian.c,v 1.18 1995/10/10 00:35:22 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiffmedian.c,v 1.18 1995/10/10 00:35:22 sam Exp $ */
 
 /*
  * Apply median cut on an image.
diff --git a/tools/tiffsplit.c b/tools/tiffsplit.c
index 49108e0b..48baf8ec 100644
--- a/tools/tiffsplit.c
+++ b/tools/tiffsplit.c
@@ -1,4 +1,4 @@
-/* $Header: /usr/people/sam/tiff/tools/RCS/tiffsplit.c,v 1.13 1996/01/10 19:35:40 sam Rel $ */
+/* $Header: /usr/people/sam/tiff/tools/RCS/tiffsplit.c,v 1.13 1996/01/10 19:35:40 sam Exp $ */
 
 /*
  * Copyright (c) 1992-1996 Sam Leffler