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
This commit is contained in:
Mikolaj Golub 2013-05-11 09:51:44 +00:00
parent 009b3a1c3f
commit 1df892f44c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=250503
4 changed files with 6 additions and 5 deletions

View File

@ -32,8 +32,8 @@ CFLAGS+=-DINET6
CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_UNPUT
CFLAGS+=-DYY_NO_INPUT CFLAGS+=-DYY_NO_INPUT
DPADD= ${LIBL} ${LIBUTIL} DPADD= ${LIBUTIL}
LDADD= -ll -lutil LDADD= -lutil
.if ${MK_OPENSSL} != "no" .if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO} DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto LDADD+= -lcrypto

View File

@ -31,7 +31,7 @@ CFLAGS+=-DINET6
.endif .endif
DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} ${LIBPTHREAD} ${LIBUTIL} DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} ${LIBPTHREAD} ${LIBUTIL}
LDADD= -lgeom -lbsdxml -lsbuf -ll -lpthread -lutil LDADD= -lgeom -lbsdxml -lsbuf -lpthread -lutil
.if ${MK_OPENSSL} != "no" .if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO} DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto LDADD+= -lcrypto

View File

@ -46,6 +46,7 @@ int lineno;
%option noinput %option noinput
%option nounput %option nounput
%option noyywrap
%% %%
control { DP; return CONTROL; } control { DP; return CONTROL; }

View File

@ -29,8 +29,8 @@ CFLAGS+=-DYY_NO_UNPUT
CFLAGS+=-DYY_NO_INPUT CFLAGS+=-DYY_NO_INPUT
CFLAGS+= -DSNMPTREE_TYPES CFLAGS+= -DSNMPTREE_TYPES
DPADD= ${LIBL} ${LIBUTIL} DPADD= ${LIBUTIL}
LDADD= -ll -lutil LDADD= -lutil
XSYM= begemotHast XSYM= begemotHast
DEFS= ${MOD}_tree.def DEFS= ${MOD}_tree.def