From 78c8dbfcd6197a49a0324b3cf9fce894aa6f0824 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Thu, 27 Oct 2005 05:19:45 +0000 Subject: Allow dynamic-object dependencies and build flags to be specified as distinct from shared-library dependencies and flags. Define them for the Mac, default to same as shared-library versions on other platforms. * config/shlib.conf: Set DYNOBJ_EXPDEPS and DYNOBJ_EXPFLAGS. (*-*-darwin*): Change MAKE_DYNOBJ_COMMAND definition to use DYNOBJ_EXPFLAGS and DYNOBJ_LOADER_PROG instead of SHLIB_EXPFLAGS and a hardcoded pathname to the KDC binary, respectively. * config/pre.in (DYNOBJ_EXPDEPS, DYNOBJ_EXPFLAGS): New variables. * config/libnover.in ($(LIBBASE)$(DYNOBJEXT)): Use DYNOBJ_EXPDEPS instead of SHLIB_EXPDEPS in dependencies. * aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute DYNOBJ_EXPDEPS and DYNOBJ_EXPFLAGS. * modules/kdb/db2/Makefile.in (DYNOBJ_LOADER_PROG, DYNOBJ_EXPFLAGS_WITH_LOADER, DYNOBJ_EXPDEPS_WITH_LOADER): New variables. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17456 dc483132-0cff-0310-8789-dd5450dbe970 --- src/modules/kdb/db2/ChangeLog | 5 +++++ src/modules/kdb/db2/Makefile.in | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'src/modules') diff --git a/src/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog index e801f6919..d2dcbe18f 100644 --- a/src/modules/kdb/db2/ChangeLog +++ b/src/modules/kdb/db2/ChangeLog @@ -1,3 +1,8 @@ +2005-10-27 Ken Raeburn + + * Makefile.in (DYNOBJ_LOADER_PROG, DYNOBJ_EXPFLAGS_WITH_LOADER, + DYNOBJ_EXPDEPS_WITH_LOADER): New variables. + 2005-10-13 Ken Raeburn * Makefile.in (SHLIB_EXPLIBS): Revert 10-04 change; add support diff --git a/src/modules/kdb/db2/Makefile.in b/src/modules/kdb/db2/Makefile.in index a22b383bc..67662bf34 100644 --- a/src/modules/kdb/db2/Makefile.in +++ b/src/modules/kdb/db2/Makefile.in @@ -62,6 +62,10 @@ STLIBOBJS= \ pol_xdr.o \ db2_exp.o +DYNOBJ_LOADER_PROG = $(BUILDTOP)/kdc/krb5kdc +DYNOBJ_EXPFLAGS_WITH_LOADER = -lgssrpc $(KDB5_DB_LIB) +DYNOBJ_EXPDEPS_WITH_LOADER = $(GSSRPC_DEPLIBS) + all-unix:: $(LIBBASE)$(SO_EXT) install-unix:: install-libs clean-unix:: clean-libs clean-libobjs -- cgit