diff options
| author | harti <harti@FreeBSD.org> | 2003-11-12 17:09:13 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2003-11-12 17:09:13 +0000 |
| commit | 336e573a138e608bb085d36551cc8bcd54a6dd5f (patch) | |
| tree | 9f3892734e37d5ea72144f5b674aaa3b958d35d7 | |
| parent | e97c7f33cb50b8b2ac842ec44c0d821c33fb19d1 (diff) | |
| download | FreeBSD-src-336e573a138e608bb085d36551cc8bcd54a6dd5f.zip FreeBSD-src-336e573a138e608bb085d36551cc8bcd54a6dd5f.tar.gz | |
The snmp_netgraph module depends on libnetgraph. So add a dependency and
add libnetgraph to the list of prebuilt libraries in the main Makefile.
Reviewed by: ru
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | lib/Makefile | 7 | ||||
| -rw-r--r-- | lib/libbsnmp/modules/snmp_netgraph/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f37d469..c51fa40 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -818,8 +818,8 @@ _generic_libs+= kerberos5/lib _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libpam lib/libradius \ - lib/librpcsvc \ + lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ + lib/libradius lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun diff --git a/lib/Makefile b/lib/Makefile index e57132c..7dbe28d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,6 +11,7 @@ # msun must be built before libg++ and libstdc++. # libmd must be built before libatm, libopie, libradius, and libtacplus. # libncurses must be built before libdialog, libedit and libreadline. +# libnetgraph must be built before libbsnmp/modules/snmp_netgraph. # libopie must be built before libpam. # libradius must be built before libpam. # librpcsvc must be built before libpam. @@ -21,14 +22,14 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd \ - libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \ +SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ + libnetgraph libradius librpcsvc libsbuf libtacplus libutil libypclnt \ ${_compat} libalias ${_libatm} ${_libbind} \ ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \ - libnetgraph ${_libngatm} libopie libpam libpanel libpcap \ + ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libufs libugidfw \ ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz diff --git a/lib/libbsnmp/modules/snmp_netgraph/Makefile b/lib/libbsnmp/modules/snmp_netgraph/Makefile index b101b38..95b401a3 100644 --- a/lib/libbsnmp/modules/snmp_netgraph/Makefile +++ b/lib/libbsnmp/modules/snmp_netgraph/Makefile @@ -12,6 +12,9 @@ MIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def 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/snmp_netgraph/Makefile b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile index b101b38..95b401a3 100644 --- a/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile @@ -12,6 +12,9 @@ MIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h +DPADD= ${LIBNETGRAPH} +LDADD= -lnetgraph + CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR} .include <bsd.lib.mk> |
