From 201995b29816db4b82fd08d0e5aa7ef90591ee95 Mon Sep 17 00:00:00 2001 From: zrj Date: Wed, 25 Apr 2018 19:20:06 +0300 Subject: [PATCH] awk(1): Separate hostprog. --- usr.bin/awk/Makefile | 31 +++---------------------------- usr.bin/awk/Makefile.inc | 1 + usr.bin/awk/{ => awk}/Makefile | 13 ++++--------- usr.bin/awk/maketab/Makefile | 21 +++++++++++++++++++++ 4 files changed, 29 insertions(+), 37 deletions(-) create mode 100644 usr.bin/awk/Makefile.inc copy usr.bin/awk/{ => awk}/Makefile (55%) create mode 100644 usr.bin/awk/maketab/Makefile diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index 1dae848103..fb014188fd 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -1,28 +1,3 @@ -# $FreeBSD: src/usr.bin/awk/Makefile,v 1.9.2.1 2002/06/21 20:12:08 obrien Exp $ -# $DragonFly: src/usr.bin/awk/Makefile,v 1.12 2007/08/27 16:50:51 pavalos Exp $ - -AWKSRC= ${.CURDIR}/../../contrib/awk -.PATH: ${AWKSRC} - -PROG= awk -SRCS= awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c ytab.h -WARNS?= 2 - -CFLAGS+= -I. -I${AWKSRC} -DHAS_ISBLANK - -DPADD= ${LIBM} -LDADD= -lm - -CLEANFILES= maketab proctab.c ytab.h maketab.nx - -ytab.h: awkgram.h - ${LN} -sf ${.ALLSRC} ${.TARGET} - -proctab.c: maketab.nx - ./maketab.nx > proctab.c - -build-tools: maketab.nx - -maketab.nx: ytab.h ${AWKSRC}/maketab.c - -.include +SUBDIR= maketab +SUBDIR+= awk +.include diff --git a/usr.bin/awk/Makefile.inc b/usr.bin/awk/Makefile.inc new file mode 100644 index 0000000000..01b5f23410 --- /dev/null +++ b/usr.bin/awk/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/awk/Makefile similarity index 55% copy from usr.bin/awk/Makefile copy to usr.bin/awk/awk/Makefile index 1dae848103..ae1300868d 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/awk/Makefile @@ -1,7 +1,6 @@ # $FreeBSD: src/usr.bin/awk/Makefile,v 1.9.2.1 2002/06/21 20:12:08 obrien Exp $ -# $DragonFly: src/usr.bin/awk/Makefile,v 1.12 2007/08/27 16:50:51 pavalos Exp $ -AWKSRC= ${.CURDIR}/../../contrib/awk +AWKSRC= ${.CURDIR}/../../../contrib/awk .PATH: ${AWKSRC} PROG= awk @@ -13,16 +12,12 @@ CFLAGS+= -I. -I${AWKSRC} -DHAS_ISBLANK DPADD= ${LIBM} LDADD= -lm -CLEANFILES= maketab proctab.c ytab.h maketab.nx +CLEANFILES= proctab.c ytab.h ytab.h: awkgram.h ${LN} -sf ${.ALLSRC} ${.TARGET} -proctab.c: maketab.nx - ./maketab.nx > proctab.c - -build-tools: maketab.nx - -maketab.nx: ytab.h ${AWKSRC}/maketab.c +proctab.c: ytab.h ${AWKSRC}/maketab.c + ${.OBJDIR}/../maketab/maketab.nx > ${.OBJDIR}/proctab.c .include diff --git a/usr.bin/awk/maketab/Makefile b/usr.bin/awk/maketab/Makefile new file mode 100644 index 0000000000..112eafbe00 --- /dev/null +++ b/usr.bin/awk/maketab/Makefile @@ -0,0 +1,21 @@ +AWKSRC= ${.CURDIR}/../../../contrib/awk +.PATH: ${AWKSRC} + +PROG= maketab +SRCS= maketab.c ytab.h + +CFLAGS+= -I. -I${AWKSRC} -DHAS_ISBLANK + +y.tab.h: awkgram.c awkgram.y + +ytab.h: y.tab.h + ${LN} -sf ${.ALLSRC} ${.TARGET} + +WARNS= 2 + +CLEANFILES+= ytab.h y.tab.h awkgram.c + +# this setup is used in place, it is not installed anywhere +install: + +.include -- 2.41.0