diff options
Diffstat (limited to 'src')
40 files changed, 164 insertions, 85 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c095304f6..77501629a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * aclocal.m4 (KRB5_LIB_AUX): Use $(LIBBASE) instead of $(LIB). + 2004-06-03 Ken Raeburn <raeburn@mit.edu> * configure.in: Check for various _r functions needed for thread diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 51664026f..010f3d800 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1169,8 +1169,8 @@ if test "$enable_static" = no && test "$krb5_force_static" != yes; then LIBLIST= OBJLISTS= else - LIBLIST='lib$(LIB)$(STLIBEXT)' - LIBLINKS='$(TOPLIBD)/lib$(LIB)$(STLIBEXT)' + LIBLIST='lib$(LIBBASE)$(STLIBEXT)' + LIBLINKS='$(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT)' OBJLISTS=OBJS.ST LIBINSTLIST=install-static DEPLIBEXT=$STLIBEXT @@ -1208,15 +1208,15 @@ if test "$enable_shared" = yes; then OBJLISTS= LIBINSTLIST= fi - LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBEXT) $(TOPLIBD)/lib$(LIB)$(SHLIBVEXT)' + LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT)' case "$SHLIBSEXT" in .so.s-nobuild) LIBINSTLIST="$LIBINSTLIST install-shared" ;; *) - LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBSEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(SHLIBSEXT)' + LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBSEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT)' LIBINSTLIST="$LIBINSTLIST install-shlib-soname" ;; esac @@ -1247,8 +1247,8 @@ AC_ARG_ENABLE([profiled], ;; *) AC_MSG_NOTICE([enabling profiled libraries]) - LIBLIST="$LIBLIST "'lib$(LIB)$(PFLIBEXT)' - LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIB)$(PFLIBEXT)' + LIBLIST="$LIBLIST "'lib$(LIBBASE)$(PFLIBEXT)' + LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT)' OBJLISTS="$OBJLISTS OBJS.PF" LIBINSTLIST="$LIBINSTLIST install-profiled" ;; diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index ee96ebf12..9e5c888d7 100644 --- a/src/appl/telnet/libtelnet/ChangeLog +++ b/src/appl/telnet/libtelnet/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-03-04 Ken Raeburn <raeburn@mit.edu> * configure.in: Deleted; configure this dir from parent now. diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in index 80fcabf8c..bddb40a69 100644 --- a/src/appl/telnet/libtelnet/Makefile.in +++ b/src/appl/telnet/libtelnet/Makefile.in @@ -32,7 +32,7 @@ LIBOBJS=@LIBOBJS@ SETENVSRC=@SETENVSRC@ SETENVOBJ=@SETENVOBJ@ -LIB=telnet +LIBBASE=telnet LIBMAJOR=0 LIBMINOR=0 RELDIR=../../../appl/telnet/libtelnet diff --git a/src/config/ChangeLog b/src/config/ChangeLog index fb0398695..f04f6ac3c 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,10 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * lib.in (lib*, clean-*, install-*): Use $(LIBBASE) instead of + $(LIB). + * pre.in (SHLIB_EXPORT_FILE): Likewise. + * shlib.conf: Likewise. + 2004-05-30 Ken Raeburn <raeburn@mit.edu> * shlib.conf (*-*-aix*): Use linker options for library diff --git a/src/config/lib.in b/src/config/lib.in index 1b3feb604..6818d4a32 100644 --- a/src/config/lib.in +++ b/src/config/lib.in @@ -32,82 +32,82 @@ 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;' -lib$(LIB)$(STLIBEXT): $(STOBJLISTS) +lib$(LIBBASE)$(STLIBEXT): $(STOBJLISTS) $(RM) $@ - @echo "building static $(LIB) library" + @echo "building static $(LIBBASE) library" set -x; objlist=`$(PARSE_OBJLISTS) $(STOBJLISTS)` && $(AR) cq $@ $$objlist $(RANLIB) $@ -lib$(LIB)$(SHLIBVEXT): $(SHOBJLISTS) $(SHLIB_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP) +lib$(LIBBASE)$(SHLIBVEXT): $(SHOBJLISTS) $(SHLIB_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP) $(RM) $@ - @echo "building shared $(LIB) library ($(LIBMAJOR).$(LIBMINOR))" + @echo "building shared $(LIBBASE) library ($(LIBMAJOR).$(LIBMINOR))" set -x; objlist=`$(PARSE_OBJLISTS) $(SHOBJLISTS)` && $(MAKE_SHLIB_COMMAND) -lib$(LIB)$(SHLIBSEXT): lib$(LIB)$(SHLIBVEXT) +lib$(LIBBASE)$(SHLIBSEXT): lib$(LIBBASE)$(SHLIBVEXT) $(RM) $@ - $(LN_S) lib$(LIB)$(SHLIBVEXT) $@ -lib$(LIB)$(SHLIBEXT): lib$(LIB)$(SHLIBVEXT) + $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) $@ +lib$(LIBBASE)$(SHLIBEXT): lib$(LIBBASE)$(SHLIBVEXT) $(RM) $@ - $(LN_S) lib$(LIB)$(SHLIBVEXT) $@ + $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) $@ -lib$(LIB)$(PFLIBEXT): $(PFOBJLISTS) +lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS) $(RM) $@ - @echo "building profiled $(LIB) library" + @echo "building profiled $(LIBBASE) library" set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist $(RANLIB) $@ -$(TOPLIBD)/lib$(LIB)$(STLIBEXT): lib$(LIB)$(STLIBEXT) +$(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIB)$(STLIBEXT) .) -$(TOPLIBD)/lib$(LIB)$(SHLIBEXT): lib$(LIB)$(SHLIBEXT) + (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .) +$(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT): lib$(LIBBASE)$(SHLIBEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIB)$(SHLIBEXT) .) -$(TOPLIBD)/lib$(LIB)$(SHLIBSEXT): lib$(LIB)$(SHLIBSEXT) + (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBEXT) .) +$(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT): lib$(LIBBASE)$(SHLIBSEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIB)$(SHLIBSEXT) .) -$(TOPLIBD)/lib$(LIB)$(SHLIBVEXT): lib$(LIB)$(SHLIBVEXT) + (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBSEXT) .) +$(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT): lib$(LIBBASE)$(SHLIBVEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIB)$(SHLIBVEXT) .) -$(TOPLIBD)/lib$(LIB)$(PFLIBEXT): lib$(LIB)$(PFLIBEXT) + (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(SHLIBVEXT) .) +$(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT): lib$(LIBBASE)$(PFLIBEXT) $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIB)$(PFLIBEXT) .) + (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(PFLIBEXT) .) all-libs: $(LIBLIST) all-liblinks: $(LIBLINKS) clean-libs: - $(RM) lib$(LIB)$(STLIBEXT) - $(RM) lib$(LIB)$(SHLIBVEXT) - $(RM) lib$(LIB)$(SHLIBSEXT) - $(RM) lib$(LIB)$(SHLIBEXT) - $(RM) lib$(LIB)$(PFLIBEXT) + $(RM) lib$(LIBBASE)$(STLIBEXT) + $(RM) lib$(LIBBASE)$(SHLIBVEXT) + $(RM) lib$(LIBBASE)$(SHLIBSEXT) + $(RM) lib$(LIBBASE)$(SHLIBEXT) + $(RM) lib$(LIBBASE)$(PFLIBEXT) clean-liblinks: - $(RM) $(TOPLIBD)/lib$(LIB)$(STLIBEXT) - $(RM) $(TOPLIBD)/lib$(LIB)$(SHLIBVEXT) - $(RM) $(TOPLIBD)/lib$(LIB)$(SHLIBSEXT) - $(RM) $(TOPLIBD)/lib$(LIB)$(SHLIBEXT) - $(RM) $(TOPLIBD)/lib$(LIB)$(PFLIBEXT) + $(RM) $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT) + $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT) + $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT) + $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) + $(RM) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT) install-libs: $(LIBINSTLIST) install-static: - $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(STLIBEXT) - $(INSTALL_DATA) lib$(LIB)$(STLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) - $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(STLIBEXT) + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(STLIBEXT) + $(INSTALL_DATA) lib$(LIBBASE)$(STLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) + $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(STLIBEXT) install-shared: - $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT) - $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBEXT) - $(INSTALL_SHLIB) lib$(LIB)$(SHLIBVEXT) $(DESTDIR)$(KRB5_LIBDIR) - (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIB)$(SHLIBVEXT) \ - lib$(LIB)$(SHLIBEXT)) + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(SHLIBVEXT) + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(SHLIBEXT) + $(INSTALL_SHLIB) lib$(LIBBASE)$(SHLIBVEXT) $(DESTDIR)$(KRB5_LIBDIR) + (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) \ + lib$(LIBBASE)$(SHLIBEXT)) install-shlib-soname: install-shared - $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBSEXT) - (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIB)$(SHLIBVEXT) \ - lib$(LIB)$(SHLIBSEXT)) + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(SHLIBSEXT) + (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(SHLIBVEXT) \ + lib$(LIBBASE)$(SHLIBSEXT)) install-profiled: - $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(PFLIBEXT) - $(INSTALL_DATA) lib$(LIB)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) - $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(PFLIBEXT) + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) + $(INSTALL_DATA) lib$(LIBBASE)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) + $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) Makefile: $(SRCTOP)/config/lib.in config.status: $(SRCTOP)/config/shlib.conf diff --git a/src/config/pre.in b/src/config/pre.in index 19c2e36fe..7668a9d59 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -455,7 +455,7 @@ MAKE_COMMANDS-k5= $(BUILDTOP)/util/ss/mk_cmds LN_S=@LN_S@ AR=@AR@ -# Set to "lib$(LIB)$(STEXT) lib$(LIB)$(SHEXT) lib$(LIB)$(PFEXT)" or +# Set to "lib$(LIBBASE)$(STEXT) lib$(LIBBASE)$(SHEXT) lib$(LIBBASE)$(PFEXT)" or # some subset thereof by configure; determines which types of libs get # built. LIBLIST=@LIBLIST@ @@ -486,7 +486,7 @@ PFLIBEXT=@PFLIBEXT@ # File with symbol names to be exported, both functions and data, # currently not distinguished. -SHLIB_EXPORT_FILE=$(srcdir)/lib$(LIB).exports +SHLIB_EXPORT_FILE=$(srcdir)/lib$(LIBBASE).exports # File that needs to be current for building the shared library, # usually SHLIB_EXPORT_FILE, but not always, if we have to convert diff --git a/src/config/shlib.conf b/src/config/shlib.conf index 0768adb87..bc545c494 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -37,7 +37,7 @@ alpha*-dec-osf*) # Alpha OSF/1 doesn't need separate PIC objects SHOBJEXT=.o INIT_FINI_PREP='if test -z "$(LIBINITFUNC)"; then initfini=""; else initfini="-Wl,-init,$(LIBINITFUNC)__auxinit"; fi; if test -z "$(LIBFINIFUNC)";then :;else initfini="$$initfini -Wl,-fini,$(LIBFINIFUNC)"; fi' - LDCOMBINE='sed "s/^/-exported_symbol /" < $(SHLIB_EXPORT_FILE) > export && $(CC) -shared -Wl,-expect_unresolved -Wl,\* -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,lib$(LIB)$(SHLIBSEXT) -Wl,-hidden -Wl,-input,export $$initfini' + LDCOMBINE='sed "s/^/-exported_symbol /" < $(SHLIB_EXPORT_FILE) > export && $(CC) -shared -Wl,-expect_unresolved -Wl,\* -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,lib$(LIBBASE)$(SHLIBSEXT) -Wl,-hidden -Wl,-input,export $$initfini' use_linker_init_option=yes use_linker_fini_option=yes EXTRA_FILES="$EXTRA_FILES export" @@ -84,10 +84,10 @@ alpha*-dec-osf*) RPATH_FLAG='-Wl,+b,' if test "$krb5_cv_prog_gcc" = yes; then SHLIB_EXPFLAGS='-Wl,+s -Wl,+b,$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - LDCOMBINE='gcc -fPIC -shared -Wl,+h,lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='gcc -fPIC -shared -Wl,+h,lib$(LIBBASE)$(SHLIBSEXT)' else SHLIB_EXPFLAGS='+s +b $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - LDCOMBINE='ld -b +h lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='ld -b +h lib$(LIBBASE)$(SHLIBSEXT)' fi CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,+s $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' @@ -101,9 +101,9 @@ mips-sgi-irix6.3) # This is a Kludge; see below SHOBJEXT=.o # Kludge follows: (gcc makes n32 object files but ld expects o32, so we reeducate ld) if test "$krb5_cv_prog_gcc" = yes; then - LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIBBASE)$(SHLIBSEXT)' else - LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIBBASE)$(SHLIBSEXT)' fi SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' # no gprof for Irix... @@ -141,7 +141,7 @@ mips-sgi-irix*) INIT_FINI_PREP='if test -z "$(LIBINITFUNC)"; then initfini=""; else initfini="-Wl,-init,$(LIBINITFUNC)__auxinit"; fi; if test -z "$(LIBFINIFUNC)";then :;else initfini="$$initfini -Wl,-fini,$(LIBFINIFUNC)"; fi' LDCOMBINE_TAIL='-Wl,-exports_file -Wl,$(SHLIB_EXPORT_FILE)' fi - LDCOMBINE='$(CC) -shared -Wl,-ignore_unresolved -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,lib$(LIB)$(SHLIBSEXT) $$initfini' + LDCOMBINE='$(CC) -shared -Wl,-ignore_unresolved -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,lib$(LIBBASE)$(SHLIBSEXT) $$initfini' SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' # no gprof for Irix... PROFFLAGS=-p @@ -169,10 +169,10 @@ mips-sgi-irix*) mips-sni-sysv4) if test "$krb5_cv_prog_gcc" = yes; then PICFLAGS=-fpic - LDCOMBINE='$(CC) -G -Wl,-h -Wl,lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='$(CC) -G -Wl,-h -Wl,lib$(LIBBASE)$(SHLIBSEXT)' else PICFLAGS=-Kpic - LDCOMBINE='$(CC) -G -h lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='$(CC) -G -h lib$(LIBBASE)$(SHLIBSEXT)' fi SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' SHLIBEXT=.so @@ -190,7 +190,7 @@ mips-*-netbsd*) SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' SHLIBSEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so - LDCOMBINE='ld -shared -soname lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='ld -shared -soname lib$(LIBBASE)$(SHLIBSEXT)' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' RPATH_FLAG='-Wl,-rpath -Wl,' CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' @@ -254,7 +254,7 @@ mips-*-netbsd*) SHLIBSEXT='.$(LIBMAJOR).dylib' SHLIB_EXPFLAGS='$(SHLIB_DIRS) $(SHLIB_EXPLIBS)' SHLIBEXT=.dylib - LDCOMBINE='$(CC) -undefined warning -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT)" $(CFLAGS) $(LDFLAGS)' + LDCOMBINE='$(CC) -undefined warning -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/lib$(LIBBASE)$(SHLIBVEXT)" $(CFLAGS) $(LDFLAGS)' CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='DYLD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export DYLD_LIBRARY_PATH;' @@ -265,11 +265,11 @@ mips-*-netbsd*) *-*-solaris*) if test "$krb5_cv_prog_gcc" = yes; then PICFLAGS=-fPIC - LDCOMBINE='$(CC) -shared -h lib$(LIB)$(SHLIBSEXT)' + LDCOMBINE='$(CC) -shared -h lib$(LIBBASE)$(SHLIBSEXT)' else PICFLAGS=-KPIC # Solaris cc doesn't default to stuffing the SONAME field... - LDCOMBINE='$(CC) -dy -G -z text -h lib$(LIB)$(SHLIBSEXT) $$initfini' + LDCOMBINE='$(CC) -dy -G -z text -h lib$(LIBBASE)$(SHLIBSEXT) $$initfini' # INIT_FINI_PREP='if test -z "$(LIBINITFUNC)"; then initfini=; else initfini="-Wl,-z,initarray=$(LIBINITFUNC)__auxinit"; fi ; if test -z "$(LIBFINIFUNC)"; then :; else initfini="$$initfini -Wl,-z,finiarray=$(LIBFINIFUNC)" ; fi' use_linker_init_option=yes @@ -311,7 +311,7 @@ mips-*-netbsd*) SHLIBEXT=.so # Linux ld doesn't default to stuffing the SONAME field... # Use objdump -x to examine the fields of the library - LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,lib$(LIB)$(SHLIBSEXT) -Wl,--retain-symbols-file,$(SHLIB_EXPORT_FILE)' + LDCOMBINE='$(CC) -shared -fPIC -Wl,-h,lib$(LIBBASE)$(SHLIBSEXT) -Wl,--retain-symbols-file,$(SHLIB_EXPORT_FILE)' # LDCOMBINE_TAIL='' # For cases where we do have dependencies on other libraries @@ -329,7 +329,7 @@ mips-*-netbsd*) # for the libraries marked as not having any dependencies; while # that's not strictly correct, the resulting behavior -- not adding # extra -R directories -- is still what we want. - #LDCOMBINE='ld -shared -h lib$(LIB)$(SHLIBSEXT)' + #LDCOMBINE='ld -shared -h lib$(LIBBASE)$(SHLIBSEXT)' #LDCOMBINE_TAIL="-lc" #SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' diff --git a/src/lib/apputils/ChangeLog b/src/lib/apputils/ChangeLog index 382e1f33b..a7cd71968 100644 --- a/src/lib/apputils/ChangeLog +++ b/src/lib/apputils/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-02-26 Ken Raeburn <raeburn@mit.edu> * New directory. diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in index 80298fb99..eae3c8859 100644 --- a/src/lib/apputils/Makefile.in +++ b/src/lib/apputils/Makefile.in @@ -18,7 +18,7 @@ SED = sed # avoid having an empty library. STLIBOBJS=dummy.o @LIBOBJS@ STOBJLISTS=OBJS.ST -LIB=apputils +LIBBASE=apputils all-unix:: all-liblinks clean-unix:: clean-liblinks clean-libs clean-libobjs diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index b30a22c92..e6a7a6b0c 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-06-02 Ken Raeburn <raeburn@mit.edu> * prng.c (init_once): Variable deleted. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 4670684c5..f63e4d596 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -134,7 +134,7 @@ SRCS=\ $(srcdir)/verify_checksum.c -LIB=k5crypto +LIBBASE=k5crypto LIBMAJOR=3 LIBMINOR=0 LIBINITFUNC=cryptoint_initialize_library diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 0acc237cf..1549d81b2 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-04-22 Ken Raeburn <raeburn@mit.edu> * libdes425.exports: New file. diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index d9d04275e..be568a282 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -15,7 +15,7 @@ PROG_RPATH=$(KRB5_LIBDIR) RUN_SETUP=@KRB5_RUN_ENV@ -LIB=des425 +LIBBASE=des425 LIBMAJOR=3 LIBMINOR=0 RELDIR=des425 diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index f41c528f8..2d90a0aba 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-06-02 Ken Raeburn <raeburn@mit.edu> * gss_libinit.c (gssint_lib_init): Initialize error tables here. diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 764e418ee..de0ebe9b0 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -22,7 +22,7 @@ OBJS=\ SRCS=\ $(srcdir)/gss_libinit.c -LIB=gssapi_krb5 +LIBBASE=gssapi_krb5 LIBMAJOR=2 LIBMINOR=2 STOBJLISTS=OBJS.ST generic/OBJS.ST krb5/OBJS.ST diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index 0fc727973..eb947834f 100644 --- a/src/lib/kadm5/clnt/ChangeLog +++ b/src/lib/kadm5/clnt/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-04-22 Ken Raeburn <raeburn@mit.edu> * libkadm5clnt.exports: New file. diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index 603074e5c..b623a62a6 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -4,7 +4,7 @@ mydir=clnt BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 -LIB=kadm5clnt +LIBBASE=kadm5clnt LIBMAJOR=5 LIBMINOR=1 STOBJLISTS=../OBJS.ST OBJS.ST diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index e1e7ece48..5e260db52 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-04-22 Ken Raeburn <raeburn@mit.edu> * libkadm5srv.exports: New file. diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 92fac7e7e..c78ecd02e 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -8,7 +8,7 @@ DEFINES = @HESIOD_DEFS@ ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME = libkadm5srv.lib -LIB=kadm5srv +LIBBASE=kadm5srv LIBMAJOR=5 LIBMINOR=1 STOBJLISTS=../OBJS.ST OBJS.ST diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index a4ec4dc93..984b70d95 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-05-25 Ezra Peisach <epeisach@mit.edu> * keytab.c (krb5_ktkdb_get_entry): Change local variable rom int diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 5d59a06e9..e311d7d59 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -7,7 +7,7 @@ KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_C PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -LIB=kdb5 +LIBBASE=kdb5 LIBMAJOR=4 LIBMINOR=0 RELDIR=kdb diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 9b95dc615..a5c0e1325 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-04-22 Ken Raeburn <raeburn@mit.edu> * libkrb4.exports: New file. diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 8d3000cec..dbea96a67 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -9,7 +9,7 @@ DEFINES= -DKRB4_USE_KEYTAB ##DOS##LIBNAME=$(OUTPRE)krb4.lib ##DOS##OBJFILE=$(OUTPRE)krb4.lst -LIB=krb4 +LIBBASE=krb4 LIBMAJOR=2 LIBMINOR=0 RELDIR=krb4 diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index 5e621515a..bbf2d8f95 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-06-02 Ken Raeburn <raeburn@mit.edu> * krb5_libinit.c (initialized): Variable deleted, all references diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 274493316..9a57bf9ae 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -16,7 +16,7 @@ MAC_SUBDIRS = error_tables asn.1 ccache keytab krb rcache os posix STLIBOBJS=krb5_libinit.o -LIB=krb5 +LIBBASE=krb5 LIBMAJOR=3 LIBMINOR=2 diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index 5de6685f7..655a83376 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-05-30 Ken Raeburn <raeburn@mit.edu> * clnt_tcp.c: Include string.h. diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index fc1d340e4..9554b4602 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -7,7 +7,7 @@ DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 ##DOSBUILDTOP = ..\.. ##DOSLIBNAME=libgssrpc.lib -LIB=gssrpc +LIBBASE=gssrpc LIBMAJOR=3 LIBMINOR=0 STOBJLISTS=OBJS.ST diff --git a/src/util/db2/ChangeLog b/src/util/db2/ChangeLog index c0269703c..85f4d1f1e 100644 --- a/src/util/db2/ChangeLog +++ b/src/util/db2/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-05-23 Ken Raeburn <raeburn@mit.edu> * configure.in: Check for sys/param.h too. diff --git a/src/util/db2/Makefile.in b/src/util/db2/Makefile.in index 39dc7c216..393e5ed2d 100644 --- a/src/util/db2/Makefile.in +++ b/src/util/db2/Makefile.in @@ -4,7 +4,7 @@ mydir=. BUILDTOP=$(REL)..$(S).. LOCAL_SUBDIRS=hash btree db mpool recno clib test -LIB=db +LIBBASE=db LIBMAJOR=1 LIBMINOR=1 STOBJLISTS=hash/OBJS.ST btree/OBJS.ST db/OBJS.ST mpool/OBJS.ST \ diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index d26bb93b1..8b36dbef4 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-06-03 Ken Raeburn <raeburn@mit.edu> * com_err.c (com_err_va): In success case, don't then fall diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index c97547fef..2ca69144c 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -16,7 +16,7 @@ SED = sed STLIBOBJS=error_message.o et_name.o com_err.o STOBJLISTS=OBJS.ST -LIB=com_err +LIBBASE=com_err LIBMAJOR=3 LIBMINOR=0 LIBINITFUNC=com_err_initialize diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog index ca3af0bff..248a5d83e 100644 --- a/src/util/profile/ChangeLog +++ b/src/util/profile/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-06-03 Ken Raeburn <raeburn@mit.edu> * prof_file.c (profile_open_file): Handle earlier (draft POSIX) diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index ada45a379..af0628a37 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -40,7 +40,7 @@ EXTRADEPSRCS=$(srcdir)/test_parse.c $(srcdir)/test_profile.c DEPLIBS = $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) MLIBS = -lcom_err $(SUPPORT_LIB) -LIB=profile +LIBBASE=profile LIBMAJOR=1 LIBMINOR=1 SHLIB_EXPDEPS = $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog index 5f5ddaec0..ecaa7205d 100644 --- a/src/util/pty/ChangeLog +++ b/src/util/pty/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-04-12 Ezra Peisach <epeisach@mit.edu> * configure.in: Remove tests for strsave, sys_errlist, diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in index 4620bd4f2..0f179cfc0 100644 --- a/src/util/pty/Makefile.in +++ b/src/util/pty/Makefile.in @@ -10,7 +10,7 @@ KRB5_RUN_ENV= @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -LIB=pty +LIBBASE=pty LIBMAJOR=1 LIBMINOR=2 diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog index fde441576..91dccad47 100644 --- a/src/util/ss/ChangeLog +++ b/src/util/ss/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-03-17 Ken Raeburn <raeburn@mit.edu> * error.c (ss_error): Always use ANSI C form. Don't try to hide diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in index d36b0ae33..e5588885a 100644 --- a/src/util/ss/Makefile.in +++ b/src/util/ss/Makefile.in @@ -11,7 +11,7 @@ all:: TOP=$(BUILDTOP) -LIB=ss +LIBBASE=ss LIBMAJOR=1 LIBMINOR=0 RELDIR=../util/ss diff --git a/src/util/support/ChangeLog b/src/util/support/ChangeLog index 1ecce49a8..3f2dface9 100644 --- a/src/util/support/ChangeLog +++ b/src/util/support/ChangeLog @@ -1,3 +1,7 @@ +2004-06-04 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (LIBBASE): Renamed from LIB. + 2004-05-05 Ken Raeburn <raeburn@mit.edu> * threads.c (krb5int_thread_support_fini) [!ENABLE_THREADS]: diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in index 80b599068..5a683fac8 100644 --- a/src/util/support/Makefile.in +++ b/src/util/support/Makefile.in @@ -10,7 +10,7 @@ KRB5_RUN_ENV= @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -LIB=krb5support +LIBBASE=krb5support LIBMAJOR=0 LIBMINOR=0 |