From 3b161b42066459ef417182b68fa470d0b7a3e589 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 29 Jun 2005 19:23:01 +0000 Subject: [PATCH] * Makefile.in (LIB): Variable deleted, uses replaced with LIBBASE. (SHLIB_EXPDEPS, SHLIB_EXPLIBS): Add gssrpc library and depedencies. (lib$(LIBBASE)$(SO_EXT)): Don't explicitly link in the gssrpc library. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17271 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kdb/kdb_db2/ChangeLog | 9 +++++++++ src/lib/kdb/kdb_db2/Makefile.in | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/lib/kdb/kdb_db2/ChangeLog b/src/lib/kdb/kdb_db2/ChangeLog index 6855ef71c..8ff53f671 100644 --- a/src/lib/kdb/kdb_db2/ChangeLog +++ b/src/lib/kdb/kdb_db2/ChangeLog @@ -1,3 +1,12 @@ +2005-06-29 Ken Raeburn + + * Makefile.in (LIB): Variable deleted, uses replaced with + LIBBASE. + (SHLIB_EXPDEPS, SHLIB_EXPLIBS): Add gssrpc library and + depedencies. + (lib$(LIBBASE)$(SO_EXT)): Don't explicitly link in the gssrpc + library. + 2005-06-27 Ken Raeburn * kdb_db2.c: Don't use C++-style comments. diff --git a/src/lib/kdb/kdb_db2/Makefile.in b/src/lib/kdb/kdb_db2/Makefile.in index ebd39f0c7..b52ada92f 100644 --- a/src/lib/kdb/kdb_db2/Makefile.in +++ b/src/lib/kdb/kdb_db2/Makefile.in @@ -10,17 +10,17 @@ PROG_RPATH=$(KRB5_LIBDIR) LOCALINCLUDES = -I.. LIBBASE=kdb_db2 -LIB=$(LIBBASE) LIBMAJOR=4 LIBMINOR=0 RELDIR=kdb/kdb_db2 SO_EXT=.so # Depends on libk5crypto and libkrb5 - +# Also on gssrpc, for xdr stuff. SHLIB_EXPDEPS = \ + $(GSSRPC_DEPLIBS) \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ $(TOPLIBD)/libkrb5$(SHLIBEXT) -SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(LIBS) +SHLIB_EXPLIBS=$(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(LIBS) SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) @@ -31,7 +31,7 @@ DBOBJLISTS-k5 = $(DBDIR)/hash/OBJS.ST $(DBDIR)/btree/OBJS.ST \ $(DBDIR)/db/OBJS.ST $(DBDIR)/mpool/OBJS.ST $(DBDIR)/recno/OBJS.ST \ $(DBDIR)/clib/OBJS.ST -all:: lib$(LIB)$(SO_EXT) +all:: lib$(LIBBASE)$(SO_EXT) SRCS= \ $(srcdir)/kdb_xdr.c \ @@ -54,11 +54,11 @@ all-unix:: all-liblinks install-unix:: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs -lib$(LIB)$(SO_EXT): db2_exp.o # lib$(LIB)$(STLIBEXT) - $(CC) -shared -o $@ -L$(TOPLIBD) $^ -lgssrpc -ldb $(SHLIB_EXPLIBS) +lib$(LIBBASE)$(SO_EXT): db2_exp.o + $(CC) -shared -o $@ -L$(TOPLIBD) $^ -ldb $(SHLIB_EXPLIBS) clean:: - $(RM) lib$(LIB)$(SO_EXT) db2_exp.o + $(RM) lib$(LIBBASE)$(SO_EXT) db2_exp.o t_kdb: t_kdb.o $(OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS) -- 2.26.2