[src/trunk]: src/external/bsd/dhcp Don't link partially with static libraries.

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4be671668fa9
branches:  trunk
changeset: 340724:4be671668fa9
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Sep 26 09:48:27 2015 +0000

description:
Don't link partially with static libraries.
Don't link with kerberos librararies, nothing is using them.
Don't link with libipsec, our local patch, that requires it, is gone.

diffstat:

 external/bsd/dhcp/Makefile.inc |  25 +++++--------------------
 1 files changed, 5 insertions(+), 20 deletions(-)

diffs (41 lines):

diff -r f3e928889c55 -r 4be671668fa9 external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc    Sat Sep 26 04:13:39 2015 +0000
+++ b/external/bsd/dhcp/Makefile.inc    Sat Sep 26 09:48:27 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.13 2015/01/23 03:00:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.14 2015/09/26 09:48:27 mlelstv Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -31,27 +31,12 @@
 CPPFLAGS+= -DLOCALSTATEDIR='"/var"'
 LDADD+= ${COBJDIR}/libdhcp.a
 LDADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
-.if defined(PROG) && ${PROG} == "dhclient"
-LDADD+=-Wl,-Bstatic
+.if (${MKCRYPTO} != "no")
+LDADD+= -lcrypto -lcrypt
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
 .endif
-LDADD+= -lirs -lisccfg -ldns -lisc
+LDADD+=-lirs -lisccfg -ldns -lisc
 LDADD+=-lpthread
-.if (${MKCRYPTO} != "no")
-.if (${MKKERBEROS} != "no")
-LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
-       -lcom_err  -lroken -lasn1 -lwind
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
-       ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
-.endif
-.if defined(PROG) && ${PROG} == "dhclient"
-LDADD+=-Wl,-Bdynamic
-.endif
-LDADD+= -lcrypto -lipsec -lcrypt
-DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
-.endif
-.if defined(PROG) && ${PROG} == "dhclient"
-LDADD+=-Wl,-Bdynamic
-.endif
 DPADD+= ${COBJDIR}/libdhcp.a
 DPADD+= ${OMOBJDIR}/libomapi.a ${DSTOBJDIR}/libdst.a
 DPADD+=        ${LIBDNS} ${LIBISC}