$NetBSD: patch-ad,v 1.9 2002/03/05 10:33:36 martti Exp $ --- libtiff/Makefile.in.orig Sun Sep 9 17:56:04 2001 +++ libtiff/Makefile.in Mon Mar 4 16:05:30 2002 @@ -36,12 +36,18 @@ SHELL = @SCRIPT_SH@ SCRIPT_SH = @SCRIPT_SH@ NULL = -CC = @CCOMPILER@ +CCOMPILER = @CCOMPILER@ +CC = ${LIBTOOL} ${CCOMPILER} AR = @AR@ AROPTS = @AROPTS@ RANLIB = @RANLIB@ INSTALL = @INSTALL@ +LIBJPEG = @LIBJPEG@ +LIBGZ = @LIBGZ@ +LIBPORT = @LIBPORT@ +MACHLIBS = @MACHDEPLIBS@ + # # If JPEG support is to be included and the Independent JPEG # Software distribution is not installed then DIR_JPEG must @@ -138,7 +144,7 @@ tif_write.o \ tif_zip.o \ ${NULL} -TARGETS = libtiff.a +TARGETS = libtiff.la all: ${TARGETS} if [ @DSO@dso != nodso ]; then \ @@ -147,9 +153,10 @@ true; \ fi -libtiff.a: ${OBJS} - ${AR} ${AROPTS} libtiff.a $? - ${RANLIB} libtiff.a +libtiff.la: ${OBJS} + ${CC} -o $@ ${OBJS:.o=.lo} -rpath @DIR_LIB@ \ + -version-info @DIST_MAJOR@:@DIST_MINOR@ \ + ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} # # NB: The configure script verifies that the configured @@ -277,8 +284,13 @@ ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dir.c tif_dirinfo.o: ${SRCDIR}/tif_dirinfo.c ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirinfo.c +.if (${MACHINE_ARCH} == "sparc64") +tif_dirread.o: ${SRCDIR}/tif_dirread.c + ${CC} -c ${CFLAGS} -O0 ${SRCDIR}/tif_dirread.c +.else tif_dirread.o: ${SRCDIR}/tif_dirread.c ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirread.c +.endif tif_dirwrite.o: ${SRCDIR}/tif_dirwrite.c ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirwrite.c tif_dumpmode.o: ${SRCDIR}/tif_dumpmode.c @@ -377,7 +389,7 @@ install: all installHdrs ${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@ - ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_LIB@ -O libtiff.a + ${LIBTOOL} ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@ if [ @DSO@dso != nodso ]; then \ ${MAKE} -${MAKEFLAGS} installDSO; \ else \