summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authortrociny <trociny@FreeBSD.org>2013-05-11 09:51:44 +0000
committertrociny <trociny@FreeBSD.org>2013-05-11 09:51:44 +0000
commitf39c963dc20905c14324b9992ee87c4ad66a15e6 (patch)
tree5b90a0b77c2e5ac18a978ceaffef6e73bf5dda2d /sbin
parent73e04ffd11d4627fcc8c178deebf231091991350 (diff)
downloadFreeBSD-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
Diffstat (limited to 'sbin')
-rw-r--r--sbin/hastctl/Makefile4
-rw-r--r--sbin/hastd/Makefile2
-rw-r--r--sbin/hastd/token.l1
3 files changed, 4 insertions, 3 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; }
OpenPOWER on IntegriCloud