From 0aad9d43785b79301bfeae771d4597e16be5b0d6 Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 24 Mar 1997 22:02:40 +0000 Subject: [PATCH] Makefile cleanups --- gnu/games/chess/Makefile | 10 ++++----- gnu/lib/libg++/libg++/genclass/Makefile | 7 ++---- gnu/libexec/uucp/uusched/Makefile | 7 +++--- gnu/libexec/uucp/uuto/Makefile | 7 +++--- gnu/usr.bin/cpio/Makefile | 4 ++-- gnu/usr.bin/diff/Makefile | 4 ++-- gnu/usr.bin/diff3/Makefile | 4 ++-- gnu/usr.bin/gas/Makefile | 4 ++-- gnu/usr.bin/gawk/Makefile | 4 ++-- gnu/usr.bin/gcc/cc/Makefile | 4 ++-- gnu/usr.bin/gcc/cpp/Makefile | 15 ++++++------- gnu/usr.bin/gcc/g++/Makefile | 4 ++-- gnu/usr.bin/gcc/gcc2netbsd | 13 +++++------ gnu/usr.bin/gdb/gdb/Makefile | 6 ++--- gnu/usr.bin/grep/Makefile | 4 ++-- gnu/usr.bin/groff/afmtodit/Makefile | 7 ++---- gnu/usr.bin/groff/devices/Makefile.dev | 16 +++++++++----- gnu/usr.bin/groff/eqn/Makefile | 16 ++++++++------ gnu/usr.bin/groff/grog/Makefile | 7 ++---- gnu/usr.bin/groff/indxbib/Makefile | 12 +++++----- gnu/usr.bin/groff/mm/Makefile | 29 +++++++------------------ gnu/usr.bin/groff/nroff/Makefile | 9 ++------ gnu/usr.bin/groff/tmac/Makefile | 20 ++++++++--------- gnu/usr.bin/groff/troff/Makefile | 7 +++--- gnu/usr.bin/gzip/Makefile | 11 ++++------ gnu/usr.bin/ld/rtld/Makefile | 14 ++++-------- gnu/usr.bin/rcs/ci/Makefile | 4 ++-- gnu/usr.bin/rcs/co/Makefile | 4 ++-- gnu/usr.bin/rcs/ident/Makefile | 4 ++-- gnu/usr.bin/rcs/merge/Makefile | 4 ++-- gnu/usr.bin/rcs/rcs/Makefile | 4 ++-- gnu/usr.bin/rcs/rcsclean/Makefile | 4 ++-- gnu/usr.bin/rcs/rcsdiff/Makefile | 4 ++-- gnu/usr.bin/rcs/rcsfreeze/Makefile | 7 ++---- gnu/usr.bin/rcs/rcsmerge/Makefile | 4 ++-- gnu/usr.bin/rcs/rlog/Makefile | 4 ++-- gnu/usr.bin/sdiff/Makefile | 4 ++-- gnu/usr.bin/send-pr/Makefile | 14 +++++------- gnu/usr.bin/sort/Makefile | 4 ++-- gnu/usr.bin/tar/Makefile | 4 ++-- libexec/ld.aout_so/Makefile | 14 ++++-------- usr.sbin/apm/Makefile | 3 ++- usr.sbin/apmd/Makefile | 3 ++- usr.sbin/mopd/mopchk/Makefile | 3 ++- usr.sbin/mopd/mopd/Makefile | 3 ++- usr.sbin/mopd/mopprobe/Makefile | 3 ++- usr.sbin/mopd/moptrace/Makefile | 3 ++- usr.sbin/named/dig/Makefile | 4 ++-- usr.sbin/named/dnsquery/Makefile | 4 ++-- usr.sbin/named/named/Makefile | 4 ++-- usr.sbin/named/ndc/Makefile | 11 +++++----- usr.sbin/named/nslookup/Makefile | 11 ++++------ usr.sbin/named/reload/Makefile | 8 +++---- usr.sbin/named/restart/Makefile | 8 +++---- usr.sbin/rpc.pcnfsd/Makefile | 4 ++-- usr.sbin/rpc.yppasswdd/Makefile | 4 ++-- usr.sbin/sendmail/src/Makefile | 11 +++++----- usr.sbin/tcpdchk/Makefile | 1 + usr.sbin/tcpdmatch/Makefile | 1 + usr.sbin/tcpdump/Makefile | 6 ++--- usr.sbin/ypserv/ypinit/Makefile | 14 +++++------- 61 files changed, 192 insertions(+), 245 deletions(-) diff --git a/gnu/games/chess/Makefile b/gnu/games/chess/Makefile index 8b250ccb11a4..f78587c7f45c 100644 --- a/gnu/games/chess/Makefile +++ b/gnu/games/chess/Makefile @@ -1,21 +1,19 @@ -# $NetBSD: Makefile,v 1.9 1996/10/18 02:52:59 thorpej Exp $ +# $NetBSD: Makefile,v 1.10 1997/03/24 22:06:04 christos Exp $ # from: @(#)Makefile 5.4 (Berkeley) 5/11/90 PROG= chess SRCS= gnuchess.c uxdsp.c move.c CFLAGS+=-DNEWMOVE=12 MAN= chess.6 -DPADD= ${LIBCURSES} ${LIBTERM} /usr/lib/libgnumalloc.a +DPADD= ${LIBCURSES} ${LIBTERM} ${LIBGNUMALLOC} LDADD= -lcurses -ltermlib -lgnumalloc HIDEGAME=hidegame CLEANFILES += chess.6 +FILES=gnuchess.book +FILESDIR=/usr/share/games chess.6: /bin/rm -rf ${.OBJDIR}/chess.6 ln -s ${.CURDIR}/DOCUMENTATION/MAN-PAGE ${.OBJDIR}/chess.6 -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/gnuchess.book ${DESTDIR}/usr/share/games - .include diff --git a/gnu/lib/libg++/libg++/genclass/Makefile b/gnu/lib/libg++/libg++/genclass/Makefile index 1d379038f019..ba495a92f1b5 100644 --- a/gnu/lib/libg++/libg++/genclass/Makefile +++ b/gnu/lib/libg++/libg++/genclass/Makefile @@ -1,10 +1,7 @@ -# $NetBSD: Makefile,v 1.3 1996/12/22 20:46:07 cgd Exp $ +# $NetBSD: Makefile,v 1.4 1997/03/24 22:06:06 christos Exp $ # Makefile for g++ library genclass BINDIR?= /usr/bin - -beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/genclass.sh ${DESTDIR}${BINDIR}/genclass +SCRIPTS=genclass.sh .include diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile index 688f28573714..625854abc5ad 100644 --- a/gnu/libexec/uucp/uusched/Makefile +++ b/gnu/libexec/uucp/uusched/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1996/10/18 02:56:47 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 1997/03/24 22:06:07 christos Exp $ # Makefile for uusched BINDIR= $(bindir) @@ -12,8 +12,7 @@ uusched: uusched.in sed -e "s|@BINDIR@|$(bindir)|g" -e "s|@SBINDIR@|$(sbindir)|g" \ $(.CURDIR)/uusched.in > $(.TARGET) -install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - uusched ${DESTDIR}${BINDIR} +FILES=uusched +FILESMODE=${BINMODE} .include diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile index 7b62cf91afb0..3c0cd17aa9c9 100644 --- a/gnu/libexec/uucp/uuto/Makefile +++ b/gnu/libexec/uucp/uuto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1996/10/18 02:57:34 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 1997/03/24 22:06:08 christos Exp $ # Makefile for uuto BINDIR= $(bindir) @@ -12,8 +12,7 @@ uuto: uuto.in sed -e "s|@BINDIR@|$(bindir)|g" -e "s|@SBINDIR@|$(sbindir)|g" \ $(.CURDIR)/uuto.in > $(.TARGET) -install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - uuto ${DESTDIR}${BINDIR} +FILES=uuto +FILESMODE=${BINMODE} .include diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile index a4bbcf7e64c6..88157c216691 100644 --- a/gnu/usr.bin/cpio/Makefile +++ b/gnu/usr.bin/cpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1995/04/23 07:58:27 cgd Exp $ +# $NetBSD: Makefile,v 1.4 1997/03/24 22:06:09 christos Exp $ PROG= cpio CFLAGS+= -I${.CURDIR} -DRETSIGTYPE=void -DHAVE_SYS_MTIO_H=1 -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_FCNTL_H=1 -DHAVE_UTIME_H=1 -DHAVE_STRERROR=1 -DHAVE_VPRINTF=1 -DDIRENT=1 @@ -9,6 +9,6 @@ SRCS = copyin.c copyout.c copypass.c defer.c dstring.c fnmatch.c global.c \ userspec.c xstrdup.c LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} .include diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile index 3f2b85c244da..993e8bc45329 100644 --- a/gnu/usr.bin/diff/Makefile +++ b/gnu/usr.bin/diff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1996/02/05 06:07:31 jtc Exp $ +# $NetBSD: Makefile,v 1.10 1997/03/24 22:06:10 christos Exp $ PROG= diff SRCS= diff.c analyze.c cmpbuf.c io.c context.c ed.c normal.c util.c dir.c \ @@ -6,6 +6,6 @@ SRCS= diff.c analyze.c cmpbuf.c io.c context.c ed.c normal.c util.c dir.c \ CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} -DPR_PROGRAM=\"/usr/bin/pr\" LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} .include diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 415d2f2dafd9..7e5a8bb110f4 100644 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1995/04/23 07:58:33 cgd Exp $ +# $NetBSD: Makefile,v 1.8 1997/03/24 22:06:12 christos Exp $ PROG= diff3 SRCS= diff3.c getopt.c getopt1.c version.c @@ -6,7 +6,7 @@ CFLAGS+= -I$(.CURDIR)/../diff \ -DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\" LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} .include .PATH: $(.CURDIR)/../diff diff --git a/gnu/usr.bin/gas/Makefile b/gnu/usr.bin/gas/Makefile index d8c9226db2ac..03aaf9b6517f 100644 --- a/gnu/usr.bin/gas/Makefile +++ b/gnu/usr.bin/gas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1995/04/23 07:58:35 cgd Exp $ +# $NetBSD: Makefile,v 1.18 1997/03/24 22:06:13 christos Exp $ # @(#)Makefile 6.1 (Berkeley) 3/3/91 .include "config/Makefile.$(MACHINE_ARCH)" @@ -26,7 +26,7 @@ CFLAGS+= -I$(.CURDIR) ${ADDINCLUDE} -I$(.CURDIR)/config \ -DOLD_GAS -DSIGTY=void -Derror=as_fatal \ -DNETBSD_AOUT #LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +#DPADD+= ${LIBGNUMALLOC} CONF_HEADERS= targ-cpu.h obj-format.h host.h targ-env.h diff --git a/gnu/usr.bin/gawk/Makefile b/gnu/usr.bin/gawk/Makefile index 9af97c7cc3e8..4145ad0d55ef 100644 --- a/gnu/usr.bin/gawk/Makefile +++ b/gnu/usr.bin/gawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1995/04/23 07:58:37 cgd Exp $ +# $NetBSD: Makefile,v 1.6 1997/03/24 22:06:14 christos Exp $ PROG= awk SRCS= main.c eval.c builtin.c msg.c iop.c io.c field.c array.c \ @@ -6,7 +6,7 @@ SRCS= main.c eval.c builtin.c msg.c iop.c io.c field.c array.c \ getopt.c getopt1.c CFLAGS+= -DGAWK LDADD= -lm -lgnumalloc -DPADD= ${LIBM} /usr/lib/libgnumalloc.a +DPADD= ${LIBM} ${LIBGNUMALLOC} CLEANFILES+= awk.c y.tab.h .include diff --git a/gnu/usr.bin/gcc/cc/Makefile b/gnu/usr.bin/gcc/cc/Makefile index c9d286d80573..3c3cd2ef8808 100644 --- a/gnu/usr.bin/gcc/cc/Makefile +++ b/gnu/usr.bin/gcc/cc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.2 (Berkeley) 3/25/91 -# $NetBSD: Makefile,v 1.1.1.1 1995/12/01 17:59:44 phil Exp $ +# $NetBSD: Makefile,v 1.2 1997/03/24 22:06:17 christos Exp $ PROG= gcc SRCS= gcc.c obstack.c version.c @@ -11,7 +11,7 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../common -I${.CURDIR}/../arch \ -DMD_STARTFILE_PREFIX=\"/usr/lib/\" LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} LINKS+= ${BINDIR}/gcc ${BINDIR}/cc MLINKS= gcc.1 cc.1 diff --git a/gnu/usr.bin/gcc/cpp/Makefile b/gnu/usr.bin/gcc/cpp/Makefile index 18de0bbe5e92..30fcfd465b24 100644 --- a/gnu/usr.bin/gcc/cpp/Makefile +++ b/gnu/usr.bin/gcc/cpp/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.4 (Berkeley) 2/21/91 -# $NetBSD: Makefile,v 1.3 1996/10/18 03:00:21 thorpej Exp $ +# $NetBSD: Makefile,v 1.4 1997/03/24 22:06:19 christos Exp $ PROG= cpp BINDIR= /usr/libexec @@ -10,7 +10,7 @@ CFLAGS+= -I. -I$(.CURDIR) -I$(.CURDIR)/../common -I$(.CURDIR)/../arch \ -DTOOL_INCLUDE_DIR=\"\" \ -DGPLUSPLUS_INCLUDE_DIR=\"/usr/include/g++\" LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} YFLAGS= MLINKS= cpp.1 cccp.1 cpp.1 gcpp.1 @@ -19,11 +19,10 @@ CLEANFILES+= cexp.c .PATH: $(.CURDIR)/../common -afterinstall: - ${INSTALL} -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \ - $(.CURDIR)/usr.bin.cpp.sh $(DESTDIR)/usr/bin/cpp - @/bin/rm -rf $(DESTDIR)/usr/bin/gcpp - @ln $(DESTDIR)/usr/bin/cpp $(DESTDIR)/usr/bin/gcpp - @echo $(DESTDIR)/usr/bin/gcpp -\> $(DESTDIR)/usr/bin/cpp +LINKS= /usr/bin/cpp /usr/bin/gcpp +FILES=usr.bin.cpp.sh +FILESNAME=cpp +FILESDIR=/usr/bin +FILESMODE=${BINMODE} .include diff --git a/gnu/usr.bin/gcc/g++/Makefile b/gnu/usr.bin/gcc/g++/Makefile index 8971ad664438..6ec9a94d0a69 100644 --- a/gnu/usr.bin/gcc/g++/Makefile +++ b/gnu/usr.bin/gcc/g++/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 6.2 (Berkeley) 3/25/91 -# $NetBSD: Makefile,v 1.3 1996/02/08 03:51:02 mycroft Exp $ +# $NetBSD: Makefile,v 1.4 1997/03/24 22:06:20 christos Exp $ PROG= g++ SRCS= g++.c obstack.c version.c @@ -9,7 +9,7 @@ CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../common \ -I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE_ARCH) \ -DGCC_NAME=\"/usr/bin/cc\" LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} LINKS+= ${BINDIR}/g++ ${BINDIR}/c++ MLINKS= g++.1 c++.1 diff --git a/gnu/usr.bin/gcc/gcc2netbsd b/gnu/usr.bin/gcc/gcc2netbsd index 6ca91c1adc23..ac40ad949cb7 100644 --- a/gnu/usr.bin/gcc/gcc2netbsd +++ b/gnu/usr.bin/gcc/gcc2netbsd @@ -1,6 +1,6 @@ #!/usr/gnu/bin/perl # -# $NetBSD: gcc2netbsd,v 1.14 1997/03/15 01:35:37 jonathan Exp $ +# $NetBSD: gcc2netbsd,v 1.15 1997/03/24 22:06:16 christos Exp $ # # Perl script to convert a standard distribution directory for gcc into # a NetBSD source tree. @@ -588,12 +588,11 @@ CLEANFILES+= cexp.c .PATH: $(.CURDIR)/../common -afterinstall: - ${INSTALL} -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \ - $(.CURDIR)/usr.bin.cpp.sh $(DESTDIR)/usr/bin/cpp - @/bin/rm -rf $(DESTDIR)/usr/bin/gcpp - @ln $(DESTDIR)/usr/bin/cpp $(DESTDIR)/usr/bin/gcpp - @echo $(DESTDIR)/usr/bin/gcpp -\> $(DESTDIR)/usr/bin/cpp +LINKS= ${DESTDIR}/usr/bin/cpp ${DESTDIR}/usr/bin/gcpp +FILES=usr.bin.cpp.sh +FILESINSTALL=cpp +FILESDIR=/usr/bin +FILESMODE=${BINMODE} .include %% file g++/Makefile diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile index f5fdcf8c9c0a..a13996756a3e 100644 --- a/gnu/usr.bin/gdb/gdb/Makefile +++ b/gnu/usr.bin/gdb/gdb/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 1996/01/09 22:39:31 pk Exp $ +# $Id: Makefile,v 1.10 1997/03/24 22:06:21 christos Exp $ # Paths to libraries # @@ -48,8 +48,8 @@ SRCS= blockframe.c core.c gdbtypes.c main.c source.c \ CLEANFILES+= c-exp.tab.h ch-exp.tab.h m2-exp.tab.h c-exp.c ch-exp.c m2-exp.c -LDADD= $(LIBBFD) $(LIBREADLINE) $(LIBIBERTY) -DPADD= $(LIBBFD) $(LIBREADLINE) $(LIBIBERTY) +LDADD+= $(LIBBFD) $(LIBREADLINE) $(LIBIBERTY) +DPADD+= $(LIBBFD) $(LIBREADLINE) $(LIBIBERTY) LDADD+= -ltermcap -lkvm DPADD+= $(LIBTERMCAP) $(LIBKVM) diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index ec2138353d2c..d01f70d8afd1 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1995/04/23 07:58:41 cgd Exp $ +# $NetBSD: Makefile,v 1.7 1997/03/24 22:06:22 christos Exp $ PROG= grep SRCS= dfa.c grep.c getopt.c kwset.c obstack.c regex.c search.c @@ -7,7 +7,7 @@ CFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \ -DHAVE_VALLOC=1 LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep diff --git a/gnu/usr.bin/groff/afmtodit/Makefile b/gnu/usr.bin/groff/afmtodit/Makefile index 2c842dfda24d..691649daffd3 100644 --- a/gnu/usr.bin/groff/afmtodit/Makefile +++ b/gnu/usr.bin/groff/afmtodit/Makefile @@ -1,10 +1,7 @@ -# $NetBSD: Makefile,v 1.5 1996/10/18 03:01:20 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 1997/03/24 22:06:25 christos Exp $ MAN= afmtodit.1 - -afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - $(.CURDIR)/afmtodit.pl $(DESTDIR)$(BINDIR)/afmtodit +SCRIPT=afmtodit.pl .include <../../Makefile.inc> .include <../Makefile.cfg> diff --git a/gnu/usr.bin/groff/devices/Makefile.dev b/gnu/usr.bin/groff/devices/Makefile.dev index 88171e437630..5f6efc5b30e1 100644 --- a/gnu/usr.bin/groff/devices/Makefile.dev +++ b/gnu/usr.bin/groff/devices/Makefile.dev @@ -1,5 +1,5 @@ # from: @(#)Makefile.dev 6.2 (Berkeley) 3/16/91 -# $Id: Makefile.dev,v 1.15 1996/10/18 03:02:32 thorpej Exp $ +# $Id: Makefile.dev,v 1.16 1997/03/24 22:06:27 christos Exp $ # Client Makefiles define DEVICE and FONTFILES and provide rules for # individual font files @@ -27,11 +27,15 @@ COPY= -c .endif .if !target(install) -install: - for f in $(FONTFILES); do \ - ${INSTALL} ${COPY} -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \ - $$f $(DEVICEDIR)/$$f; \ - done +FILES=${FONTFILES} +FILESDIR=${DEVICEDIR} +FILESOWN=${FONTOWN} +FILESGRP=${FONTGRP} +FILESMODE=${FONTMODE} +GENFILES=${FONTFILES:Mgenerate/*} +.for i in ${GENFILES} +FILESDIR_$i=${DEVICEDIR}/generate +.endfor .endif .include diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile index 0c55ca26025c..dc00b6b5ae42 100644 --- a/gnu/usr.bin/groff/eqn/Makefile +++ b/gnu/usr.bin/groff/eqn/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 1995/06/10 20:37:55 mycroft Exp $ +# $Id: Makefile,v 1.10 1997/03/24 22:06:28 christos Exp $ PROG= eqn SRCS= main.cc lex.cc box.cc limit.cc list.cc over.cc text.cc\ @@ -8,15 +8,17 @@ CFLAGS+= -I. -I$(.CURDIR)/../include LDADD+= $(LIBGROFF) DPADD+= $(LIBGROFF) -CLEANFILES+= eqn.cc eqn.tab.h +CLEANFILES+= eqn.cc eqn.tab.h neqn lex.o: eqn.cc -afterinstall: - rm -f ${DESTDIR}${BINDIR}/neqn - sed -e 's/@g@/$(g)/g' $(.CURDIR)/neqn.sh > $(DESTDIR)$(BINDIR)/neqn - chown ${BINOWN}:${BINGRP} $(DESTDIR)$(BINDIR)/neqn - chmod ${BINMODE} $(DESTDIR)$(BINDIR)/neqn +FILES=neqn +FILESMODE=${BINMODE} + +all: neqn + +neqn: neqn.sh + sed -e 's/@g@/$(g)/g' ${.ALLSRC} > ${.TARGET} .include "../../Makefile.inc" .include "../Makefile.cfg" diff --git a/gnu/usr.bin/groff/grog/Makefile b/gnu/usr.bin/groff/grog/Makefile index 251105b1612b..15dbb597d9fb 100644 --- a/gnu/usr.bin/groff/grog/Makefile +++ b/gnu/usr.bin/groff/grog/Makefile @@ -1,10 +1,7 @@ -# $NetBSD: Makefile,v 1.7 1996/10/18 03:03:09 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 1997/03/24 22:06:29 christos Exp $ MAN= grog.1 - -beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - $(.CURDIR)/grog.sh $(DESTDIR)$(BINDIR)/grog +SCRIPTS= grog.sh .include <../../Makefile.inc> .include diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile index 2814a1671c6e..4f6c0b123b93 100644 --- a/gnu/usr.bin/groff/indxbib/Makefile +++ b/gnu/usr.bin/groff/indxbib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1996/10/18 03:03:38 thorpej Exp $ +# $Id: Makefile,v 1.7 1997/03/24 22:06:30 christos Exp $ PROG= indxbib SRCS= indxbib.cc dirnamemax.c signal.c @@ -6,12 +6,12 @@ CFLAGS+= -I$(.CURDIR)/../include LDADD+= $(LIBBIB) $(LIBGROFF) -lm DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBM) -# XXX -- this depends on ../include/defs.h -COMMON_WORDS_FILE= "/usr/share/dict/eign" +COMMON_WORDS_FILE!=awk -F\" '/COMMON_WORDS_FILE/ { print $$2 }' ${.CURDIR}/../include/defs.h + +FILES=eign +FILESNAME=${COMMON_WORDS_FILE:T} +FILESDIR=${COMMON_WORDS_FILE:H} -afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $(.CURDIR)/eign \ - $(DESTDIR)$(COMMON_WORDS_FILE) .include "../../Makefile.inc" .include "../Makefile.cfg" diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile index 0771fac07722..42bb561fe38b 100644 --- a/gnu/usr.bin/groff/mm/Makefile +++ b/gnu/usr.bin/groff/mm/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 1996/10/18 03:04:27 thorpej Exp $ +# $Id: Makefile,v 1.10 1997/03/24 22:06:31 christos Exp $ # XXX -- this depends on ../include/defs.h TMACDIR?= /usr/share/tmac @@ -7,30 +7,17 @@ TMACOWN?= bin TMACGRP?= bin TMACMODE?= 444 -FILES= 0.MT 5.MT 4.MT ms.cov se_ms.cov -LOCALE= locale se_locale - MAN= groff_mm.7 groff_mmse.7 MLINKS= groff_mm.7 mm.7 groff_mmse.7 mmse.7 -afterinstall: - ${INSTALL} -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \ - $(.CURDIR)/tmac.m $(DESTDIR)$(TMACDIR)/tmac.m - ${INSTALL} -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \ - $(.CURDIR)/tmac.m $(DESTDIR)$(TMACDIR)/tmac.mse +FILES= tmac.m +LINKS= ${TMACDIR}/tmac.m ${TMACDIR}/tmac.mse +FILESDIR= ${TMACDIR} +FILESOWN= ${TMACOWN} +FILESGRP= ${TMACGRP} +FILESMODE= ${TMACMODE} - for f in $(FILES); do \ - rm -f $(DESTDIR)$(TMACDIR)/mm/$$f; \ - ${INSTALL} -c -o $(TMACOWN) -g $(TMACGRP) -m $(TMACMODE) \ - $(.CURDIR)/mm/$$f $(DESTDIR)$(TMACDIR)/mm/$$f; \ - done - for f in $(LOCALE); do \ - if test ! -f $(DESTDIR)$(TMACDIR)/mm/$$f; then \ - ${INSTALL} -c -o $(TMACOWN) -g $(TMACGRP) \ - -m $(TMACMODE) /dev/null \ - $(DESTDIR)$(TMACDIR)/mm/$$f; \ - fi; \ - done +SUBDIR= mm .include "../Makefile.cfg" .include diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile index 4923803e9fbc..625d09bb7a41 100644 --- a/gnu/usr.bin/groff/nroff/Makefile +++ b/gnu/usr.bin/groff/nroff/Makefile @@ -1,12 +1,7 @@ -# $Id: Makefile,v 1.5 1996/10/18 03:05:00 thorpej Exp $ +# $Id: Makefile,v 1.6 1997/03/24 22:06:32 christos Exp $ MAN= nroff.1 - -afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - $(.CURDIR)/nroff.sh $(DESTDIR)$(BINDIR)/nroff - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - $(.CURDIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff +SCRIPTS= nroff.sh psroff.sh .include <../../Makefile.inc> .include <../Makefile.cfg> diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index 87b0272342e2..8d1ee7b3a60e 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1996/10/18 03:06:40 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 1997/03/24 22:06:33 christos Exp $ # XXX -- this depends on ../include/defs.h TMACDIR?= /usr/share/tmac @@ -12,17 +12,15 @@ MLINKS= groff_ms.7 ms.7 FILES= tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic tmac.psatk\ tmac.dvi tmac.tty tmac.tty-char tmac.X tmac.Xps tmac.latin1\ - tmac.lj4 tmac.safer tmac.a4 man.local eqnrc troffrc + tmac.lj4 tmac.safer tmac.a4 tmac.s tmac.an man.local eqnrc \ + troffrc + +FILESOWN= ${TMACOWN} +FILESGRP= ${TMACGRP} +FILESMODE= ${TMACMODE} +FILESDIR= ${TMACDIR} +FILESNAME_tmac.an=tmac.an.old -afterinstall: - for f in ${FILES}; do \ - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - ${.CURDIR}/$$f ${DESTDIR}${TMACDIR}; \ - done - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - ${.CURDIR}/tmac.s ${DESTDIR}${TMACDIR}/tmac.s - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - ${.CURDIR}/tmac.an ${DESTDIR}${TMACDIR}/tmac.an.old .include "../Makefile.cfg" .include diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile index 56bfd40d3020..4cb8a9788309 100644 --- a/gnu/usr.bin/groff/troff/Makefile +++ b/gnu/usr.bin/groff/troff/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11 1996/10/18 03:06:42 thorpej Exp $ +# $Id: Makefile,v 1.12 1997/03/24 22:06:34 christos Exp $ PROG= troff SRCS= env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \ @@ -19,9 +19,8 @@ majorminor.cc: $(.CURDIR)/../VERSION # XXX -- this depends on ../include/defs.h TMACDIR=/usr/share/tmac -afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $(.CURDIR)/hyphen.us \ - $(DESTDIR)$(TMACDIR)/hyphen.us +FILES=hyphen.us +FILESDIR=${TMACDIR} .include "../../Makefile.inc" .include "../Makefile.cfg" diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile index a1882fc69401..57059e25f5f5 100644 --- a/gnu/usr.bin/gzip/Makefile +++ b/gnu/usr.bin/gzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1996/10/18 03:07:19 thorpej Exp $ +# $NetBSD: Makefile,v 1.19 1997/03/24 22:06:35 christos Exp $ PROG= gzip SRCS= gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \ @@ -13,7 +13,7 @@ CFLAGS+=-DASMV LDSTATIC= -static LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} MLINKS+= gzip.1 gunzip.1 gzip.1 gzcat.1 gzip.1 zcat.1 MLINKS+= zdiff.1 zcmp.1 @@ -24,11 +24,8 @@ LINKS+= ${BINDIR}/gzip ${BINDIR}/zcat LINKS+= ${BINDIR}/zdiff ${BINDIR}/zcmp #LINKS+= ${BINDIR}/gzip ${BINDIR}/uncompress -afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/zforce ${.CURDIR}/gzexe ${.CURDIR}/znew \ - ${.CURDIR}/zmore ${.CURDIR}/zdiff ${.CURDIR}/zgrep \ - ${DESTDIR}${BINDIR} +FILES=zforce gzexe znew zmore zdiff zgrep +FILESMODE=${BINMODE} .if (${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "i386") match.o: ${.CURDIR}/match.S diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile index 44ce6eab0fce..c8cf6de996b2 100644 --- a/gnu/usr.bin/ld/rtld/Makefile +++ b/gnu/usr.bin/ld/rtld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1996/12/23 22:13:03 pk Exp $ +# $NetBSD: Makefile,v 1.15 1997/03/24 22:06:36 christos Exp $ PROG= ld.so SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c @@ -12,9 +12,12 @@ LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic LDFLAGS+= -nostdlib -L${DESTDIR}/usr/lib .endif LDADD+= -lc_pic +DPADD+= ${LIBC_PIC} BINDIR= /usr/libexec HDRS= link.h MLINKS= rtld.1 ld.so.1 +INCS=${HDRS} +INCSDIR=/usr/include .PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH) ${.CURDIR}/../../../../lib/libc/stdio @@ -24,13 +27,4 @@ $(PROG): .S.o: ${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} - -includes: - @cd ${.CURDIR}; for i in $(HDRS); do \ - j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \ - ${DESTDIR}/usr/include"; \ - echo $$j; \ - eval "$$j"; \ - done - .include diff --git a/gnu/usr.bin/rcs/ci/Makefile b/gnu/usr.bin/rcs/ci/Makefile index 8932ac78287c..90780b865f58 100644 --- a/gnu/usr.bin/rcs/ci/Makefile +++ b/gnu/usr.bin/rcs/ci/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 06:59:52 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:38 christos Exp $ PROG= ci CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/co/Makefile b/gnu/usr.bin/rcs/co/Makefile index c2c8ed02f755..52ec7eae57d9 100644 --- a/gnu/usr.bin/rcs/co/Makefile +++ b/gnu/usr.bin/rcs/co/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 06:59:55 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:39 christos Exp $ PROG= co CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/ident/Makefile b/gnu/usr.bin/rcs/ident/Makefile index e560a37fe3d3..5b032a182c96 100644 --- a/gnu/usr.bin/rcs/ident/Makefile +++ b/gnu/usr.bin/rcs/ident/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 07:00:00 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:40 christos Exp $ PROG= ident CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/merge/Makefile b/gnu/usr.bin/rcs/merge/Makefile index 08b9aae25648..e2919ab83a83 100644 --- a/gnu/usr.bin/rcs/merge/Makefile +++ b/gnu/usr.bin/rcs/merge/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 07:00:29 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:41 christos Exp $ PROG= merge CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/rcs/Makefile b/gnu/usr.bin/rcs/rcs/Makefile index 194a43d23ca7..a137dab4329a 100644 --- a/gnu/usr.bin/rcs/rcs/Makefile +++ b/gnu/usr.bin/rcs/rcs/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 1996/10/15 07:00:32 veego Exp $ +# $NetBSD: Makefile,v 1.6 1997/03/24 22:06:42 christos Exp $ PROG= rcs CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} MAN= rcs.1 rcsfile.5 rcsintro.1 diff --git a/gnu/usr.bin/rcs/rcsclean/Makefile b/gnu/usr.bin/rcs/rcsclean/Makefile index 62b948587c0a..14fd6263e364 100644 --- a/gnu/usr.bin/rcs/rcsclean/Makefile +++ b/gnu/usr.bin/rcs/rcsclean/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 07:00:36 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:43 christos Exp $ PROG= rcsclean CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/rcsdiff/Makefile b/gnu/usr.bin/rcs/rcsdiff/Makefile index 43a6c388b832..97343a70670a 100644 --- a/gnu/usr.bin/rcs/rcsdiff/Makefile +++ b/gnu/usr.bin/rcs/rcsdiff/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 07:00:39 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:44 christos Exp $ PROG= rcsdiff CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/rcsfreeze/Makefile b/gnu/usr.bin/rcs/rcsfreeze/Makefile index c63605b9ff91..eb2656b19189 100644 --- a/gnu/usr.bin/rcs/rcsfreeze/Makefile +++ b/gnu/usr.bin/rcs/rcsfreeze/Makefile @@ -1,10 +1,7 @@ -# $NetBSD: Makefile,v 1.5 1996/10/18 03:07:39 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 1997/03/24 22:06:45 christos Exp $ MAN= rcsfreeze.1 - -afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/rcsfreeze.sh ${DESTDIR}${BINDIR}/rcsfreeze +SCRIPTS=rcsfreeze.sh .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile index f3fdcc648ca0..0aaafab40816 100644 --- a/gnu/usr.bin/rcs/rcsmerge/Makefile +++ b/gnu/usr.bin/rcs/rcsmerge/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 07:00:44 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:46 christos Exp $ PROG= rcsmerge CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/rcs/rlog/Makefile b/gnu/usr.bin/rcs/rlog/Makefile index c7687c34c8ad..3e77c2765711 100644 --- a/gnu/usr.bin/rcs/rlog/Makefile +++ b/gnu/usr.bin/rcs/rlog/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1996/10/15 07:00:48 veego Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:47 christos Exp $ PROG= rlog CFLAGS+= -I${.CURDIR}/../lib LDADD= ${LIBRCS} -lgnumalloc -DPADD= ${LIBRCS} /usr/lib/libgnumalloc.a +DPADD= ${LIBRCS} ${LIBGNUMALLOC} .include "../../Makefile.inc" .include diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile index de8b03575e26..b2fc5b79a67d 100644 --- a/gnu/usr.bin/sdiff/Makefile +++ b/gnu/usr.bin/sdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1995/04/23 07:58:50 cgd Exp $ +# $NetBSD: Makefile,v 1.7 1997/03/24 22:06:49 christos Exp $ PROG= sdiff SRCS= sdiff.c getopt.c getopt1.c version.c @@ -6,7 +6,7 @@ CFLAGS+= -I$(.CURDIR)/../diff \ -DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\" LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} .include .PATH: $(.CURDIR)/../diff diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile index 437c578b694c..b0124d70bdae 100644 --- a/gnu/usr.bin/send-pr/Makefile +++ b/gnu/usr.bin/send-pr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1996/10/18 03:08:31 thorpej Exp $ +# $NetBSD: Makefile,v 1.19 1997/03/24 22:06:50 christos Exp $ # # Makefile for building a standalone send-pr. @@ -90,12 +90,10 @@ send-pr.1: send-pr.man Makefile -e 's,xVERSIONx,$(VERSION),g' $(srcdir)/send-pr.man > $@-t mv -f $@-t $@ -beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} send-pr \ - ${DESTDIR}${BINDIR} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} install-sid \ - ${DESTDIR}${BINDIR} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/categories \ - ${DESTDIR}${LIBDIR}/gnats/${GNATS_SITE} +FILES=send-pr install-sid categories +FILESDIR_categories=${LIBDIR}/gnats +FILESNAME_categories=${GNATS_SITE} +FILESMODE_send-pr=${BINMODE} +FILESMODE_install-sid=${BINMODE} .include diff --git a/gnu/usr.bin/sort/Makefile b/gnu/usr.bin/sort/Makefile index 6edcb66e6922..a767020bfc5f 100644 --- a/gnu/usr.bin/sort/Makefile +++ b/gnu/usr.bin/sort/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 1995/04/23 07:58:53 cgd Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:06:51 christos Exp $ PROG= sort LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} .include diff --git a/gnu/usr.bin/tar/Makefile b/gnu/usr.bin/tar/Makefile index e525a5c7f307..76098a475d4b 100644 --- a/gnu/usr.bin/tar/Makefile +++ b/gnu/usr.bin/tar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1995/04/29 05:37:13 cgd Exp $ +# $NetBSD: Makefile,v 1.14 1997/03/24 22:06:52 christos Exp $ PROG= tar SRCS= buffer.c create.c diffarch.c extract.c fnmatch.c getdate.y \ @@ -14,7 +14,7 @@ CFLAGS+= -DSTDC_HEADERS LDSTATIC= -static LDADD+= -lgnumalloc -DPADD+= /usr/lib/libgnumalloc.a +DPADD+= ${LIBGNUMALLOC} MAN=tar.1 CLEANFILES+=y.tab.h diff --git a/libexec/ld.aout_so/Makefile b/libexec/ld.aout_so/Makefile index 44ce6eab0fce..c8cf6de996b2 100644 --- a/libexec/ld.aout_so/Makefile +++ b/libexec/ld.aout_so/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1996/12/23 22:13:03 pk Exp $ +# $NetBSD: Makefile,v 1.15 1997/03/24 22:06:36 christos Exp $ PROG= ld.so SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c @@ -12,9 +12,12 @@ LDFLAGS+=-Bshareable -Bsymbolic -assert nosymbolic LDFLAGS+= -nostdlib -L${DESTDIR}/usr/lib .endif LDADD+= -lc_pic +DPADD+= ${LIBC_PIC} BINDIR= /usr/libexec HDRS= link.h MLINKS= rtld.1 ld.so.1 +INCS=${HDRS} +INCSDIR=/usr/include .PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH) ${.CURDIR}/../../../../lib/libc/stdio @@ -24,13 +27,4 @@ $(PROG): .S.o: ${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} - -includes: - @cd ${.CURDIR}; for i in $(HDRS); do \ - j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \ - ${DESTDIR}/usr/include"; \ - echo $$j; \ - eval "$$j"; \ - done - .include diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index e5979bdb0dc8..ce8e4d62fa89 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 1996/08/25 23:40:51 jtk Exp $ +# $NetBSD: Makefile,v 1.2 1997/03/24 22:02:40 christos Exp $ SRCS= apm.c apmsubr.c #LDADD+= -lutil +#DPADD+= ${LIBUTIL} .PATH: ${.CURDIR}/../apmd diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index b7fe6314d670..74f106ecc7ce 100644 --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 1996/08/25 23:40:57 jtk Exp $ +# $NetBSD: Makefile,v 1.2 1997/03/24 22:02:42 christos Exp $ SRCS= apmd.c apmsubr.c #LDADD+= -lutil +#DPADD+= ${LIBUTIL} CFLAGS+= -g -O2 -Wmissing-prototypes -Wall PROG= apmd diff --git a/usr.sbin/mopd/mopchk/Makefile b/usr.sbin/mopd/mopchk/Makefile index f3731e3b98bb..2cfd0e91a5fe 100644 --- a/usr.sbin/mopd/mopchk/Makefile +++ b/usr.sbin/mopd/mopchk/Makefile @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $ +# $Id: Makefile,v 1.2 1997/03/24 22:02:43 christos Exp $ PROG= mopchk SRCS= mopchk.c device.c version.c pf.c loop-bsd.c file.c CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common -DINFO CLEANFILES= version.c version.h LDADD= -lkvm +DPADD= ${LIBKVM} .PATH: ${.CURDIR}/.. ${.CURDIR}/../common version.c version.h: ${.CURDIR}/../common/VERSION diff --git a/usr.sbin/mopd/mopd/Makefile b/usr.sbin/mopd/mopd/Makefile index 975f91d6305d..a85f315b8572 100644 --- a/usr.sbin/mopd/mopd/Makefile +++ b/usr.sbin/mopd/mopd/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $ +# $Id: Makefile,v 1.2 1997/03/24 22:02:44 christos Exp $ PROG= mopd SRCS= mopd.c process.c print.c cmp.c get.c put.c mopdef.c nma.c device.c \ @@ -7,6 +7,7 @@ MAN= mopd.8 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common CLEANFILES= version.c version.h LDADD= -lkvm +DPADD= ${LIBKVM} .PATH: ${.CURDIR}/../common version.c version.h: ${.CURDIR}/../common/VERSION diff --git a/usr.sbin/mopd/mopprobe/Makefile b/usr.sbin/mopd/mopprobe/Makefile index 04ce0cc339d1..81272ee1c070 100644 --- a/usr.sbin/mopd/mopprobe/Makefile +++ b/usr.sbin/mopd/mopprobe/Makefile @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $ +# $Id: Makefile,v 1.2 1997/03/24 22:02:46 christos Exp $ PROG= mopprobe SRCS= mopprobe.c device.c get.c cmp.c mopdef.c version.c pf.c loop-bsd.c CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common -DNODL CLEANFILES= version.c version.h LDADD= -lkvm +DPADD= ${LIBKVM} .PATH: ${.CURDIR}/../common version.c version.h: ${.CURDIR}/../common/VERSION diff --git a/usr.sbin/mopd/moptrace/Makefile b/usr.sbin/mopd/moptrace/Makefile index 6258f744ca6a..f4efa4b151ca 100644 --- a/usr.sbin/mopd/moptrace/Makefile +++ b/usr.sbin/mopd/moptrace/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.1 1997/03/16 22:23:39 cjs Exp $ +# $Id: Makefile,v 1.2 1997/03/24 22:02:47 christos Exp $ PROG= moptrace SRCS= moptrace.c print.c cmp.c get.c mopdef.c nma.c device.c version.c pf.c \ @@ -7,6 +7,7 @@ MAN= moptrace.1 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common CLEANFILES= version.c version.h LDADD= -lkvm +DPADD= ${LIBKVM} .PATH: ${.CURDIR}/../common version.c version.h: ${.CURDIR}/../common/VERSION diff --git a/usr.sbin/named/dig/Makefile b/usr.sbin/named/dig/Makefile index c16b9a6dfbdc..63c6e77c0379 100644 --- a/usr.sbin/named/dig/Makefile +++ b/usr.sbin/named/dig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1996/03/31 13:55:34 mrg Exp $ +# $NetBSD: Makefile,v 1.3 1997/03/24 22:02:48 christos Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:45 vixie Exp .PATH: ${.CURDIR}/../nslookup \ @@ -10,5 +10,5 @@ SRCS= dig.c list.c subr.c debug.c send.c gethostnamadr.c res_init.c \ res_mkquery.c res_query.c res_send.c CFLAGS+= -I${.CURDIR}/.. -DDEBUG -.include .include "../../Makefile.inc" +.include diff --git a/usr.sbin/named/dnsquery/Makefile b/usr.sbin/named/dnsquery/Makefile index 7ad58c12460e..a13c3abdd9e9 100644 --- a/usr.sbin/named/dnsquery/Makefile +++ b/usr.sbin/named/dnsquery/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1 1996/02/02 15:26:21 mrg Exp $ +# $NetBSD: Makefile,v 1.2 1997/03/24 22:02:49 christos Exp $ .PATH: ${.CURDIR}/../man PROG= dnsquery -.include .include "../../Makefile.inc" +.include diff --git a/usr.sbin/named/named/Makefile b/usr.sbin/named/named/Makefile index 315b34895e1f..9655b73bd4a0 100644 --- a/usr.sbin/named/named/Makefile +++ b/usr.sbin/named/named/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 1996/02/02 15:28:00 mrg Exp $ +# $NetBSD: Makefile,v 1.2 1997/03/24 22:02:50 christos Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:45 vixie Exp .PATH: ${.CURDIR}/../man @@ -14,5 +14,5 @@ makeversionc: (sed -e "s|%VERSION%|${VER}|" \ < ${.CURDIR}/Version.c > ${.CURDIR}/version.c) -.include .include "../../Makefile.inc" +.include diff --git a/usr.sbin/named/ndc/Makefile b/usr.sbin/named/ndc/Makefile index 5ae52d30f3b2..063fc1086945 100644 --- a/usr.sbin/named/ndc/Makefile +++ b/usr.sbin/named/ndc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1996/10/18 06:28:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:02:51 christos Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp .PATH: ${.CURDIR}/../man @@ -7,9 +7,11 @@ all: ndc CLEANFILES+= ndc MAN= ndc.8 -realinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ndc ${DESTDIR}${BINDIR}/ndc +.include +.include "../../Makefile.inc" + +FILES=ndc +FILESMODE=${BINMODE} ndc: ndc.sh Makefile ${.CURDIR}/../Makefile.inc sed -e "s|%PIDDIR%|${PIDDIR}|" \ @@ -19,5 +21,4 @@ ndc: ndc.sh Makefile ${.CURDIR}/../Makefile.inc < ${.CURDIR}/ndc.sh > ndc chmod +x ndc -.include "../../Makefile.inc" .include diff --git a/usr.sbin/named/nslookup/Makefile b/usr.sbin/named/nslookup/Makefile index ee799b046c0b..77477b4d41db 100644 --- a/usr.sbin/named/nslookup/Makefile +++ b/usr.sbin/named/nslookup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1996/10/18 06:28:49 thorpej Exp $ +# $NetBSD: Makefile,v 1.3 1997/03/24 22:02:52 christos Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:48 vixie Exp .PATH: ${.CURDIR}/../nslookup \ @@ -11,12 +11,9 @@ DPADD= ${LIBL} LDADD= -ll CLEANFILES+= commands.c lex.yy.c lex.yy.o MAN= nslookup.8 +FILES= nslookup.help +FILESDIR=/usr/share/misc -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../nslookup/nslookup.help \ - ${DESTDIR}/usr/share/misc/nslookup.help - -.include .include "../Makefile.inc" .include "../../Makefile.inc" +.include diff --git a/usr.sbin/named/reload/Makefile b/usr.sbin/named/reload/Makefile index 2ac39819672b..e76d4290983b 100644 --- a/usr.sbin/named/reload/Makefile +++ b/usr.sbin/named/reload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1996/10/18 06:29:11 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:02:54 christos Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:46 vixie Exp .PATH: ${.CURDIR}/../man @@ -6,10 +6,8 @@ all: named.reload CLEANFILES+= named.reload MAN= named.reload.8 - -realinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - named.reload ${DESTDIR}${BINDIR}/named.reload +FILES=named.reload +FILESMODE=${BINMODE} named.reload: named.reload.sh Makefile ${.CURDIR}/../Makefile.inc sed -e "s|%DESTSBIN%|${BINDIR}|" \ diff --git a/usr.sbin/named/restart/Makefile b/usr.sbin/named/restart/Makefile index 6ba44d4b721a..a6b0538b50ff 100644 --- a/usr.sbin/named/restart/Makefile +++ b/usr.sbin/named/restart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1996/10/18 06:29:29 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:02:56 christos Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp .PATH: ${.CURDIR}/../man @@ -6,15 +6,13 @@ all: named.restart CLEANFILES+= named.restart MAN= named.restart.8 +FILES= named.restart -realinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - named.restart ${DESTDIR}${BINDIR}/named.restart +.include "../../Makefile.inc" named.restart: named.restart.sh Makefile ${.CURDIR}/../Makefile.inc sed -e "s|%DESTSBIN%|${BINDIR}|" \ < ${.CURDIR}/named.restart.sh > named.restart chmod +x named.restart -.include "../../Makefile.inc" .include diff --git a/usr.sbin/rpc.pcnfsd/Makefile b/usr.sbin/rpc.pcnfsd/Makefile index 7f753aa50e91..f8c312f5c7b2 100644 --- a/usr.sbin/rpc.pcnfsd/Makefile +++ b/usr.sbin/rpc.pcnfsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1995/07/25 22:20:13 gwr Exp $ +# $NetBSD: Makefile,v 1.4 1997/03/24 22:02:57 christos Exp $ PROG= rpc.pcnfsd MAN= pcnfsd.8 @@ -8,7 +8,7 @@ CFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR} SRCS= pcnfsd_v1.c pcnfsd_v2.c pcnfsd_misc.c \ pcnfsd_cache.c pcnfsd_print.c pcnfsd_svc.c pcnfsd_xdr.c -DPADD= ${LIBRPCSVC} +DPADD= ${LIBRPCSVC} ${LIBCRYPT} LDADD= -lrpcsvc -lcrypt pcnfsd_svc.c: pcnfsd.x diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 5205c147c3b2..5b5fc5fcf7d0 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1996/08/09 10:19:49 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 1997/03/24 22:02:59 christos Exp $ PROG= rpc.yppasswdd SRCS= rpc.yppasswdd.c yppasswdd_xdr.c yppasswdd_mkpw.c @@ -7,7 +7,7 @@ BINOWN= root BINMODE=555 BINDIR=/usr/sbin MLINKS= rpc.yppasswdd.8 yppasswdd.8 -DPADD+= ${LIBUTIL} +DPADD+= ${LIBCRYPT} ${LIBUTIL} LDADD+= -lcrypt -lutil .include diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile index 670851364a4e..9c78866f9327 100644 --- a/usr.sbin/sendmail/src/Makefile +++ b/usr.sbin/sendmail/src/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 1996/12/27 01:54:07 cjs Exp $ +# $NetBSD: Makefile,v 1.28 1997/03/24 22:03:00 christos Exp $ # # NetBSD Makefile # @@ -20,6 +20,7 @@ DBMDEF= -DNEWDB -DNIS CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO -DTCPWRAPPERS LDADD+=-lwrap +DPADD+=${LIBWRAP} SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \ deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \ @@ -33,13 +34,11 @@ BINDIR= /usr/sbin BINOWN= root BINGRP= kmem BINMODE=6555 +FILES=sendmail.hf +FILESDIR=/usr/share/misc -beforeinstall: -# ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ -# ${DESTDIR}/etc/sendmail.fc +proginstall:: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/sendmail.st - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \ - ${DESTDIR}/usr/share/misc .include diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile index 11f7244f1dfb..59977f55705f 100644 --- a/usr.sbin/tcpdchk/Makefile +++ b/usr.sbin/tcpdchk/Makefile @@ -4,6 +4,7 @@ PROG= tcpdchk SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c percent_m.c MAN= tcpdchk.8 LDADD= -lwrap +DPADD= ${LIBWRAP} CFLAGS+= -I${.CURDIR}/../../lib/libwrap diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile index c01d005d7141..1ada657827ff 100644 --- a/usr.sbin/tcpdmatch/Makefile +++ b/usr.sbin/tcpdmatch/Makefile @@ -6,6 +6,7 @@ MAN= tcpdmatch.8 .PATH: ${.CURDIR}/../tcpdchk CFLAGS+= -I${.CURDIR}/../tcpdchk -I${.CURDIR}/../../lib/libwrap LDADD= -lwrap +DPADD= ${LIBWRAP} .include "${.CURDIR}/../../lib/libwrap/Makefile.cflags" diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index e6b85b4ebff6..c830b0f48ceb 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1995/03/07 23:18:39 mycroft Exp $ +# $NetBSD: Makefile,v 1.7 1997/03/24 22:03:04 christos Exp $ # # Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 # The Regents of the University of California. All rights reserved. @@ -19,7 +19,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /cvsroot/src/usr.sbin/tcpdump/Attic/Makefile,v 1.6 1995/03/07 23:18:39 mycroft Exp $ (LBL) +# @(#) $Header: /cvsroot/src/usr.sbin/tcpdump/Attic/Makefile,v 1.7 1997/03/24 22:03:04 christos Exp $ (LBL) PROG= tcpdump MAN= tcpdump.8 @@ -27,7 +27,7 @@ MAN= tcpdump.8 CFLAGS+=-DCSLIP -DPPP -DFDDI -DETHER_SERVICE LDADD+= -lpcap -ll -DPADD+= ${LIBL} ${LIBPCAP} +DPADD+= ${LIBPCAP} ${LIBL} SRCS= tcpdump.c addrtoname.c \ print-ether.c print-ip.c print-arp.c print-tcp.c print-udp.c \ diff --git a/usr.sbin/ypserv/ypinit/Makefile b/usr.sbin/ypserv/ypinit/Makefile index 54b9457c9fb8..09ca16f516aa 100644 --- a/usr.sbin/ypserv/ypinit/Makefile +++ b/usr.sbin/ypserv/ypinit/Makefile @@ -1,13 +1,9 @@ -# $NetBSD: Makefile,v 1.4 1997/01/27 00:28:31 cjs Exp $ +# $NetBSD: Makefile,v 1.5 1997/03/24 22:03:05 christos Exp $ MAN= ypinit.8 - -beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/ypinit.sh ${DESTDIR}/usr/sbin/ypinit - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 0644 \ - ${.CURDIR}/Makefile.yp ${DESTDIR}/var/yp/Makefile.yp - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 0644 \ - ${.CURDIR}/Makefile.main ${DESTDIR}/var/yp/Makefile.main +SCRIPTS=ypinit.sh +FILES=Makefile.yp Makefile.main +FILESDIR=/var/yp +FILESMODE=0644 .include