Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin makefile delint. use NETBSDSRCDIR as appropriate



details:   https://anonhg.NetBSD.org/src/rev/60726f659084
branches:  trunk
changeset: 536552:60726f659084
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Sep 18 14:00:33 2002 +0000

description:
makefile delint. use NETBSDSRCDIR as appropriate

diffstat:

 usr.bin/audio/common/Makefile     |   8 ++++----
 usr.bin/awk/Makefile              |   6 ++++--
 usr.bin/bzip2/Makefile            |   6 +++---
 usr.bin/bzip2recover/Makefile     |   4 ++--
 usr.bin/chflags/Makefile          |   8 +++++---
 usr.bin/chpass/Makefile           |   6 +++---
 usr.bin/compile_et/Makefile       |   8 ++++----
 usr.bin/crontab/Makefile          |   8 +++++---
 usr.bin/dirname/Makefile          |   5 +++--
 usr.bin/find/Makefile             |   8 +++++---
 usr.bin/finger/Makefile           |   8 +++++---
 usr.bin/kdestroy/Makefile         |   8 ++++----
 usr.bin/kdump/Makefile            |   6 +++---
 usr.bin/kinit/Makefile            |   8 ++++----
 usr.bin/klist/Makefile            |   8 ++++----
 usr.bin/kpasswd/Makefile          |   8 ++++----
 usr.bin/ktruss/Makefile           |   4 ++--
 usr.bin/ldd/ldd_elf/Makefile      |   4 ++--
 usr.bin/less/lessecho/Makefile    |   6 +++---
 usr.bin/locate/bigram/Makefile    |   5 +++--
 usr.bin/locate/code/Makefile      |   5 +++--
 usr.bin/mk_cmds/Makefile          |   8 ++++----
 usr.bin/mklocale/Makefile         |   6 ++++--
 usr.bin/netstat/Makefile          |   6 ++++--
 usr.bin/openssl/Makefile          |   8 ++++----
 usr.bin/rpcinfo/Makefile          |   6 ++++--
 usr.bin/skeyinit/Makefile         |   6 ++++--
 usr.bin/ssh/Makefile              |   4 ++--
 usr.bin/ssh/Makefile.inc          |   6 ++++--
 usr.bin/string2key/Makefile       |   8 ++++----
 usr.bin/systat/Makefile           |  10 ++++++----
 usr.bin/telnet/Makefile           |   4 ++--
 usr.bin/tn3270/tn3270/Makefile    |   6 +++---
 usr.bin/tn3270/tools/Makefile.inc |   5 +++--
 usr.bin/unexpand/Makefile         |   5 +++--
 usr.bin/users/Makefile            |   8 +++++---
 usr.bin/uudecode/Makefile         |   5 +++--
 usr.bin/vgrind/RETEST/Makefile    |   5 +++--
 usr.bin/vi/catalog/Makefile       |   5 +++--
 usr.bin/w/Makefile                |   6 ++++--
 usr.bin/wall/Makefile             |   8 +++++---
 usr.bin/write/Makefile            |   8 +++++---
 usr.bin/xinstall/Makefile         |   8 +++++---
 usr.bin/xlint/lint2/Makefile      |   5 +++--
 44 files changed, 162 insertions(+), 121 deletions(-)

diffs (truncated from 903 to 300 lines):

diff -r 19e73414e346 -r 60726f659084 usr.bin/audio/common/Makefile
--- a/usr.bin/audio/common/Makefile     Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/audio/common/Makefile     Wed Sep 18 14:00:33 2002 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.4 2002/01/15 17:02:51 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2002/09/18 14:00:33 lukem Exp $
+
+NOPROFILE=      # defined
+NOPIC=          # defined
 
 LIB=   audio
 SRCS=  audio.c wav.c sun.c auconv.c
 
-NOPROFILE=      # defined
-NOPIC=          # defined
-
 # only needed during build
 libinstall::
 
diff -r 19e73414e346 -r 60726f659084 usr.bin/awk/Makefile
--- a/usr.bin/awk/Makefile      Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/awk/Makefile      Wed Sep 18 14:00:33 2002 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.4 2002/03/28 09:58:10 jmc Exp $
+#      $NetBSD: Makefile,v 1.5 2002/09/18 14:00:34 lukem Exp $
 
-DIST=  ${.CURDIR}/../../dist
+.include <bsd.own.mk>
+
+DIST=  ${NETBSDSRCDIR}/dist
 .PATH: ${DIST}/nawk
 
 PROG=  awk
diff -r 19e73414e346 -r 60726f659084 usr.bin/bzip2/Makefile
--- a/usr.bin/bzip2/Makefile    Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/bzip2/Makefile    Wed Sep 18 14:00:33 2002 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.7 2002/08/27 14:46:16 lukem Exp $
+#      $NetBSD: Makefile,v 1.8 2002/09/18 14:00:34 lukem Exp $
 
 .include <bsd.own.mk>          # for MKDYNAMICROOT definition
 
 PROG=     bzip2
-LDDIR!=           cd ${.CURDIR}/../../lib/libbz2 && ${PRINTOBJDIR}
+LDDIR!=           cd ${NETBSDSRCDIR}/lib/libbz2 && ${PRINTOBJDIR}
 LDADD+=           -L${LDDIR} -lbz2
 DPADD+=           ${LIBBZ2}
 
@@ -11,7 +11,7 @@
 LDSTATIC?= -static
 .endif
 
-DIST=     ${.CURDIR}/../../dist/bzip2
+DIST=     ${NETBSDSRCDIR}/dist/bzip2
 .PATH:    ${DIST}
 
 MLINKS+=   bzip2.1 bunzip2.1\
diff -r 19e73414e346 -r 60726f659084 usr.bin/bzip2recover/Makefile
--- a/usr.bin/bzip2recover/Makefile     Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/bzip2recover/Makefile     Wed Sep 18 14:00:33 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2002/08/27 14:46:16 lukem Exp $
+#      $NetBSD: Makefile,v 1.7 2002/09/18 14:00:35 lukem Exp $
 
 NOMAN=    # defined
 
@@ -10,7 +10,7 @@
 LDSTATIC?= -static
 .endif
 
-DIST=     ${.CURDIR}/../../dist/bzip2
+DIST=     ${NETBSDSRCDIR}/dist/bzip2
 .PATH:    ${DIST}
 
 .include <bsd.prog.mk>
diff -r 19e73414e346 -r 60726f659084 usr.bin/chflags/Makefile
--- a/usr.bin/chflags/Makefile  Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/chflags/Makefile  Wed Sep 18 14:00:33 2002 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile,v 1.5 1998/10/10 07:38:23 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2002/09/18 14:00:35 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=  chflags
 SRCS=  chflags.c stat_flags.c
-.PATH: ${.CURDIR}/../../bin/ls
-CPPFLAGS+=     -I${.CURDIR}/../../bin/ls
+.PATH: ${NETBSDSRCDIR}/bin/ls
+CPPFLAGS+=     -I${NETBSDSRCDIR}/bin/ls
 
 .include <bsd.prog.mk>
diff -r 19e73414e346 -r 60726f659084 usr.bin/chpass/Makefile
--- a/usr.bin/chpass/Makefile   Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/chpass/Makefile   Wed Sep 18 14:00:33 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2002/03/22 18:10:22 thorpej Exp $
+#      $NetBSD: Makefile,v 1.12 2002/09/18 14:00:35 lukem Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/2/94
 
 .include <bsd.own.mk>
@@ -7,11 +7,11 @@
 SRCS=  chpass.c edit.c field.c table.c util.c getpwent.c
 BINOWN=        root
 BINMODE=4555
-.PATH: ${.CURDIR}/../../lib/libc/gen
+.PATH: ${NETBSDSRCDIR}/lib/libc/gen
 LINKS= ${BINDIR}/chpass ${BINDIR}/chfn ${BINDIR}/chpass ${BINDIR}/chsh
 MLINKS=        chpass.1 chfn.1 chpass.1 chsh.1
 
-CPPFLAGS+=-I${.CURDIR}/../../lib/libc/include
+CPPFLAGS+=-I${NETBSDSRCDIR}/lib/libc/include
 
 .if (${USE_YP} != "no")
 SRCS+= pw_yp.c
diff -r 19e73414e346 -r 60726f659084 usr.bin/compile_et/Makefile
--- a/usr.bin/compile_et/Makefile       Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/compile_et/Makefile       Wed Sep 18 14:00:33 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/12/12 12:24:27 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/18 14:00:35 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../crypto/dist
+DIST=          ${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/lib/com_err
 
 WARNS?=  1
@@ -17,12 +17,12 @@
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/heimdal/lib/com_err           \
-       -I${.CURDIR}/../../include/heimdal      \
+       -I${NETBSDSRCDIR}/include/heimdal       \
        -I${DESTDIR}/usr/include/krb5           \
        -DHAVE_CONFIG_H
 
 .ifndef HOSTPROG
-VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD= -L${VERS} -lvers \
        -lroken \
diff -r 19e73414e346 -r 60726f659084 usr.bin/crontab/Makefile
--- a/usr.bin/crontab/Makefile  Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/crontab/Makefile  Wed Sep 18 14:00:33 2002 +0000
@@ -1,13 +1,15 @@
-#      $NetBSD: Makefile,v 1.22 1998/02/22 12:16:03 christos Exp $
+#      $NetBSD: Makefile,v 1.23 2002/09/18 14:00:36 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=  crontab
 SRCS=  crontab.c misc.c entry.c env.c
-CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../usr.sbin/cron -DDEBUGGING=1
+CPPFLAGS+=-I${.CURDIR} -I${NETBSDSRCDIR}/usr.sbin/cron -DDEBUGGING=1
 CPPFLAGS+=-DUSE_UTIMES
 BINOWN =root
 BINMODE=4555
 MAN=   crontab.1 crontab.5
 
-.PATH: ${.CURDIR}/../../usr.sbin/cron
+.PATH: ${NETBSDSRCDIR}/usr.sbin/cron
 
 .include <bsd.prog.mk>
diff -r 19e73414e346 -r 60726f659084 usr.bin/dirname/Makefile
--- a/usr.bin/dirname/Makefile  Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/dirname/Makefile  Wed Sep 18 14:00:33 2002 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile,v 1.5 2001/12/12 01:48:44 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2002/09/18 14:00:36 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
+NOMAN= # defined
+
 PROG=  dirname
-NOMAN= # defined
 
 .include <bsd.prog.mk>
diff -r 19e73414e346 -r 60726f659084 usr.bin/find/Makefile
--- a/usr.bin/find/Makefile     Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/find/Makefile     Wed Sep 18 14:00:33 2002 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.8 1999/01/03 14:54:27 lukem Exp $
+#      $NetBSD: Makefile,v 1.9 2002/09/18 14:00:36 lukem Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=  find
 SRCS=  find.c function.c ls.c main.c misc.c operator.c option.c stat_flags.c
 
-CPPFLAGS+=     -I${.CURDIR}/../../bin/ls
-.PATH: ${.CURDIR}/../../bin/ls
+CPPFLAGS+=     -I${NETBSDSRCDIR}/bin/ls
+.PATH: ${NETBSDSRCDIR}/bin/ls
 
 .include <bsd.prog.mk>
diff -r 19e73414e346 -r 60726f659084 usr.bin/finger/Makefile
--- a/usr.bin/finger/Makefile   Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/finger/Makefile   Wed Sep 18 14:00:33 2002 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.8 2002/08/05 08:05:03 tron Exp $
+#      $NetBSD: Makefile,v 1.9 2002/09/18 14:00:37 lukem Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=  finger
 SRCS=  finger.c lprint.c net.c sprint.c util.c utmpentry.c
 
-.PATH.c: ${.CURDIR}/../../usr.bin/who
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP -DINET6
+.PATH.c: ${NETBSDSRCDIR}/usr.bin/who
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP -DINET6
 
 .include <bsd.prog.mk>
diff -r 19e73414e346 -r 60726f659084 usr.bin/kdestroy/Makefile
--- a/usr.bin/kdestroy/Makefile Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/kdestroy/Makefile Wed Sep 18 14:00:33 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/12/31 19:24:12 thorpej Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/18 14:00:37 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../crypto/dist
+DIST=          ${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/kuser
 
 WARNS?=  1
@@ -15,12 +15,12 @@
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/heimdal/kuser                 \
-       -I${.CURDIR}/../../include/heimdal      \
+       -I${NETBSDSRCDIR}/include/heimdal       \
        -I${DESTDIR}/usr/include/kerberosIV     \
        -I${DESTDIR}/usr/include/krb5           \
        -DHAVE_CONFIG_H
 
-VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=                                         \
        -lkafs                                  \
diff -r 19e73414e346 -r 60726f659084 usr.bin/kdump/Makefile
--- a/usr.bin/kdump/Makefile    Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/kdump/Makefile    Wed Sep 18 14:00:33 2002 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.18 2002/08/27 14:46:16 lukem Exp $
+#      $NetBSD: Makefile,v 1.19 2002/09/18 14:00:37 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
 .include <bsd.own.mk>          # for MKDYNAMICROOT definition
 
 PROG=  kdump
-CPPFLAGS+=-I${.CURDIR}/../ktrace -I${.CURDIR}/../../sys
+CPPFLAGS+=-I$${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys
 SRCS=  kdump.c ioctl.c subr.c setemul.c
-.PATH: ${.CURDIR}/../ktrace
+.PATH: $${NETBSDSRCDIR}/usr.bin/ktrace
 CLEANFILES+=ioctl.c
 WFORMAT=1
 
diff -r 19e73414e346 -r 60726f659084 usr.bin/kinit/Makefile
--- a/usr.bin/kinit/Makefile    Wed Sep 18 13:50:52 2002 +0000
+++ b/usr.bin/kinit/Makefile    Wed Sep 18 14:00:33 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/12/31 19:25:36 thorpej Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/18 14:00:37 lukem Exp $
 
 NOLINT= # defined
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../crypto/dist
+DIST=          ${NETBSDSRCDIR}/crypto/dist
 .PATH: ${DIST}/heimdal/kuser
 
 WARNS?=  1
@@ -15,12 +15,12 @@
 
 CPPFLAGS+= -I.                                 \
         -I${DIST}/heimdal/kuser                \
-        -I${.CURDIR}/../../include/heimdal     \
+        -I${NETBSDSRCDIR}/include/heimdal      \
         -I${DESTDIR}/usr/include/kerberosIV    \
         -I${DESTDIR}/usr/include/krb5          \
         -DHAVE_CONFIG_H
 
-VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 



Home | Main Index | Thread Index | Old Index