krb5 commit: Add missing $(LIBS) to some shared libraries

Tom Yu tlyu at MIT.EDU
Thu May 17 19:40:46 EDT 2012


https://github.com/krb5/krb5/commit/0eaf09290223c25ce846a09808f192ab38cced15
commit 0eaf09290223c25ce846a09808f192ab38cced15
Author: Tom Yu <tlyu at mit.edu>
Date:   Thu May 17 19:32:41 2012 -0400

    Add missing $(LIBS) to some shared libraries
    
    Add $(LIBS) to the $(SHLIB_EXPLIBS) for some shared libraries which
    did not previously include it, which prevented gcov from working
    properly in some cases.
    
    Patch from W. Trevor King.
    
    ticket: 7138

 src/lib/kadm5/clnt/Makefile.in         |    2 +-
 src/lib/kadm5/srv/Makefile.in          |    2 +-
 src/lib/rpc/Makefile.in                |    2 +-
 src/plugins/kdb/db2/libdb2/Makefile.in |    2 +-
 src/util/verto/Makefile.in             |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index beda5da..73597a2 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -13,7 +13,7 @@ SHLIB_EXPDEPS=\
 	$(TOPLIBD)/libkrb5$(SHLIBEXT) \
 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
 	$(COM_ERR_DEPLIB) $(SUPPORT_LIBDEP)
-SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err
+SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err $(LIBS)
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 RELDIR=kadm5/clnt
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index d57d6f0..429acdd 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -22,7 +22,7 @@ SHLIB_EXPDEPS=\
 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
 	$(COM_ERR_DEPLIB) $(SUPPORT_LIBDEP)
 SHLIB_EXPLIBS =	-lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \
-		-lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err @GEN_LIB@
+		-lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err @GEN_LIB@ $(LIBS)
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 RELDIR=kadm5/srv
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index 37de475..dc142ba 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -17,7 +17,7 @@ SHLIB_EXPDEPS= \
 	$(TOPLIBD)/libkrb5$(SHLIBEXT) \
 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
 	$(COM_ERR_DEPLIB)
-SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
+SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $(LIBS)
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 RELDIR=rpc
diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index 3cc5da9..d2df68c 100644
--- a/src/plugins/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -14,7 +14,7 @@ HDRDIR=$(BUILDTOP)/include
 HDRS =	$(HDRDIR)/db.h $(HDRDIR)/db-config.h
 
 SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
-SHLIB_EXPLIBS=$(SUPPORT_LIB)
+SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 
diff --git a/src/util/verto/Makefile.in b/src/util/verto/Makefile.in
index a2ff7c5..f7206c8 100644
--- a/src/util/verto/Makefile.in
+++ b/src/util/verto/Makefile.in
@@ -17,7 +17,7 @@ LIBOBJS=$(OUTPRE)verto.$(OBJEXT) $(OUTPRE)module.$(OBJEXT)
 SRCS=verto.c module.c
 
 STOBJLISTS=OBJS.ST
-SHLIB_EXPLIBS= $(DL_LIB)
+SHLIB_EXPLIBS= $(DL_LIB) $(LIBS)
 SHLIB_DIRS=
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 


More information about the cvs-krb5 mailing list