[Midnightbsd-cvs] src [9432] trunk/sbin: Get rid of libl dependency.

[laffer1 at midnightbsd.org]

Revision: 9432
          http://svnweb.midnightbsd.org/src/?rev=9432
Author:   laffer1
Date:     2017-03-05 09:25:04 -0500 (Sun, 05 Mar 2017)
Log Message:
-----------
Get rid of libl dependency.  We needed it only to provide yywrap.  But
yywrap is not necessary when parsing a single hast.conf file.

Modified Paths:
--------------
    trunk/sbin/hastctl/Makefile
    trunk/sbin/hastd/Makefile
    trunk/sbin/hastd/token.l

Modified: trunk/sbin/hastctl/Makefile
===================================================================
--- trunk/sbin/hastctl/Makefile	2017-03-05 14:24:37 UTC (rev 9431)
+++ trunk/sbin/hastctl/Makefile	2017-03-05 14:25:04 UTC (rev 9432)
@@ -33,8 +33,8 @@
 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

Modified: trunk/sbin/hastd/Makefile
===================================================================
--- trunk/sbin/hastd/Makefile	2017-03-05 14:24:37 UTC (rev 9431)
+++ trunk/sbin/hastd/Makefile	2017-03-05 14:25:04 UTC (rev 9432)
@@ -32,7 +32,7 @@
 .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

Modified: trunk/sbin/hastd/token.l
===================================================================
--- trunk/sbin/hastd/token.l	2017-03-05 14:24:37 UTC (rev 9431)
+++ trunk/sbin/hastd/token.l	2017-03-05 14:25:04 UTC (rev 9432)
@@ -46,6 +46,7 @@
 
 %option noinput
 %option nounput
+%option noyywrap
 
 %%
 control			{ DP; return CONTROL; }