From dbf10047555503ae2331d979738eda01fbfdd0a9 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sat, 17 Oct 1998 13:48:37 +0000 Subject: [PATCH] Honour the default CFLAGS. This fixes a spew of warnings for compiling unused static inlines in headers without -O. Fixed missing libraries in DPADD. Use .PATH instead of a symlink farm. Removed bogus dependency of util.c on statetext.h (only util.o depends on it). Removed rule for building statetext.h. The dependency was used to get statetext.h built, but statetext.h is a non-generated source file so it doesn't need building. This fixes an annoying message for the null build and use of `make' instead of ${MAKE} to do the null build. Fixed some style bugs. --- sbin/vinum/Makefile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile index 7d0a0c285c9..961c10519e0 100644 --- a/sbin/vinum/Makefile +++ b/sbin/vinum/Makefile @@ -1,23 +1,15 @@ +# $Id$ + PROG= vinum SRCS= v.c list.c parser.c util.c vext.h commands.c MAN8= vinum.8 -CFLAGS= -I${.CURDIR}/../../lkm/vinum -g -Wall -DDEBUG -DRAID5 - -LDADD+= -lutil -lreadline -ltermcap -# DPADD+= ${LIBKVM} +CFLAGS+= -I${.CURDIR}/../../lkm/vinum -g -Wall -DDEBUG -DRAID5 +DPADD= ${LIBUTIL} ${LIBREADLINE} ${LIBTERMCAP} +LDADD= -lutil -lreadline -ltermcap BINGRP= kmem BINMODE= 2555 -parser.c: - rm -f $@ - ln -s ${.CURDIR}/../../lkm/vinum/$@ . - -util.c: statetexts.h - rm -f $@ - ln -s ${.CURDIR}/../../lkm/vinum/$@ . - -statetexts.h: - (cd ${.CURDIR}/../../lkm/vinum; make $@) +.PATH: ${.CURDIR}/../../lkm/vinum .include