diff options
| author | Brian Callahan <bcallah@cvs.openbsd.org> | 2017-06-17 01:55:17 +0000 |
|---|---|---|
| committer | Brian Callahan <bcallah@cvs.openbsd.org> | 2017-06-17 01:55:17 +0000 |
| commit | fc06f54bb9526669a474fba5bfd580db6a0decc3 (patch) | |
| tree | 40740e57aa8edf70a1d95163481e849eeb18aa1c /usr.bin/m4 | |
| parent | 585d860c9085e3b884f7b27d364914b45762ae88 (diff) | |
Don't need to link with -ll or -ly.
ok millert@ (who spotted and provided the -ll removal bits)
Diffstat (limited to 'usr.bin/m4')
| -rw-r--r-- | usr.bin/m4/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/m4/tokenizer.l | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile index ecb89c8ede3..a6ee09cc17e 100644 --- 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 3ffadd4fa29..94f02fb6085 100644 --- 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); } |