release fixing..

2 files changed, 35 insertions, 29 deletions

diff --git a/libtiff/Makefile b/libtiff/Makefile
index a29a2655..62387b45 100644
--- a/libtiff/Makefile
+++ b/libtiff/Makefile
@@ -1,4 +1,4 @@
-#	$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/Makefile,v 1.2 1999-09-26 22:03:46 mwelles Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/Makefile,v 1.3 1999-09-28 17:22:20 mwelles Exp $
 #
 # Tag Image File Format Library
 #
@@ -28,8 +28,8 @@
 SRCDIR	= ../libtiff
 
 #
-# VERSION:	v3.5.3
-# DATE:		Sun Sep 26 15:44:06 CEST 1999
+# VERSION:	v3.5.2
+# DATE:		Tue Sep 28 13:26:51 CEST 1999
 # TARGET:	i586-unknown-linux
 # CCOMPILER:	/usr/bin/gcc
 #
@@ -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 [ LINUXdso != nodso ]; then \
+	    ${MAKE} LINUXdso; \
 	else \
 	    true; \
 	fi
@@ -161,23 +161,28 @@ libtiff.a: ${OBJS}
 
 # default IRIX DSO building rule
 IRIXdso: ${OBJS}
-	${CC}  -o libtiff.a -shared -rdata_shared \
-	    -check_registry ${SRCDIR}/../port/irix/so_locations \
-	    -quickstart_info \
-	    ${OBJS}  
+	@if [ "`basename ${CC}`" = "gcc" ]; then \
+	   ${LD} -n32  -o libtiff.so.3 -shared -rdata_shared \
+	   ${OBJS}; \
+	else \
+	    ${CC}  -o libtiff.so.3 -shared -rdata_shared \
+	        -check_registry ${SRCDIR}/../port/irix/so_locations \
+	        -quickstart_info \
+	        ${OBJS}  ; \
+	fi
 	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}
@@ -188,8 +193,8 @@ 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
@@ -197,18 +202,19 @@ 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}   
-	/bin/ln -s libtiff.a libtiff.a
+	${CC} -shared -Wl,-soname,libtiff.so.3 \
+	    -o libtiff.so.3.5.01  ${OBJS}   
+	rm -f libtiff.so.3
+	/bin/ln -s libtiff.so.3.5.01 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
@@ -316,20 +322,20 @@ installHdrs: ${INCS}
 	    ${INSTALL} -idb tiff.sw.dev -m 444 -F /usr/local/include		\
 		-src $$i -O $$f;					\
 	done
-installDSO: nodso
-	if [ a != a ]; then			\
+installDSO: LINUXdso
+	if [ so.3.5.01 != so.3 ]; then			\
 	    ${INSTALL} -idb tiff.sw.tools -m 555 -F /usr/local/lib		\
-		-O libtiff.a;				\
+		-O libtiff.so.3.5.01;				\
 	    ${INSTALL} -idb tiff.sw.tools -F /usr/local/lib			\
-		-ln libtiff.a -O libtiff.a;	\
+		-ln libtiff.so.3.5.01 -O libtiff.so.3;	\
 	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 [ LINUXdso != nodso ]; then					\
 	    ${MAKE} installDSO;						\
 	else								\
 	    true;							\
@@ -339,4 +345,4 @@ clean:
 	rm -f ${TARGETS} ${OBJS} core a.out \
 	    mkg3states tif_fax3sm.c \
 	    mkversion version.h \
-	    libtiff.a libtiff.a libtiff.a *dso
+	    libtiff.a libtiff.so.3 libtiff.so.3.5.01 *dso
diff --git a/libtiff/port.h b/libtiff/port.h
index f1b841e3..a8e3cc28 100644
--- a/libtiff/port.h
+++ b/libtiff/port.h
@@ -1,7 +1,7 @@
 /*
  * Warning, this file was automatically created by the TIFF configure script
- * VERSION:	 v3.4beta037
- * DATE:	 Wed Feb 3 19:53:27 EST 1999
+ * VERSION:	 v3.5.2
+ * DATE:	 Tue Sep 28 13:26:51 CEST 1999
  * TARGET:	 i586-unknown-linux
  * CCOMPILER:	 /usr/bin/gcc-2.7.2.3
  */