* modified Makefile.in, configure, and dist/newversion, so that.

the old code updates things based on the info in VERSION. I've kept this, but added a second token in VERSION, "beta". configure will now parse VERSION into $VERSION and $RELEASE. Whatever the second token is will be appened to the "release" target tar and zip afiles, and will be used by dist/newversion to create dist/tiff.version.
author: Mike Welles <mike@bangstate.com> 2000-12-22 22:33:41 +0000
committer: Mike Welles <mike@bangstate.com> 2000-12-22 22:33:41 +0000
commit: a7f6e194cfb167529108cdc693910f05821669a9 (patch)
tree: 5f6b23e244100d7d7aeda2379277e1be871345b0
parent: ce16b036c145ca2a29b9fed1c6d9af626760bb8e (diff)
download: libtiff-git-a7f6e194cfb167529108cdc693910f05821669a9.tar.gz
15 files changed, 153 insertions, 116 deletions
diff --git a/ChangeLog b/ChangeLog
index f9c11f7c..caceac73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-22  Mike Welles <mike@bangstate.com> 
+        * added link to CVS mirror from index.html
+	
+	* updated html/internals.html to note that LZW compression is 
+	  not supported by default. 
+	
 2000-12-22  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* updated html/libtiff.html to not point at Niles' old JPL web site
@@ -9,7 +15,7 @@
 	Leonard Rosenthol <leonardr@lazerware.com>.  May interfere
 	with correct building on older systems.  If so, please let me know.
 
-2000-12-19 Mike Welles <mike@bangsate.com>   *** 3.5.6 release ***
+2000-12-19 Mike Welles <mike@bangsate.com>   
 
 	* Took out LZW Encoding from tif_lzw.c 
 
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index 0fa42c40..3f352219 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -31,10 +31,6 @@ main tree.
 Increment version in file "VERSION" 
 
 
-7. 
-
-Set current date in "RELEASE-DATE" file.
-
 
 8. 
 
@@ -43,7 +39,8 @@ sh configure; make; make install (to test).
 
 9. 
 
-make release. 
+make release -- this will update "RELEASE-DATE" in the top level dir,
+and create the .tar.gz and .zip archives one directory above.
 
 10. 
 
@@ -68,6 +65,16 @@ mput *.html
 put ../tiff-vn-n-n.zip .
 put ../tiff-vn-n-n.tar.gz .
 
+13. 
+
+Commit any changes in libtiff-lzw-compression-kit. 
+
+Update VERSION in Makefile. 
+
+make release
+
+ftp to both sites. 
+
 14.  
 
 Announce to list, tiff@olympiakos.com
diff --git a/Makefile b/Makefile
index a4cda8ba..7510449b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #! smake
-#	$Header: /cvs/maptools/cvsroot/libtiff/Attic/Makefile,v 1.8 2000-04-04 14:43:35 mwelles Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/Attic/Makefile,v 1.9 2000-12-22 22:33:41 mwelles Exp $
 #
 # Warning, this file was automatically created by the TIFF configure script
 #
@@ -31,9 +31,9 @@
 SRCDIR	= .
 
 #
-# VERSION:	v3.5.5
-# DATE:		Tue Mar 28 23:36:39 EST 2000
-# TARGET:	i586-unknown-linux
+# VERSION:	v3.5.6
+# DATE:		Fri Dec 22 17:22:51 EST 2000
+# TARGET:	i686-unknown-linux
 # CCOMPILER:	/usr/bin/gcc
 #
 
@@ -63,6 +63,9 @@ install:
 	    true; \
 	fi
 
+install-private: install
+	@${ECHO} "= "libtiff; cd libtiff; ${MAKE} installPrivateHdrs
+
 clean:
 	@if [ "no" = yes ]; then \
 	    ${ECHO} "= "port; cd port; ${MAKE} clean; \
@@ -89,7 +92,7 @@ clobber distclean: clean
 installLink::
 	if [ /usr/local/lib != /usr/lib ]; then				\
 	    ${INSTALL} -idb tiff.sw.tools -F /usr/lib			\
-		-lns /usr/local/lib/libtiff.a -O libtiff.a;	\
+		-lns /usr/local/lib/libtiff.so.3 -O libtiff.so.3;	\
 	else								\
 	    true;							\
 	fi
@@ -455,13 +458,11 @@ CONTRIBFILES=\
 	    contrib/addtiffo/Makefile		\
 	    contrib/addtiffo/Makefile.vc	\
 	    contrib/addtiffo/addtiffo.c		\
-	    contrib/addtiffo/tif_overview.cpp	\
-	    contrib/addtiffo/rawblockedimage.cpp \
-	    contrib/addtiffo/rawblockedimage.h  \
+	    contrib/addtiffo/tif_overview.c	\
 	contrib/iptcutil/Makefile		\
 		contrib/iptcutil/iptcutil.c	\
 		contrib/iptcutil/test.iptc	\
-		contrib/iptcutil/text.txt	\
+		contrib/iptcutil/test.txt	\
 	${NULL}
 
 DISTFILES=\
@@ -494,8 +495,6 @@ release:
 
 # stamp relevant files according to current alpha
 release.stamp:
-	VERSION=`echo v3.5.5 | tr "." "-"`; \
-#	cvs tag -R Release-$$VERSION	;
 	date "+%m/%d/%Y" > RELEASE-DATE
 
 #diffs since last release
@@ -504,20 +503,19 @@ releasediff:
 	    cvs diff -D`cat RELEASE-DATE` ${SRCDIR}/$$i;				\
 	done
 
-# create release distribution archive
+# create release or beta distribution archive
 release.tar.zip:
-	VERSION="v3.5.5";						\
-	rm -f ../tiff-$$VERSION $$VERSION $$VERSION-tar;			\
-	ln -s ${SRCDIR} tiff-$$VERSION;					\
+	VERSIONREL="v3.5.6-beta";				\
+	rm -f ../tiff-$$VERSIONREL $$VERSIONREL $$VERSIONREL-tar;			\
+	ln -s ${SRCDIR} tiff-$$VERSIONREL;					\
 	(for i in ${DISTFILES}; do					\
 	   echo $$i;							\
-	done) | sed "s;.*;tiff-$$VERSION/&;" >$$VERSION;		\
-	tar cvf $$VERSION-tar `cat $$VERSION`;				\
-	zip ../tiff-$$VERSION.zip `cat $$VERSION`; 				\
-	rm -f tiff-$$VERSION-tar.${ZIPSUF};				\
-	cat $$VERSION-tar | ${COMPRESS} >../tiff-$$VERSION.tar.${ZIPSUF};	\
-	rm -f tiff-$$VERSION $$VERSION $$VERSION-tar;
-
+	done) | sed "s;.*;tiff-$$VERSIONREL/&;" >$$VERSIONREL;		\
+	tar cvf $$VERSIONREL-tar `cat $$VERSIONREL`;				\
+	zip ../tiff-$$VERSIONREL.zip `cat $$VERSIONREL`; 				\
+#	rm -f tiff-$$VERSIONREL${ZIPSUF};				\
+	cat $$VERSIONREL-tar | ${COMPRESS} >../tiff-$$VERSIONREL.${ZIPSUF};	\
+#	rm -f tiff-$$VERSIONREL $$VERSIONREL $$VERSIONREL-tar;
 #
 #	Simple rule to run test suite assuming that pics directory is 
 #	just below this one, and that .rpt files are available. 
diff --git a/Makefile.in b/Makefile.in
index e26d039b..67d3bbe3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #! smake
-#	$Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.15 2000-11-24 06:28:45 warmerda Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.16 2000-12-22 22:33:41 mwelles Exp $
 #
 # @WARNING@
 #
@@ -458,13 +458,11 @@ CONTRIBFILES=\
 	    contrib/addtiffo/Makefile		\
 	    contrib/addtiffo/Makefile.vc	\
 	    contrib/addtiffo/addtiffo.c		\
-	    contrib/addtiffo/tif_overview.cpp	\
-	    contrib/addtiffo/rawblockedimage.cpp \
-	    contrib/addtiffo/rawblockedimage.h  \
+	    contrib/addtiffo/tif_overview.c	\
 	contrib/iptcutil/Makefile		\
 		contrib/iptcutil/iptcutil.c	\
 		contrib/iptcutil/test.iptc	\
-		contrib/iptcutil/text.txt	\
+		contrib/iptcutil/test.txt	\
 	${NULL}
 
 DISTFILES=\
@@ -497,8 +495,6 @@ release:
 
 # stamp relevant files according to current alpha
 release.stamp:
-	VERSION=`echo @VERSION@ | tr "." "-"`; \
-#	cvs tag -R Release-$$VERSION	;
 	date "+%m/%d/%Y" > RELEASE-DATE
 
 #diffs since last release
@@ -507,20 +503,19 @@ releasediff:
 	    cvs diff -D`cat RELEASE-DATE` ${SRCDIR}/$$i;				\
 	done
 
-# create release distribution archive
+# create release or beta distribution archive
 release.tar.zip:
-	VERSION="@VERSION@";						\
-	rm -f ../tiff-$$VERSION $$VERSION $$VERSION-tar;			\
-	ln -s ${SRCDIR} tiff-$$VERSION;					\
+	VERSIONREL="@VERSION@-@RELEASE@";				\
+	rm -f ../tiff-$$VERSIONREL $$VERSIONREL $$VERSIONREL-tar;			\
+	ln -s ${SRCDIR} tiff-$$VERSIONREL;					\
 	(for i in ${DISTFILES}; do					\
 	   echo $$i;							\
-	done) | sed "s;.*;tiff-$$VERSION/&;" >$$VERSION;		\
-	tar cvf $$VERSION-tar `cat $$VERSION`;				\
-	zip ../tiff-$$VERSION.zip `cat $$VERSION`; 				\
-	rm -f tiff-$$VERSION-tar.${ZIPSUF};				\
-	cat $$VERSION-tar | ${COMPRESS} >../tiff-$$VERSION.tar.${ZIPSUF};	\
-	rm -f tiff-$$VERSION $$VERSION $$VERSION-tar;
-
+	done) | sed "s;.*;tiff-$$VERSIONREL/&;" >$$VERSIONREL;		\
+	tar cvf $$VERSIONREL-tar `cat $$VERSIONREL`;				\
+	zip ../tiff-$$VERSIONREL.zip `cat $$VERSIONREL`; 				\
+#	rm -f tiff-$$VERSIONREL${ZIPSUF};				\
+	cat $$VERSIONREL-tar | ${COMPRESS} >../tiff-$$VERSIONREL.${ZIPSUF};	\
+#	rm -f tiff-$$VERSIONREL $$VERSIONREL $$VERSIONREL-tar;
 #
 #	Simple rule to run test suite assuming that pics directory is 
 #	just below this one, and that .rpt files are available. 
diff --git a/RELEASE-DATE b/RELEASE-DATE
index 075fa257..01c09d0c 100644
--- a/RELEASE-DATE
+++ b/RELEASE-DATE
@@ -1 +1 @@
-12/19/2000
+12/22/2000
diff --git a/VERSION b/VERSION
index c4928258..37ffab0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.6
+3.5.6 beta
diff --git a/configure b/configure
index a92f5c3d..c3e52d54 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.9 2000-11-24 06:28:10 warmerda Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.10 2000-12-22 22:33:41 mwelles Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@@ -152,7 +152,7 @@ do
     -target|--target)		ac_prev=TARGET;;
     -target=*|--target=*)	TARGET="$ac_optarg" ;;
     -version|--version)
-	echo "This is TIFF configure $Revision: 1.9 $"
+	echo "This is TIFF configure $Revision: 1.10 $"
 	exit 0
 	;;
     -help|--help)		usage; exit 0;;
@@ -258,9 +258,10 @@ EOF
 VERSIONFILE=$SRCDIR/VERSION
 DATE=`date`
 
-eval `cat $VERSIONFILE | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\(.*\)/DIST_MAJOR=\1; DIST_MINOR=\2; DIST_POINT=\3/'`
+eval `cat $VERSIONFILE |  sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)\(.*\)/DIST_MAJOR=\1; DIST_MINOR=\2; DIST_POINT=\3/'`
 VERSION="v${DIST_MAJOR}.${DIST_MINOR}.${DIST_POINT}"
 
+RELEASE=`cat $VERSIONFILE |  sed -e 's/[0-9 \.]//g'`
 Note()
 {
     echo "$@" 1>&4
@@ -268,9 +269,9 @@ Note()
 
 Note ""
 if [ $SRCDIR_IS_LIBTIFF = yes ] ; then
-  Note "Configuring TIFF Software (library only) $VERSION."
+  Note "Configuring TIFF Software (library only) $VERSION"
 else
-  Note "Configuring TIFF Software $VERSION."
+  Note "Configuring TIFF Software $VERSION"
 fi
 
 Note ""
@@ -728,6 +729,7 @@ EmitCPlusPlusPrologue()
     echo '/*'
     echo ' * Warning, this file was automatically created by the TIFF configure script'
     echo ' * VERSION:	' $VERSION
+    echo ' * RELEASE:   ' $RELEASE
     echo ' * DATE:	' $DATE
     echo ' * TARGET:	' $TARGET
     if [ $ISGCC = yes ]; then
@@ -1758,6 +1760,7 @@ s;@STRIP@;${STRIP};g
 s;@TARGET@;${TARGET};g
 s;@TIFFLIBREF@;${TIFFLIBREF};g
 s;@VERSION@;${VERSION};g
+s;@RELEASE@;${RELEASE};g
 s;@VERSIONFILE@;`relativize ${VERSIONFILE}`;g
 s;@WARNING@;Warning, this file was automatically created by the TIFF configure script;g
 EOF
diff --git a/dist/newversion b/dist/newversion
index a693dffd..58060885 100644
--- a/dist/newversion
+++ b/dist/newversion
@@ -1,5 +1,5 @@
 #! /bin/sh
-#	$Header: /cvs/maptools/cvsroot/libtiff/dist/Attic/newversion,v 1.1 1999-07-27 21:50:27 mike Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/dist/Attic/newversion,v 1.2 2000-12-22 22:33:41 mwelles Exp $
 #
 # TIFF Software
 #
@@ -27,6 +27,5 @@
 #
 rm -f tiff.version
 awk '
-$1 ~ /.*beta/ { print "define TIFF_VNUM " $0 }
-$1 !~ /.*beta/{ print "define TIFF_VNUM \"" $0 " (release)\"" }
+{ print "define TIFF_VNUM \"" $1 " (" $2 ")\"" }
 ' ../VERSION > tiff.version
diff --git a/dist/tiff.version b/dist/tiff.version
index 43d3e2e7..f0225e5b 100644
--- a/dist/tiff.version
+++ b/dist/tiff.version
@@ -1 +1 @@
-define TIFF_VNUM "3.5.6 (release)"
+define TIFF_VNUM "3.5.6 (beta)"
diff --git a/html/index.html b/html/index.html
index 2ce11e84..8f9da378 100644
--- a/html/index.html
+++ b/html/index.html
@@ -14,11 +14,11 @@ TIFF Software
 <B>Home Page</B>: <A HREF="http://www.libtiff.org/">
   http://www.libtiff.org</A> <BR>
 <B>FAQ Page</B>: <I>forthcoming</I><BR>
-<B>Latest Release</B>: <A HREF="v3.5.5.html">v3.5.5</A><BR>
-<B>Latest Software</B>: <A HREF="v3.5.5.html">v3.5.5</A><BR>
+<B>Latest Release</B>: <A HREF="v3.5.6.html">v3.5.6</A><BR>
+<B>Latest Software</B>: <A HREF="v3.5.6.html">v3.5.6</A><BR>
 <B>Master FTP Site</B>: <A HREF="ftp://ftp.onshore.com/pub/libtiff">ftp.onshore.com</A> , directory pub/libtiff (Active mode FTP only!)<BR>
-<B>HTTP Download</B>: <A HREF=http://www.libtiff.org/tiff-v3.5.5.tar.gz>http://www.libtiff.org/tiff-v3.5.5.tar.gz</a>,  <A HREF=http://www.libtiff.org/tiff-v3.5.5.zip>http://www.libtiff.org/tiff-v3.5.5.zip</a><BR> 
-<B>LZW Compression Kit:</B> <A HREF="libtiff-lzw-compression-kit-1.2.tar.gz">libtiff-lzw-compression-kit-1.1.tar.gz</A><BR>
+<B>HTTP Download</B>: <A HREF=http://www.libtiff.org/tiff-v3.5.6.tar.gz>http://www.libtiff.org/tiff-v3.5.6.tar.gz</a>,  <A HREF=http://www.libtiff.org/tiff-v3.5.6.zip>http://www.libtiff.org/tiff-v3.5.6.zip</a><BR> 
+<B>LZW Compression Kit:</B> <A HREF="libtiff-lzw-compression-kit-1.1.tar.gz">libtiff-lzw-compression-kit-1.1.tar.gz</A><BR>
 <B>Mailing List</B>: <a href=mailto:tiff@olympiakos.com>tiff@olympiakos.com</a> <BR>
 <B>Mailing List Subscription</b>: <a href=mailto:tiff-request@olympiakos.com>tiff-request@olympiakos.com</a> ("subscribe tiff" in body of message). <BR>
 <B>Mailing List Archive</b>: <A HREF= http://www.remotesensing.org/lists/libtiff_archive/maillist.html>http://www.remotesensing.org/lists/libtiff_archive/maillist.html</A>  <BR>
@@ -83,7 +83,7 @@ The following sections are included in this documentation:
 <P>
 <HR>
 <em> 
-$Id: index.html,v 1.32 2000-12-22 20:30:29 mwelles Exp $
+$Id: index.html,v 1.33 2000-12-22 22:33:41 mwelles Exp $
 </em> 
 
 </BODY>
diff --git a/libtiff/Makefile b/libtiff/Makefile
index 164c29a3..988a570c 100644
--- a/libtiff/Makefile
+++ b/libtiff/Makefile
@@ -1,4 +1,4 @@
-#	$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/Makefile,v 1.7 2000-04-04 14:43:35 mwelles Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/Makefile,v 1.8 2000-12-22 22:33:41 mwelles Exp $
 #
 # Tag Image File Format Library
 #
@@ -28,9 +28,9 @@
 SRCDIR	= ../libtiff
 
 #
-# VERSION:	v3.5.5
-# DATE:		Tue Mar 28 23:36:39 EST 2000
-# TARGET:	i586-unknown-linux
+# VERSION:	v3.5.6
+# DATE:		Fri Dec 22 17:22:51 EST 2000
+# TARGET:	i686-unknown-linux
 # CCOMPILER:	/usr/bin/gcc
 #
 SHELL	= /bin/sh
@@ -63,7 +63,7 @@ IPATH	= -I. -I${SRCDIR}
 CONF_LIBRARY= 
 COPTS	= -g
 OPTIMIZER=-O
-CFLAGS	=   ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
+CFLAGS	=  -fPIC ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
 #
 SRCS	= \
 	tif_aux.c \
@@ -138,8 +138,8 @@ OBJS	= \
 TARGETS	= libtiff.a
 
 all:	${TARGETS}
-	if [ nodso != nodso ]; then \
-	    ${MAKE} nodso; \
+	if [ GNULDdso != nodso ]; then \
+	    ${MAKE} GNULDdso; \
 	else \
 	    true; \
 	fi
@@ -162,10 +162,10 @@ libtiff.a: ${OBJS}
 # default IRIX DSO building rule
 IRIXdso: ${OBJS}
 	@if [ "`basename ${CC}`" = "gcc" ]; then \
-	   ${LD} -n32  -o libtiff.a -shared -rdata_shared \
+	   ${LD} -n32  -o libtiff.so.3 -shared -rdata_shared \
 	   ${OBJS}; \
 	else \
-	    ${CC}  -o libtiff.a -shared -rdata_shared \
+	    ${CC}  -o libtiff.so.3 -shared -rdata_shared \
 	        -check_registry ${SRCDIR}/../port/irix/so_locations \
 	        -quickstart_info \
 	        ${OBJS}  ; \
@@ -173,16 +173,16 @@ IRIXdso: ${OBJS}
 	touch $@
 # special rule for IRIX 5.2
 IRIX52dso: ${OBJS}
-	${LD} -elf -o libtiff.a -shared -no_unresolved -all ${OBJS} \
+	${LD} -elf -o libtiff.so.3 -shared -no_unresolved -all ${OBJS} \
 	      -lc -lm
 	touch $@
 # Solaris 2.x
 SOLARISdso: ${OBJS}
-	${LD} -L/usr/local/lib -G -h libtiff.a -o libtiff.a ${OBJS}
+	${LD} -L/usr/local/lib -G -h libtiff.so.3 -o libtiff.so.3 ${OBJS}
 	touch $@
 # HP-UX A.09.03
 HPUXdso: ${OBJS}
-	${LD} +b/usr/local/lib -b -o libtiff.a ${OBJS}
+	${LD} +b/usr/local/lib -b -o libtiff.so.3 ${OBJS}
 	touch $@
 # AIX 2.3.5 and 4.1.1
 AIXdso: ${OBJS}
@@ -193,40 +193,51 @@ AIXdso: ${OBJS}
 	      >> libtiff.syms
 	${LD} -o shr.o libtiff.a -H512 -T512 -bM\:SRE \
 	    -bE\:libtiff.syms   -lc -lm -L/usr/local/lib
-	rm -f libtiff.syms libtiff.a
-	${AR} ${AROPTS} libtiff.a shr.o
+	rm -f libtiff.syms libtiff.so.3
+	${AR} ${AROPTS} libtiff.so.3 shr.o
 	rm -f shr.o
 	touch $@
-# NetBSD 1.1 or FreeBSD
+# GNU linker shared libraries
+GNULDdso: ${OBJS}
+	${CC} -shared -Wl,-soname,libtiff.so.3 \
+	    -o libtiff.so.3.5.6  ${OBJS} \
+		  -lm
+	rm -f libtiff.so.3
+	if [ @DSOSUB_VERSION != @DSOSUF ] ; then \
+	  /bin/ln -s libtiff.so.3.5.6 libtiff.so.3; \
+	fi
+	touch $@
+# NetBSD 1.1 or FreeBSD (old style)
 NETBSDdso FREEBSDdso: ${OBJS}
 	@rm -f libtiff_pic.a
 	@${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q`
 	${RANLIB} libtiff_pic.a
-	${LD} -x -Bshareable -Bforcearchive -o libtiff.a libtiff_pic.a
+	${LD} -x -Bshareable -Bforcearchive -o libtiff.so.3 libtiff_pic.a
 	rm -f libtiff_pic.a
 	touch $@
 # linux ELF shared lib rule
 LINUXdso:  ${OBJS}
-	${CC} -shared -Wl,-soname,libtiff.a \
-	    -o libtiff.a  ${OBJS}   
-	rm -f libtiff.a
-	/bin/ln -s libtiff.a libtiff.a
+	${CC} -shared -Wl,-soname,libtiff.so.3 \
+	    -o libtiff.so.3.5.6  ${OBJS} \
+		  @MACHLIBDEPS@
+	rm -f libtiff.so.3
+	/bin/ln -s libtiff.so.3.5.6 libtiff.so.3
 	touch $@
 # OSF/1 3.2 shared lib rule
 OSFdso: ${OBJS}
-	${LD} -o libtiff.a -shared -error_unresolved ${OBJS}   -lc -lm
+	${LD} -o libtiff.so.3 -shared -error_unresolved ${OBJS}   -lc -lm
 
 
 ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h
 ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h
+${OBJS}: ${SRCDIR}/tiffvers.h
 
-ALPHA	= .././dist/tiff.alpha
 VERSION	= .././VERSION
 
-version.h: ${VERSION} ${ALPHA} ${SRCDIR}/mkversion.c
+${SRCDIR}/tiffvers.h: ${VERSION} ${SRCDIR}/mkversion.c
 	${CC} -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c
-	rm -f version.h; ./mkversion -v ${VERSION} -a ${ALPHA} version.h
-tif_version.o: version.h
+	rm -f ${SRCDIR}/tiffvers.h
+	./mkversion -v ${VERSION} ${SRCDIR}/tiffvers.h
 
 #
 # The finite state machine tables used by the G3/G4 decoders
@@ -313,7 +324,10 @@ tif_vms.o: ${SRCDIR}/tif_vms.c
 tif_win3.o: ${SRCDIR}/tif_win3.c
 	${CC} -c ${CFLAGS} ${SRCDIR}/tif_win3.c
 
-INCS	= ${SRCDIR}/tiff.h ${SRCDIR}/tiffio.h ${SRCDIR}/tiffconf.h
+INCS	= ${SRCDIR}/tiff.h ${SRCDIR}/tiffio.h ${SRCDIR}/tiffconf.h \
+	${SRCDIR}/tiffvers.h
+
+INCS_PRIVATE = ${SRCDIR}/tiffiop.h ${SRCDIR}/tif_dir.h ${SRCDIR}/port.h
 
 installHdrs: ${INCS}
 	${INSTALL} -idb tiff.sw.dev -m 755 -dir /usr/local/include
@@ -322,27 +336,41 @@ installHdrs: ${INCS}
 	    ${INSTALL} -idb tiff.sw.dev -m 444 -F /usr/local/include		\
 		-src $$i -O $$f;					\
 	done
-installDSO: nodso
-	if [ a != a ]; then			\
+
+installPrivateHdrs: ${INCS_PRIVATE}
+	${INSTALL} -idb tiff.sw.dev -m 755 -dir /usr/local/include
+	for i in ${INCS_PRIVATE}; do					\
+	    f=`basename $$i`;						\
+	    ${INSTALL} -idb tiff.sw.dev -m 444 -F /usr/local/include		\
+		-src $$i -O $$f;					\
+	done
+
+installDSO: GNULDdso
+	if [ so.3.5.6 != so.3 ]; then			\
 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F /usr/local/lib		\
-		-O libtiff.a;				\
+		-O libtiff.so.3.5.6;				\
 	    ${INSTALL} -idb tiff.sw.tools -F /usr/local/lib			\
-		-ln libtiff.a -O libtiff.a;	\
+		-lns libtiff.so.3.5.6 -O libtiff.so.3;	\
+	    ${INSTALL} -idb tiff.sw.tools -F /usr/local/lib			\
+		-lns libtiff.so.3 -O libtiff.so;			\
 	else								\
 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F /usr/local/lib		\
-		-O libtiff.a;					\
+		-O libtiff.so.3;					\
 	fi
+
 install: all installHdrs
 	${INSTALL} -idb tiff.sw.dev -m 755 -dir /usr/local/lib
 	${INSTALL} -idb tiff.sw.dev -m 444 -F /usr/local/lib -O libtiff.a
-	if [ nodso != nodso ]; then					\
+	if [ GNULDdso != nodso ]; then					\
 	    ${MAKE} installDSO;						\
 	else								\
 	    true;							\
 	fi
 
+install-private: install installPrivateHdrs
+
 clean:
 	rm -f ${TARGETS} ${OBJS} core a.out \
 	    mkg3states tif_fax3sm.c \
-	    mkversion version.h \
-	    libtiff.a libtiff.a libtiff.a *dso
+	    mkversion ${SRCDIR}/tiffvers.h \
+	    libtiff.a libtiff.so.3 libtiff.so.3.5.6 *dso
diff --git a/libtiff/port.h b/libtiff/port.h
index 7bcaf336..f3d1ab3d 100644
--- a/libtiff/port.h
+++ b/libtiff/port.h
@@ -1,8 +1,9 @@
 /*
  * Warning, this file was automatically created by the TIFF configure script
- * VERSION:	 v3.5.5
- * DATE:	 Tue Mar 28 23:36:39 EST 2000
- * TARGET:	 i586-unknown-linux
+ * VERSION:	 v3.5.6
+ * RELEASE:    beta
+ * DATE:	 Fri Dec 22 17:22:51 EST 2000
+ * TARGET:	 i686-unknown-linux
  * CCOMPILER:	 /usr/bin/gcc-2.95.2 20000220 (Debian GNU/Linux)
  */
 #ifndef _PORT_
@@ -11,7 +12,7 @@
 extern "C" {
 #endif
 #include <sys/types.h>
-#define HOST_FILLORDER FILLORDER_LSB2MSB
+#define HOST_FILLORDER FILLORDER_MSB2LSB
 #define HOST_BIGENDIAN	0
 #define HAVE_MMAP 1
 #include <stdio.h>
diff --git a/man/Makefile b/man/Makefile
index af8ab0ec..1227feaf 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #! smake
-#	$Header: /cvs/maptools/cvsroot/libtiff/man/Attic/Makefile,v 1.6 2000-04-04 14:43:35 mwelles Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/man/Attic/Makefile,v 1.7 2000-12-22 22:33:41 mwelles Exp $
 #
 # Warning, this file was automatically created by the TIFF configure script
 #
@@ -30,9 +30,9 @@
 SRCDIR	= ../man
 
 #
-# VERSION:	v3.5.5
-# DATE:		Tue Mar 28 23:36:39 EST 2000
-# TARGET:	i586-unknown-linux
+# VERSION:	v3.5.6
+# DATE:		Fri Dec 22 17:22:51 EST 2000
+# TARGET:	i686-unknown-linux
 # CCOMPILER:	/usr/bin/gcc
 #
 SHELL	= /bin/sh
diff --git a/port/install.sh b/port/install.sh
index 21a6df0e..813fd71b 100644
--- a/port/install.sh
+++ b/port/install.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-#	$Header: /cvs/maptools/cvsroot/libtiff/port/Attic/install.sh,v 1.6 2000-04-04 14:43:35 mwelles Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/port/Attic/install.sh,v 1.7 2000-12-22 22:33:41 mwelles Exp $
 #
 # Warning, this file was automatically created by the TIFF configure script
 #
@@ -32,9 +32,9 @@
 #
 # Warning, this file was automatically created by the HylaFAX configure script
 #
-# VERSION:	v3.5.5
-# DATE:		Tue Mar 28 23:36:39 EST 2000
-# TARGET:	i586-unknown-linux
+# VERSION:	v3.5.6
+# DATE:		Fri Dec 22 17:22:51 EST 2000
+# TARGET:	i686-unknown-linux
 #
 
 #
diff --git a/tools/Makefile b/tools/Makefile
index c69abd39..022acc6f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-#	$Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/Makefile,v 1.7 2000-04-04 14:43:35 mwelles Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/Makefile,v 1.8 2000-12-22 22:33:41 mwelles Exp $
 #
 # Warning, this file was automatically created by the TIFF configure script
 #
@@ -32,9 +32,9 @@ SRCDIR	= ../tools
 LIBDIR	= ../libtiff
 
 #
-# VERSION:	v3.5.5
-# DATE:		Tue Mar 28 23:36:39 EST 2000
-# TARGET:	i586-unknown-linux
+# VERSION:	v3.5.6
+# DATE:		Fri Dec 22 17:22:51 EST 2000
+# TARGET:	i686-unknown-linux
 # CCOMPILER:	/usr/bin/gcc
 #
 SHELL	= /bin/sh
@@ -47,10 +47,10 @@ OPTIMIZER=-O
 IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
 CFLAGS	=  ${COPTS} ${OPTIMIZER} ${IPATH}
 #
-TIFFLIB	= ${DEPTH}/libtiff/libtiff.a
+TIFFLIB	= ${DEPTH}/libtiff/libtiff.so.3
 LIBJPEG	= 
 LIBGZ	= 
-LIBTIFF	= ${DEPTH}/libtiff/libtiff.a
+LIBTIFF	= ${DEPTH}/libtiff/libtiff.so.3
 LIBPORT	= 
 MACHLIBS= -lm
 LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
@@ -108,8 +108,8 @@ all:	${TARGETS}
 	    true; \
 	fi
 install: all
-	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir /usr/local/bin
-	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F /usr/local/bin -O ${TARGETS}
+	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 -dir /usr/local/bin
+	${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 -F /usr/local/bin -O ${TARGETS}
 	@if [ "no" = yes ]; then \
 	    ${INSTALL} -idb tiff.sw.tools -m 755 -F /usr/local/bin -O sgi2tiff; \
 	else \
author	Mike Welles <mike@bangstate.com>	2000-12-22 22:33:41 +0000
committer	Mike Welles <mike@bangstate.com>	2000-12-22 22:33:41 +0000
commit	a7f6e194cfb167529108cdc693910f05821669a9 (patch)
tree	5f6b23e244100d7d7aeda2379277e1be871345b0
parent	ce16b036c145ca2a29b9fed1c6d9af626760bb8e (diff)
download	libtiff-git-a7f6e194cfb167529108cdc693910f05821669a9.tar.gz