diff options
| author | trociny <trociny@FreeBSD.org> | 2013-05-11 09:51:44 +0000 |
|---|---|---|
| committer | trociny <trociny@FreeBSD.org> | 2013-05-11 09:51:44 +0000 |
| commit | f39c963dc20905c14324b9992ee87c4ad66a15e6 (patch) | |
| tree | 5b90a0b77c2e5ac18a978ceaffef6e73bf5dda2d | |
| parent | 73e04ffd11d4627fcc8c178deebf231091991350 (diff) | |
| download | FreeBSD-src-f39c963dc20905c14324b9992ee87c4ad66a15e6.zip FreeBSD-src-f39c963dc20905c14324b9992ee87c4ad66a15e6.tar.gz | |
Get rid of libl dependency. We needed it only to provide yywrap. But
yywrap is not necessary when parsing a single hast.conf file.
Suggested by: kib
Reviewed by: pjd
| -rw-r--r-- | sbin/hastctl/Makefile | 4 | ||||
| -rw-r--r-- | sbin/hastd/Makefile | 2 | ||||
| -rw-r--r-- | sbin/hastd/token.l | 1 | ||||
| -rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_hast/Makefile | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile index 2be817e..02531e6 100644 --- a/sbin/hastctl/Makefile +++ b/sbin/hastctl/Makefile @@ -32,8 +32,8 @@ CFLAGS+=-DINET6 CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT -DPADD= ${LIBL} ${LIBUTIL} -LDADD= -ll -lutil +DPADD= ${LIBUTIL} +LDADD= -lutil .if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile index 43c7a52..7ff6ee8 100644 --- a/sbin/hastd/Makefile +++ b/sbin/hastd/Makefile @@ -31,7 +31,7 @@ CFLAGS+=-DINET6 .endif DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} ${LIBPTHREAD} ${LIBUTIL} -LDADD= -lgeom -lbsdxml -lsbuf -ll -lpthread -lutil +LDADD= -lgeom -lbsdxml -lsbuf -lpthread -lutil .if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto diff --git a/sbin/hastd/token.l b/sbin/hastd/token.l index 38bf8d6..a20efd7 100644 --- a/sbin/hastd/token.l +++ b/sbin/hastd/token.l @@ -46,6 +46,7 @@ int lineno; %option noinput %option nounput +%option noyywrap %% control { DP; return CONTROL; } diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile index 625bc21..6369918 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile @@ -29,8 +29,8 @@ CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT CFLAGS+= -DSNMPTREE_TYPES -DPADD= ${LIBL} ${LIBUTIL} -LDADD= -ll -lutil +DPADD= ${LIBUTIL} +LDADD= -lutil XSYM= begemotHast DEFS= ${MOD}_tree.def |
