$NetBSD: patch-ad,v 1.2 2004/03/09 11:24:04 seb Exp $ --- lib/Makefile.SH.orig Fri Apr 16 11:59:24 1999 +++ lib/Makefile.SH Sun May 9 23:54:32 1999 @@ -39,7 +39,7 @@ # Parameters set by Configure -- edit config.sh if changes are needed AR = ar rc -CC = $cc +CC = \$(LIBTOOL) --tag=CC --mode=compile $cc CTAGS = ctags MAKE = make MKDEP = $mkdep \$(DPFLAGS) -- @@ -58,9 +58,9 @@ EMBED = $embed_ldopts CFLAGS = $ccflags $optimize $mccflags SO = $so -REV = $baserev.$patchlevel +REV = $baserev PRIVLIB = $installprivlib -PRIVINC = `echo $installprivlib | sed -e s:/lib/:/include/:` +PRIVINC = `echo $installprivlib | sed -e s:/lib:/include:` USRINC = $usrinc SUBDIRS = \$(SUBDIRS) @@ -111,7 +111,7 @@ SRCS = cutil.c ustubs.c panic.c futil.c OBJS = cutil.o ustubs.o panic.o futil.o -all:: libwais.a wais.h +all:: libwais.la wais.h $(CTYPEOBJ) $(REGEXPOBJ) $(FTWOBJS) $(IROBJS): subdirs @@ -151,15 +151,14 @@ ALLOBJ = $(CTYPEOBJ) $(REGEXPOBJ) $(OBJS) $(FTWOBJS) $(IROBJS) -libwais.a: $(OBJS) subdirs +libwais.la: $(OBJS) subdirs $(RM) $@ - $(AR) $@ $(ALLOBJ) - $(RANLIB) $@ + ${LIBTOOL} --tag=CC --mode=link cc -o ${.TARGET:.a=.la} ${ALLOBJ:.o=.lo} -rpath ${PREFIX}/lib -version-info `echo $(REV) | tr . :` -install:: libwais.a - $(INSTALL) -c -m 644 libwais.a $(PRIVLIB) - $(RANLIB) $(PRIVLIB)/libwais.a - chmod 444 $(PRIVLIB)/libwais.a + +install:: + $(LIBTOOL) --mode=install $(INSTALL) -c -m 444 libwais.la $(PRIVLIB) + $(LIBTOOL) --finish $(PRIVLIB) deinstall:: $(RM) $(PRIVLIB)/libwais.a @@ -188,7 +187,7 @@ install:: wais.h @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for i in wais.h; do \ - (set -x; $(INSTALL) -c -m 664 $$i $(PRIVINC)); \ + (set -x; $(INSTALL) -c -m 444 $$i $(PRIVINC)); \ done deinstall::