diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-04-23 00:43:15 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-04-23 00:43:15 +0000 |
| commit | a8a3c79930e4720ae57d1b598d3ad19e4de635af (patch) | |
| tree | 6869545e0def375261fbcb3fa0287175c707b21b /src/config/lib.in | |
| parent | 3102b8cd0a7ef822229383951799867101a366f2 (diff) | |
| download | krb5-a8a3c79930e4720ae57d1b598d3ad19e4de635af.tar.gz krb5-a8a3c79930e4720ae57d1b598d3ad19e4de635af.tar.xz krb5-a8a3c79930e4720ae57d1b598d3ad19e4de635af.zip | |
Use more flexible command substitution for shared library generation, so we can
dump makeshlib.sh. Use the new saved export list files for AIX.
* aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute MAKE_SHLIB_COMMAND, not
LDCOMBINE and LDCOMBINE_TAIL.
* pre.in (DO_MAKE_SHLIB, SHLIB_STATIC_TARGET, LDCOMBINE, LDCOMBINE_TAIL):
Delete unused variables.
(SHLIB_EXPORT_FILE, SHLIB_EXPORT_FILE_DEP, MAKE_SHLIB_COMMAND): New variables.
* config/lib.in (lib$(LIB)$(SHLIBVEXT)): Set objlist to the list of object
files before invoking MAKE_SHLIB_COMMAND, instead of wrapping the list with
LDCOMBINE and LDCOMBINE_TAIL. Depend on SHLIB_EXPORT_FILE_DEP.
* config/shlib.conf: Set MAKE_SHLIB_COMMAND, using LDCOMBINE and LDCOMBINE_TAIL
in the common case.
(case *-*-aix*): Specify new commands, taken from makeshlib.sh, but assume the
export list is provided externally.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16263 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config/lib.in')
| -rw-r--r-- | src/config/lib.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/config/lib.in b/src/config/lib.in index 95d938fd25..30c0f499d7 100644 --- a/src/config/lib.in +++ b/src/config/lib.in @@ -39,16 +39,16 @@ lib$(LIB)$(STLIBEXT): $(STOBJLISTS) $$d/OBJS.ST; done` $(RANLIB) $@ -lib$(LIB)$(SHLIBVEXT): $(SHOBJLISTS) $(SHLIB_EXPDEPS) +lib$(LIB)$(SHLIBVEXT): $(SHOBJLISTS) $(SHLIB_EXPDEPS) $(SHLIB_EXPORT_FILE_DEP) $(RM) $@ @echo "building shared $(LIB) library ($(LIBMAJOR).$(LIBMINOR))" @dirs=`echo $(SHOBJLISTS) | \ sed -e 's%/OBJS.SH%%g' -e 's%OBJS.SH%.%'`; \ - $(LDCOMBINE) -o $@ `for d in $$dirs; do \ + objlist=`for d in $$dirs; do \ sed -e '/^$$/d' -e "s%^%$$d/%" -e "s% % $$d/%g" \ - $$d/OBJS.SH; done` \ - $(SHLIB_EXPFLAGS) \ - $(LDCOMBINE_TAIL) + $$d/OBJS.SH; done` ; \ + set -x ; $(MAKE_SHLIB_COMMAND) + lib$(LIB)$(SHLIBSEXT): lib$(LIB)$(SHLIBVEXT) $(RM) $@ $(LN_S) lib$(LIB)$(SHLIBVEXT) $@ |