9 files changed, 26 insertions, 38 deletions
diff --git a/lib/libbsnmp/Makefile b/lib/libbsnmp/Makefile
index c639fa8f2fd1..fc430f87c164 100644
--- a/lib/libbsnmp/Makefile
+++ b/lib/libbsnmp/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR+=	libbsnmp modules
+SUBDIR=	libbsnmp modules
 
 .include <bsd.subdir.mk>
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index 5304ebdf2f1a..130988db9921 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-SHLIB_MAJOR= 1
-SHLIB_MINOR= 4
-
-WARNS?=	6
-
-INCSDIR= ${INCLUDEDIR}/bsnmp
+SHLIB_MAJOR=	1
+WARNS?=		6
+INCSDIR=	${INCLUDEDIR}/bsnmp
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index 39625a6ddac2..c82ebe652768 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -7,7 +7,6 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
 
 LIB	= bsnmp
 
-WARNS=	6
 CFLAGS+= -I${CONTRIB}
 
 SRCS=	asn1.c snmp.c snmpagent.c snmpclient.c
diff --git a/lib/libbsnmp/modules/Makefile.inc b/lib/libbsnmp/modules/Makefile.inc
index c9d6718cfa21..aa49857c65e1 100644
--- a/lib/libbsnmp/modules/Makefile.inc
+++ b/lib/libbsnmp/modules/Makefile.inc
@@ -1,16 +1,17 @@
 # $FreeBSD$
 
-NOINSTALLLIB=	yes
-NOPROFILE=	yes
+SHLIB_NAME=	snmp_${MOD}.so.${SHLIB_MAJOR}
+SRCS+=		${MOD}_tree.c
+CFLAGS+=	-I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR}
 
-LIB=	snmp_${MOD}
-SHLIB_NAME= snmp_${MOD}.so.${SHLIB_MAJOR}
+.if defined(DEFS)
+FILESGROUPS+=	DEFS
+DEFSDIR=	${SHAREDIR}/bsnmp/defs
+.endif
 
-SRCS:=	${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h ${SRCS}
-
-MIBSDIR= ${SHAREDIR}/bsnmp/mibs
-DEFSDIR= ${SHAREDIR}/bsnmp/defs
-
-FILESGROUPS += DEFS MIBS
+.if defined(MIBS)
+FILESGROUPS+=	MIBS
+MIBSDIR=	${SHAREDIR}/bsnmp/mibs
+.endif
 
 .include "../Makefile.inc"
diff --git a/lib/libbsnmp/modules/snmp_mibII/Makefile b/lib/libbsnmp/modules/snmp_mibII/Makefile
index 2ea4a87f6adf..7215880d1ab1 100644
--- a/lib/libbsnmp/modules/snmp_mibII/Makefile
+++ b/lib/libbsnmp/modules/snmp_mibII/Makefile
@@ -13,8 +13,5 @@ MAN=	snmp_mibII.3
 
 DEFS=	${MOD}_tree.def
 INCS=	snmp_${MOD}.h
-MIBS=
-
-CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR}
 
 .include <bsd.lib.mk>
diff --git a/lib/libbsnmp/modules/snmp_netgraph/Makefile b/lib/libbsnmp/modules/snmp_netgraph/Makefile
index 95b401a3c161..3760c5df0c9c 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/Makefile
+++ b/lib/libbsnmp/modules/snmp_netgraph/Makefile
@@ -15,6 +15,4 @@ INCS=	snmp_${MOD}.h
 DPADD=	${LIBNETGRAPH}
 LDADD=	-lnetgraph
 
-CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR}
-
 .include <bsd.lib.mk>
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index c9d6718cfa21..aa49857c65e1 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -1,16 +1,17 @@
 # $FreeBSD$
 
-NOINSTALLLIB=	yes
-NOPROFILE=	yes
+SHLIB_NAME=	snmp_${MOD}.so.${SHLIB_MAJOR}
+SRCS+=		${MOD}_tree.c
+CFLAGS+=	-I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR}
 
-LIB=	snmp_${MOD}
-SHLIB_NAME= snmp_${MOD}.so.${SHLIB_MAJOR}
+.if defined(DEFS)
+FILESGROUPS+=	DEFS
+DEFSDIR=	${SHAREDIR}/bsnmp/defs
+.endif
 
-SRCS:=	${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h ${SRCS}
-
-MIBSDIR= ${SHAREDIR}/bsnmp/mibs
-DEFSDIR= ${SHAREDIR}/bsnmp/defs
-
-FILESGROUPS += DEFS MIBS
+.if defined(MIBS)
+FILESGROUPS+=	MIBS
+MIBSDIR=	${SHAREDIR}/bsnmp/mibs
+.endif
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
index 2ea4a87f6adf..7215880d1ab1 100644
--- a/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile
@@ -13,8 +13,5 @@ MAN=	snmp_mibII.3
 
 DEFS=	${MOD}_tree.def
 INCS=	snmp_${MOD}.h
-MIBS=
-
-CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR}
 
 .include <bsd.lib.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
index 95b401a3c161..3760c5df0c9c 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
@@ -15,6 +15,4 @@ INCS=	snmp_${MOD}.h
 DPADD=	${LIBNETGRAPH}
 LDADD=	-lnetgraph
 
-CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR}
-
 .include <bsd.lib.mk>