svn commit: r311174 - in head: . usr.sbin/bsnmpd/tools usr.sbin/bsnmpd/tools/bsnmptools usr.sbin/bsnmpd/tools/libbsnmptools

[Ngie Cooper]

Author: ngie
Date: Tue Jan  3 22:31:05 2017
New Revision: 311174
URL: https://svnweb.freebsd.org/changeset/base/311174

Log:
  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

Modified:
  head/ObsoleteFiles.inc
  head/usr.sbin/bsnmpd/tools/Makefile
  head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
  head/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Tue Jan  3 22:05:07 2017	(r311173)
+++ head/ObsoleteFiles.inc	Tue Jan  3 22:31:05 2017	(r311174)
@@ -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

Modified: head/usr.sbin/bsnmpd/tools/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/tools/Makefile	Tue Jan  3 22:05:07 2017	(r311173)
+++ head/usr.sbin/bsnmpd/tools/Makefile	Tue Jan  3 22:31:05 2017	(r311174)
@@ -4,4 +4,8 @@
 SUBDIR=	libbsnmptools \
 	bsnmptools
 
+SUBDIR_DEPEND_bsnmptools=	libbsnmptools
+
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile	Tue Jan  3 22:05:07 2017	(r311173)
+++ head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile	Tue Jan  3 22:31:05 2017	(r311174)
@@ -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

Modified: head/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile	Tue Jan  3 22:05:07 2017	(r311173)
+++ head/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile	Tue Jan  3 22:31:05 2017	(r311174)
@@ -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>