Skip to content

Commit

Permalink
Add missing $(LIBS) to some shared libraries
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tlyu committed May 17, 2012
1 parent a2d4723 commit 0eaf092
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/lib/kadm5/clnt/Makefile.in
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/kadm5/srv/Makefile.in
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/rpc/Makefile.in
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/kdb/db2/libdb2/Makefile.in
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/util/verto/Makefile.in
Expand Up @@ -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)

Expand Down

0 comments on commit 0eaf092

Please sign in to comment.