Don't need to link with -ll or -ly.

ok millert@ (who spotted and provided the -ll removal bits)

diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index ecb89c8..a6ee09c 100644 (file)
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.13 2014/05/12 19:11:19 espie Exp $
+#      $OpenBSD: Makefile,v 1.14 2017/06/17 01:55:16 bcallah Exp $
 
 # -DEXTENDED 
 #      if you want the paste & spaste macros.
@@ -8,8 +8,8 @@ CFLAGS+=-DEXTENDED -I.
 CDIAGFLAGS=-W -Wall -Wstrict-prototypes -pedantic \
        -Wno-unused -Wno-char-subscripts -Wno-sign-compare
 
-LDADD= -ly -ll -lm -lutil
-DPADD= ${LIBY} ${LIBL} ${LIBM} ${LIBUTIL}
+LDADD= -lm -lutil
+DPADD= ${LIBM} ${LIBUTIL}
 
 SRCS=  eval.c expr.c look.c main.c misc.c gnum4.c trace.c tokenizer.l parser.y
 MAN=   m4.1

diff --git a/usr.bin/m4/tokenizer.l b/usr.bin/m4/tokenizer.l
index 3ffadd4..94f02fb 100644 (file)
--- a/usr.bin/m4/tokenizer.l
+++ b/usr.bin/m4/tokenizer.l
@@ -1,5 +1,5 @@
 %{
-/* $OpenBSD: tokenizer.l,v 1.9 2017/06/15 13:48:42 bcallah Exp $ */
+/* $OpenBSD: tokenizer.l,v 1.10 2017/06/17 01:55:16 bcallah Exp $ */
 /*
  * Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
  *
@@ -37,6 +37,8 @@ oct   0[0-7]*
 dec    [1-9][0-9]*
 radix  0[rR][0-9]+:[0-9a-zA-Z]+
 
+%option noyywrap
+
 %%
 {ws}                   {/* just skip it */}
 {hex}|{oct}|{dec}      { yylval = number(); return(NUMBER); }