From dd4dbd4b9ce2aa69c2a97b324b8fd97ee554a6de Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 29 Jun 2005 23:27:30 +0000 Subject: [PATCH] * libnover.in (Makefile): Depend on correct makefile fragment. (SHLIBVEXT): Fix definition. (LIBLIST, LIBINSTLIST): Override configured definitions. (all-liblinks, clean-liblinks): Targets deleted. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17275 dc483132-0cff-0310-8789-dd5450dbe970 --- src/config/ChangeLog | 4 ++++ src/config/libnover.in | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 9ce315efa..d0f611d56 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,6 +1,10 @@ 2005-06-29 Ken Raeburn * libnover.in: New file. + (Makefile): Depend on correct makefile fragment. + (SHLIBVEXT): Fix definition. + (LIBLIST, LIBINSTLIST): Override configured definitions. + (all-liblinks, clean-liblinks): Targets deleted. 2005-06-20 Ken Raeburn diff --git a/src/config/libnover.in b/src/config/libnover.in index 3142eab42..33ae9da1b 100644 --- a/src/config/libnover.in +++ b/src/config/libnover.in @@ -31,7 +31,9 @@ dummy-target-1 $(SUBDIROBJLISTS) $(SUBDIROBJLISTS:.ST=.SH) $(SUBDIROBJLISTS:.ST= # 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;' -SHLIBVEXT=SHLIBEXT +SHLIBVEXT=$(SHLIBEXT) +LIBLIST=lib$(LIBBASE)$(SHLIBEXT) +LIBINSTLIST=install-shared lib$(LIBBASE)$(SHLIBVEXT): $(SHOBJLISTS) $(SHLIB_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP) $(RM) $@ @@ -77,21 +79,17 @@ $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT): lib$(LIBBASE)$(SHLIBEXT) (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBEXT) .) all-libs: $(LIBLIST) -all-liblinks: $(LIBLINKS) clean-libs: $(RM) lib$(LIBBASE)$(SHLIBEXT) $(RM) binutils.versions osf1.exports -clean-liblinks: - $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) - install-libs: $(LIBINSTLIST) install-shared: $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(SHLIBEXT) $(INSTALL_SHLIB) lib$(LIBBASE)$(SHLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) -Makefile: $(SRCTOP)/config/lib.in +Makefile: $(SRCTOP)/config/libnover.in $(thisconfigdir)/config.status: $(SRCTOP)/config/shlib.conf # Use the following if links need to be made to $(TOPLIBD): -- 2.26.2