diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-04 17:21:17 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-04 17:21:17 +0000 |
| commit | ecf2f59eff58c705a0d5187f3e7614df3015e4af (patch) | |
| tree | 4a6d6b9f653e2d2440385ab8a7f711dc3783e6b2 | |
| parent | 57984c7830ebdc4772eb1d89c9982b4462456c40 (diff) | |
| download | FreeBSD-src-ecf2f59eff58c705a0d5187f3e7614df3015e4af.zip FreeBSD-src-ecf2f59eff58c705a0d5187f3e7614df3015e4af.tar.gz | |
MFC r311174:
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.
| -rw-r--r-- | ObsoleteFiles.inc | 5 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/tools/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/tools/bsnmptools/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/tools/libbsnmptools/Makefile | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index dd82ea6..30ed470 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 # 20170112: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode() OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz # 20161229: Three files from gnop tests consolidated into one diff --git a/usr.sbin/bsnmpd/tools/Makefile b/usr.sbin/bsnmpd/tools/Makefile index 3ffc01e..cba5cee 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 f63975b..09280a4 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 3551464..970a2e8 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> |
