From 71aa1443ea9487608475ef4f66ecf7b59345069a Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Tue, 3 Jan 2017 22:31:05 +0000
Subject: [PATCH] Make /usr/lib/libbsnmptools.so.0 into an INTERRNALLIB

Although it increases the size of the bsnmp{get,set,walk} binaries by
four on my [amd64] system, it removes the need for producing .debug
files, profiled libraries, and for installing the library itself,
reducing the overall size use on disk by the utilities noted
previously.

Plus, it guards against ABI/API compatibility issues with the library
as it's only used internal to the tools themselves.

MFC after:	3 weeks
---
 ObsoleteFiles.inc                            | 5 +++++
 usr.sbin/bsnmpd/tools/Makefile               | 4 ++++
 usr.sbin/bsnmpd/tools/bsnmptools/Makefile    | 4 +++-
 usr.sbin/bsnmpd/tools/libbsnmptools/Makefile | 4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 449e59378d32..1180d3343910 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170103: libbsnmptools.so made into an INTERNALLIB
+OLD_FILES+=usr/lib/libbsnmptools.a
+OLD_FILES+=usr/lib/libbsnmptools_p.a
+OLD_LIBS+=usr/lib/libbsnmptools.so.0
+OLD_LIBS+=usr/lib/libbsnmptools.so
 # 20170102: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
 # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu
diff --git a/usr.sbin/bsnmpd/tools/Makefile b/usr.sbin/bsnmpd/tools/Makefile
index 3ffc01e67764..cba5cee47ea9 100644
--- a/usr.sbin/bsnmpd/tools/Makefile
+++ b/usr.sbin/bsnmpd/tools/Makefile
@@ -4,4 +4,8 @@
 SUBDIR=	libbsnmptools \
 	bsnmptools
 
+SUBDIR_DEPEND_bsnmptools=	libbsnmptools
+
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
index f63975b2f7c0..09280a48a3b5 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
@@ -8,7 +8,9 @@
 PROG=	bsnmpget
 
 LIBADD=	bsnmp bsnmptools
-CFLAGS+=	-I${.CURDIR}/../libbsnmptools
+
+CFLAGS+=	-I${.CURDIR:H}/libbsnmptools
+LDFLAGS+=	-L${.OBJDIR:H}/libbsnmptools
 
 LINKS=  ${BINDIR}/bsnmpget ${BINDIR}/bsnmpwalk
 LINKS+=  ${BINDIR}/bsnmpget ${BINDIR}/bsnmpset
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
index 3551464e5de5..970a2e8f0bf8 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
@@ -5,9 +5,9 @@
 .PATH: ${.CURDIR}
 
 LIB=	bsnmptools
-#INTERNALLIB=
+
 SRCS=	bsnmpimport.c bsnmpmap.c bsnmptools.c bsnmptc.c
 
-SHLIB_MAJOR=	0
+INTERNALLIB=
 
 .include <bsd.lib.mk>