diff options
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/libbegemot/Makefile | 27 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 1 | ||||
| -rw-r--r-- | usr.bin/atm/sscop/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/bsnmpd/Makefile | 6 |
5 files changed, 35 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile index 77abd9f..2f77aa5 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,7 +25,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ - ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ + libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile new file mode 100644 index 0000000..d3994ee --- /dev/null +++ b/lib/libbegemot/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot + +.PATH: ${LIBBEGEMOT_DIR} + +LIB= begemot +SHLIB_MAJOR= 1 +SHLIBDIR?= /lib + +# WARNS?= 6 + +CFLAGS+= -DUSE_SELECT -DQUADFMT='"ll"' +SRCS= rpoll.c +INCS= rpoll.h +MAN= rpoll.3 + +rpoll.3: rpoll.man + cat ${.ALLSRC} > ${.TARGET} + +MLINKS= rpoll.3 poll_register.3 \ + rpoll.3 poll_unregister.3 \ + rpoll.3 poll_start_timer.3 \ + rpoll.3 poll_stop_timer.3 \ + rpoll.3 poll_dispatch.3 + +.include <bsd.lib.mk> diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index b325960..19e5f81 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -14,6 +14,7 @@ LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a +LIBBEGEMOT?= ${DESTDIR}${LIBDIR}/libbegemot.a .if !defined(NO_BIND) && defined(WITH_BIND_LIBS) LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile index 25d1b77..16703bb 100644 --- a/usr.bin/atm/sscop/Makefile +++ b/usr.bin/atm/sscop/Makefile @@ -7,9 +7,9 @@ CONTRIB= ${.CURDIR}/../../../contrib/ngatm/sscop PROG= sscop SRCS= common.c sscop_main.c WARNS?= 6 -CFLAGS+= -I${CONTRIB} +CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT -DPADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM} -LDADD= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM} +DPADD= ${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM} +LDADD= -lbegemot -lnetgraph -lngatm .include <bsd.prog.mk> diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile index f172c66..49faf87 100644 --- a/usr.sbin/bsnmpd/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/bsnmpd/Makefile @@ -23,9 +23,9 @@ BMIBSDIR= ${SHAREDIR}/snmp/mibs DEFS= tree.def DEFSDIR= ${SHAREDIR}/snmp/defs -CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DPADD= ${LIBISC} ${LIBBSNMP} -LDADD= -lisc -lbsnmp +CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT +DPADD= ${LIBBEGEMOT} ${LIBBSNMP} +LDADD= -lbegemot -lbsnmp LDFLAGS= -export-dynamic |
