$NetBSD: patch-ad,v 1.3 2005/09/22 19:45:42 jlam Exp $ --- config/lib.in.orig 2005-04-07 17:38:51.000000000 -0400 +++ config/lib.in @@ -26,8 +26,9 @@ # STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc... SHOBJLISTS=$(STOBJLISTS:.ST=.SH) PFOBJLISTS=$(STOBJLISTS:.ST=.PF) +LAOBJLISTS=$(STOBJLISTS:.ST=.LA) -dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF): all-recurse +dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST=.PF) $(SUBDIROBJLISTS:.ST=.LA): all-recurse # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files PARSE_OBJLISTS= set -x && $(PERL) -p -e '$$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;' @@ -90,6 +91,17 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS) set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist $(RANLIB) $@ +lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS) + $(RM) $@ + @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))" + @dirs=`echo $(LAOBJLISTS) | \ + sed -e 's%/OBJS.LA%%g' -e 's%OBJS.LA%.%'`; \ + $(LIBTOOL) --mode=link $(CC) -o $@ `for d in $$dirs; do \ + sed -e '/^$$/d' -e "s%^%$$d/%" -e "s% % $$d/%g" \ + $$d/OBJS.LA; done` \ + $(LALIB_EXPFLAGS) \ + $(LIBTOOL_TAIL) + $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT) $(RM) $@ (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .) @@ -105,6 +117,9 @@ $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT): li $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT): lib$(LIBBASE)$(PFLIBEXT) $(RM) $@ (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(PFLIBEXT) .) +$(TOPLIBD)/lib$(LIBBASE)$(LALIBEXT): lib$(LIBBASE)$(LALIBEXT) + $(RM) $@ + (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(LALIBEXT) .) all-libs: $(LIBLIST) all-liblinks: $(LIBLINKS) @@ -115,6 +130,7 @@ clean-libs: $(RM) lib$(LIBBASE)$(SHLIBSEXT) $(RM) lib$(LIBBASE)$(SHLIBEXT) $(RM) lib$(LIBBASE)$(PFLIBEXT) + $(LIBTOOL) --mode=uninstall $(RM) lib$(LIBBASE)$(LALIBEXT) $(RM) binutils.versions osf1.exports clean-liblinks: @@ -123,6 +139,7 @@ clean-liblinks: $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT) $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(RM) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT) + $(RM) $(TOPLIBD)/lib$(LIBBASE)$(LALIBEXT) install-libs: $(LIBINSTLIST) install-static: @@ -143,6 +160,9 @@ install-profiled: $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) $(INSTALL_DATA) lib$(LIBBASE)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) +install-libtool: + $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(LALIBEXT) + $(LIBTOOL) --mode=install $(INSTALL_DATA) lib$(LIBBASE)$(LALIBEXT) $(DESTDIR)$(KRB5_LIBDIR) Makefile: $(SRCTOP)/config/lib.in $(thisconfigdir)/config.status: $(SRCTOP)/config/shlib.conf