From 9c97c8f02d579c6988b1d150fd1c0fa8dacf2e87 Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 20 Jul 2001 06:20:32 +0000 Subject: Perform a major cleanup of the usr.sbin Makefiles. These are not perfectly in agreement with each other style-wise, but they are orders of orders of magnitude more consistent style-wise than before. --- usr.sbin/pcvt/Misc/Makefile | 2 ++ usr.sbin/pcvt/Misc/Makefile.inc | 2 ++ usr.sbin/pcvt/demo/Makefile | 8 +++++--- usr.sbin/pcvt/fed/Makefile | 8 +++++--- usr.sbin/pcvt/kbdio/Makefile | 8 +++----- usr.sbin/pcvt/kcon/Makefile | 14 ++++++++------ usr.sbin/pcvt/keycap/Makefile | 25 ++++++++++++++----------- usr.sbin/pcvt/vgaio/Makefile | 7 ++++--- usr.sbin/pcvt/vttest/Makefile | 7 ++++--- 9 files changed, 47 insertions(+), 34 deletions(-) (limited to 'usr.sbin/pcvt') diff --git a/usr.sbin/pcvt/Misc/Makefile b/usr.sbin/pcvt/Misc/Makefile index dcbc0b5..a512eaa 100644 --- a/usr.sbin/pcvt/Misc/Makefile +++ b/usr.sbin/pcvt/Misc/Makefile @@ -1,3 +1,5 @@ +# $FreeBSD$ + SUBDIR= Doc Etc FILES= README.FIRST diff --git a/usr.sbin/pcvt/Misc/Makefile.inc b/usr.sbin/pcvt/Misc/Makefile.inc index 6c5322a..c7ce5f2 100644 --- a/usr.sbin/pcvt/Misc/Makefile.inc +++ b/usr.sbin/pcvt/Misc/Makefile.inc @@ -1,3 +1,5 @@ +# $FreeBSD$ + DISTRIBUTION= doc BINDIR= /usr/share/pcvt BINMODE= 0444 diff --git a/usr.sbin/pcvt/demo/Makefile b/usr.sbin/pcvt/demo/Makefile index 59e8ad6..ee2d1ef 100644 --- a/usr.sbin/pcvt/demo/Makefile +++ b/usr.sbin/pcvt/demo/Makefile @@ -1,8 +1,12 @@ +# $FreeBSD$ + PROG= playvt +NOMAN= #true SRCS= playvt.c + DEMOS= chardemo.vt colors.vt sgr.vt DEMOS+= outerlimit.vt twzone.vt cowscene.vt xmas.vt -NOMAN= +CLEANFILES+= ${DEMOS} all: $(DEMOS) $(PROG) @@ -14,8 +18,6 @@ install: .include -CLEANFILES+= ${DEMOS} - # this seems to be the lowest common denominator chardemo.vt: ${.CURDIR}/${.TARGET}.gz.uu diff --git a/usr.sbin/pcvt/fed/Makefile b/usr.sbin/pcvt/fed/Makefile index 6147ef9..ac1baa4 100644 --- a/usr.sbin/pcvt/fed/Makefile +++ b/usr.sbin/pcvt/fed/Makefile @@ -1,7 +1,9 @@ # $FreeBSD$ -PROG = fed -SRCS = fed.c select.c edit.c misc.c -LDADD = -lncurses +PROG= fed +SRCS= fed.c select.c edit.c misc.c + +DPADD= ${LIBCURSES} +LDADD= -lncurses .include diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile index 7985af0..1bbbdda 100644 --- a/usr.sbin/pcvt/kbdio/Makefile +++ b/usr.sbin/pcvt/kbdio/Makefile @@ -1,22 +1,20 @@ # $FreeBSD$ PROG= kbdio +NOMAN= #true SRCS= kbdio.y lex.l y.tab.h +CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g + #YACC= bison #YFLAGS+= -yd # Bison only YFLAGS+= -v # verbose - LFLAGS+= -I DPADD= ${LIBM} ${LIBY} ${LIBL} LDADD= -lm -ly -ll -NOMAN= - -CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g - CLEANFILES+= y.output # comment file from bison install: diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile index dbc94f9..4e49af9 100644 --- a/usr.sbin/pcvt/kcon/Makefile +++ b/usr.sbin/pcvt/kcon/Makefile @@ -1,7 +1,12 @@ # $FreeBSD$ -PROG= kcon -DEVICE= /dev/ttyv0 -CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" + +PROG= kcon +DEVICE= /dev/ttyv0 + +CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" + +DPADD= ${LIBKEYCAP} +LDADD= -lkeycap .if exists(${.OBJDIR}/../keycap) LIBKEYCAP= ${.OBJDIR}/../keycap/libkeycap.a @@ -9,7 +14,4 @@ LIBKEYCAP= ${.OBJDIR}/../keycap/libkeycap.a LIBKEYCAP= ${.CURDIR}/../keycap/libkeycap.a .endif -DPADD= ${LIBKEYCAP} -LDADD= ${LIBKEYCAP} - .include diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile index 4b989e1..c85dba4 100644 --- a/usr.sbin/pcvt/keycap/Makefile +++ b/usr.sbin/pcvt/keycap/Makefile @@ -1,17 +1,20 @@ # $FreeBSD$ -LIB = keycap -CAPDIR = /usr/share/misc -CAPPATH = $(CAPDIR)/keycap.pcvt +LIB= keycap +MAN= keycap.3 +MLINKS+= keycap.3 kgetent.3 \ + keycap.3 kgetnum.3 \ + keycap.3 kgetflag.3 \ + keycap.3 kgetstr.3 +MAN+= man5/keycap.5 +SRCS= keycap.c + KEYCAPSRC= keycap.src -CFLAGS += -DKEYCAP_PATH=\"$(CAPPATH)\" -SRCS = keycap.c -MAN = keycap.3 -MLINKS+= keycap.3 kgetent.3 \ - keycap.3 kgetnum.3 \ - keycap.3 kgetflag.3 \ - keycap.3 kgetstr.3 -MAN += man5/keycap.5 +CAPDIR= /usr/share/misc +CAPPATH= $(CAPDIR)/keycap.pcvt + +CFLAGS+= -DKEYCAP_PATH=\"$(CAPPATH)\" + #CLEANFILES+= keycap.0 man5/keycap.0 beforeinstall: diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile index f57ef01..0ac0388 100644 --- a/usr.sbin/pcvt/vgaio/Makefile +++ b/usr.sbin/pcvt/vgaio/Makefile @@ -1,8 +1,11 @@ # $FreeBSD$ + PROG= vgaio MAN= vgaio.8 - SRCS= vgaio.y lex.l y.tab.h + +CFLAGS+= -I${.OBJDIR} -I${.CURDIR} + YACC= yacc #YFLAGS+= -yd # Bison @@ -13,8 +16,6 @@ LFLAGS+= -I DPADD= ${LIBM} ${LIBY} ${LIBL} LDADD= -lm -ly -ll -CFLAGS+= -I${.OBJDIR} -I${.CURDIR} - CLEANFILES+= y.output # comment file from bison install: diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile index 440962e..be344b2 100644 --- a/usr.sbin/pcvt/vttest/Makefile +++ b/usr.sbin/pcvt/vttest/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ -PROG= vttest -CFLAGS+= -traditional -DUSEMYSTTY -SRCS= main.c esc.c +PROG= vttest +SRCS= main.c esc.c + +CFLAGS+= -traditional -DUSEMYSTTY .include -- cgit v1.1