diff options
| author | ru <ru@FreeBSD.org> | 2004-01-19 19:26:02 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-01-19 19:26:02 +0000 |
| commit | 420b17a9ff149ddcc7190c9060c5ba3c6d8e6a9d (patch) | |
| tree | f7b773882be993ce43f7c0c77c2643cfe9ce285d /lib | |
| parent | e3b2b97f35417363c9f559e8436a2d7986e91405 (diff) | |
| download | FreeBSD-src-420b17a9ff149ddcc7190c9060c5ba3c6d8e6a9d.zip FreeBSD-src-420b17a9ff149ddcc7190c9060c5ba3c6d8e6a9d.tar.gz | |
Clean up makefiles.
Reviewed by: harti
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libbsnmp/Makefile | 2 | ||||
| -rw-r--r-- | lib/libbsnmp/Makefile.inc | 9 | ||||
| -rw-r--r-- | lib/libbsnmp/libbsnmp/Makefile | 1 | ||||
| -rw-r--r-- | lib/libbsnmp/modules/Makefile.inc | 21 | ||||
| -rw-r--r-- | lib/libbsnmp/modules/snmp_mibII/Makefile | 3 | ||||
| -rw-r--r-- | lib/libbsnmp/modules/snmp_netgraph/Makefile | 2 |
6 files changed, 15 insertions, 23 deletions
diff --git a/lib/libbsnmp/Makefile b/lib/libbsnmp/Makefile index c639fa8..fc430f8 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 5304ebd..130988d 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 39625a6..c82ebe6 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 c9d6718..aa49857 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 2ea4a87..7215880 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 95b401a3..3760c5d 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> |
