svn commit: r250503 - in head: sbin/hastctl sbin/hastd usr.sbin/bsnmpd/modules/snmp_hast

[Mikolaj Golub]

Author: trociny
Date: Sat May 11 09:51:44 2013
New Revision: 250503
URL: http://svnweb.freebsd.org/changeset/base/250503

Log:
  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

Modified:
  head/sbin/hastctl/Makefile
  head/sbin/hastd/Makefile
  head/sbin/hastd/token.l
  head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile

Modified: head/sbin/hastctl/Makefile
==============================================================================
--- head/sbin/hastctl/Makefile	Sat May 11 08:15:56 2013	(r250502)
+++ head/sbin/hastctl/Makefile	Sat May 11 09:51:44 2013	(r250503)
@@ -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

Modified: head/sbin/hastd/Makefile
==============================================================================
--- head/sbin/hastd/Makefile	Sat May 11 08:15:56 2013	(r250502)
+++ head/sbin/hastd/Makefile	Sat May 11 09:51:44 2013	(r250503)
@@ -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

Modified: head/sbin/hastd/token.l
==============================================================================
--- head/sbin/hastd/token.l	Sat May 11 08:15:56 2013	(r250502)
+++ head/sbin/hastd/token.l	Sat May 11 09:51:44 2013	(r250503)
@@ -46,6 +46,7 @@ int lineno;
 
 %option noinput
 %option nounput
+%option noyywrap
 
 %%
 control			{ DP; return CONTROL; }

Modified: head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile	Sat May 11 08:15:56 2013	(r250502)
+++ head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile	Sat May 11 09:51:44 2013	(r250503)
@@ -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