From f39c963dc20905c14324b9992ee87c4ad66a15e6 Mon Sep 17 00:00:00 2001 From: trociny Date: Sat, 11 May 2013 09:51:44 +0000 Subject: 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 --- sbin/hastctl/Makefile | 4 ++-- sbin/hastd/Makefile | 2 +- sbin/hastd/token.l | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'sbin') 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; } -- cgit v1.1