* 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

diff --git a/src/lib/kdb/kdb_db2/ChangeLog b/src/lib/kdb/kdb_db2/ChangeLog
index 6855ef71c39f7f2ba9b194b2097c93b44ab272ef..8ff53f671982ba7fa3d04b161c4947b8ea038eb6 100644 (file)
--- a/src/lib/kdb/kdb_db2/ChangeLog
+++ b/src/lib/kdb/kdb_db2/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-29  Ken Raeburn  <raeburn@mit.edu>
+
+       * 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  <raeburn@mit.edu>
 
        * 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 ebd39f0c7ae4d9d665d661132e87c5eaa067dedd..b52ada92f084e885eb511c7af9a43a91cb929ba2 100644 (file)
--- 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)