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

diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index beda5da5560e7ebc0d226c98e0307f35a8f5ba93..73597a26cba078ed55bca7b4704fbad90a9dc844 100644 (file)
--- 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 d57d6f08f3875ead77c48fdafe99ce2aac94b6eb..429acdd3a822da5e775fcc944f468fb9cca680dc 100644 (file)
--- 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 37de475b47e935cf88f0bd8c474606d964be7df2..dc142ba8615b70331492374dac19091b84804168 100644 (file)
--- 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 3cc5da939d8be312b4c0604a8b7ebe27c052e4a7..d2df68c79cc8f0510f6c3d4928a0302a6ef8ecc2 100644 (file)
--- 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 a2ff7c5c0ce26b6031c4e3eacf3ba495e795cae7..f7206c83d46c47ff038785b0c5a0189c4b47bfa5 100644 (file)
--- 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)