converted to use gnu malloc, and depend on it correctly

gnu/usr.bin/bc/Makefile

@@ -1,8 +1,12 @@
-#	$Id: Makefile,v 1.4 1993/08/02 17:25:28 mycroft Exp $
+#	$Id: Makefile,v 1.5 1993/10/07 07:23:44 cgd Exp $
 
 PROG=	bc
 CFLAGS+=-D_POSIX_SOURCE -I${.CURDIR}/obj -I${.CURDIR}
 SRCS=	bc.c scan.c util.c main.c number.c storage.c load.c execute.c global.c
+
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 CLEANFILES+= bc.c scan.c y.tab.h
 
 bc.c: bc.c.dist y.tab.h

gnu/usr.bin/cpio/Makefile

@@ -6,4 +6,7 @@ SRCS =	copyin.c copyout.c copypass.c defer.c dstring.c fnmatch.c global.c \
 	rtapelib.c dirname.c idcache.c makepath.c xmalloc.c stripslash.c \
 	userspec.c xstrdup.c
 
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 .include <bsd.prog.mk>

gnu/usr.bin/diff/Makefile

@@ -1,10 +1,12 @@
-#	$Id: Makefile,v 1.4 1993/09/16 17:39:00 jtc Exp $
+#	$Id: Makefile,v 1.5 1993/10/07 07:23:57 cgd Exp $
 
 PROG=	diff
 SRCS=	diff.c analyze.c cmpbuf.o io.c context.c ed.c normal.c util.c dir.c \
 	regex.c side.c ifdef.c version.c getopt.c getopt1.c
 
 CFLAGS+=-DHAVE_CONFIG_H -I${.CURDIR} 
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
 NOMAN=noman
 
 .include <bsd.prog.mk>

gnu/usr.bin/diff3/Makefile

@@ -1,9 +1,11 @@
-#	$Id: Makefile,v 1.4 1993/09/16 17:39:59 jtc Exp $
+#	$Id: Makefile,v 1.5 1993/10/07 07:24:01 cgd Exp $
 
 PROG=		diff3
 SRCS=		diff3.c getopt.c getopt1.c version.c
 CFLAGS+=	-I$(.CURDIR)/../diff \
 		-DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\"
+LDADD+=		-lgnumalloc
+DPADD+=		/usr/lib/libgnumalloc.a
 NOMAN=		noman
 
 .include <bsd.prog.mk>

gnu/usr.bin/gas/Makefile

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	6.1 (Berkeley) 3/3/91
-#	$Id: Makefile,v 1.5 1993/10/04 22:17:29 pk Exp $
+#	$Id: Makefile,v 1.6 1993/10/07 07:24:07 cgd Exp $
 
 .if !defined (HOST)
 HOST=$(MACHINE)
@@ -21,6 +21,9 @@ SRCS=		app.c as.c atof-generic.c bignum-copy.c \
 		obj-$(OBJFORMAT).c
 CFLAGS+=	-I$(.CURDIR) ${ADDINCLUDE} -I$(.CURDIR)/config \
 		-DPIC -DOLD_GAS -DSIGTY=void -Derror=as_fatal
+LDADD+=		-lgnumalloc
+DPADD+=		/usr/lib/libgnumalloc.a
+
 .PATH: $(.CURDIR)/config
 
 beforedepend: config.status

gnu/usr.bin/gawk/Makefile

@@ -1,12 +1,12 @@
-#	$Id: Makefile,v 1.2 1993/08/02 17:29:17 mycroft Exp $
+#	$Id: Makefile,v 1.3 1993/10/07 07:24:13 cgd Exp $
 
 PROG=		awk
 SRCS=		main.c eval.c builtin.c msg.c iop.c io.c field.c array.c \
 		node.c version.c re.c awk.c regex.c dfa.c \
 		getopt.c getopt1.c
 CFLAGS+=	-DGAWK
-LDADD=		-lm
-DPADD=		${LIBM}
+LDADD=		-lm -lgnumalloc
+DPADD=		${LIBM} /usr/lib/libgnumalloc.a
 CLEANFILES+=	awk.c y.tab.h
 
 MAN1=		awk.0

gnu/usr.bin/gcc2/Makefile.cc1

@@ -1,4 +1,4 @@
-#	$Id: Makefile.cc1,v 1.2 1993/09/23 23:13:04 cgd Exp $
+#	$Id: Makefile.cc1,v 1.3 1993/10/07 07:24:17 cgd Exp $
 
 NOMAN=
 
@@ -15,5 +15,6 @@ LDADD+=	${.CURDIR}/../common/libcc1.a
 .endif
 
 LDADD+=	-lgnumalloc
+DPADD+= /usr/lib/libgnumalloc.a
 
 .include <bsd.prog.mk>

gnu/usr.bin/gcc2/cc/Makefile

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile    6.2 (Berkeley) 3/25/91
-#	$Id: Makefile,v 1.7 1993/09/23 23:13:07 cgd Exp $
+#	$Id: Makefile,v 1.8 1993/10/07 07:24:24 cgd Exp $
 
 PROG=           cc
 SRCS=           gcc.c version.c obstack.c
@@ -8,6 +8,7 @@ BINDIR=		/usr/bin
 CFLAGS+=        -I$(.CURDIR) -I$(.CURDIR)/../common \
                  -I$(.CURDIR)/../arch -I$(.CURDIR)/../arch/$(MACHINE)
 LDADD+=		-lgnumalloc
+DPADD+=		/usr/lib/libgnumalloc.a
 
 LINKS+=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1  g++.1 c++.1

gnu/usr.bin/gcc2/cpp/Makefile

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	6.4 (Berkeley) 2/21/91
-#	$Id: Makefile,v 1.7 1993/09/23 23:13:14 cgd Exp $
+#	$Id: Makefile,v 1.8 1993/10/07 07:24:33 cgd Exp $
 
 PROG=		cpp
 BINDIR=		/usr/libexec
@@ -10,6 +10,7 @@ CFLAGS+=	-I. -I$(.CURDIR) -I$(.CURDIR)/../common \
 		-DGCC_INCLUDE_DIR=\"\" \
 		-DGPLUSPLUS_INCLUDE_DIR=\"/usr/include/g++\"
 LDADD+=		-lgnumalloc
+DPADD+=		/usr/lib/libgnumalloc.a
 YFLAGS=
 
 MLINKS=	cpp.1 gcpp.1

gnu/usr.bin/gdb/Makefile

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	6.4 (Berkley) 5/6/91
-#	$Id: Makefile,v 1.3 1993/08/01 05:42:13 mycroft Exp $
+#	$Id: Makefile,v 1.4 1993/10/07 07:24:47 cgd Exp $
 
 PROG=		gdb
 GDBSRCS=	blockframe.c breakpoint.c command.c copying.c core.c \
@@ -13,8 +13,8 @@ READLINESRCS=	funmap.c history.c keymaps.c readline.c
 SRCS=		param.h $(CONFIGSRCS) $(GDBSRCS) $(READLINESRCS) init.c
 CFLAGS+=	-I. -I$(.CURDIR) -I$(.CURDIR)/config -I$(.CURDIR)/readline \
 		-DHAVE_VPRINTF -DVI_MODE -DKERNELDEBUG -DNEWVM
-LDADD+=		-ltermcap
-DPADD+=		/usr/lib/libtermcap.a
+LDADD+=		-ltermcap -gnumalloc
+DPADD+=		${LIBTERMCAP} /usr/lib/libgnumalloc.a
 YFLAGS=
 .PATH: $(.CURDIR)/config $(.CURDIR)/readline
 

gnu/usr.bin/grep/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1993/08/10 00:03:15 mycroft Exp $
+#	$Id: Makefile,v 1.5 1993/10/07 07:25:03 cgd Exp $
 
 PROG=	grep
 SRCS=	dfa.c grep.c getopt.c kwset.c obstack.c regex.c search.c
@@ -6,6 +6,9 @@ CFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \
 	-DHAVE_GETPAGESIZE=1 -DHAVE_MEMCHR=1 -DHAVE_STRERROR=1 \
 	-DHAVE_VALLOC=1
 
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
 	${BINDIR}/grep ${BINDIR}/fgrep
 MLINKS= grep.1 egrep.1 grep.1 fgrep.1

gnu/usr.bin/gzip/Makefile

@@ -1,11 +1,15 @@
 #	from: @(#)Makefile    5.3 (Berkeley) 5/12/90
-#	$Id: Makefile,v 1.4 1993/08/10 00:02:45 mycroft Exp $
+#	$Id: Makefile,v 1.5 1993/10/07 07:25:30 cgd Exp $
 
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
 	crypt.c lzw.c unlzw.c unlzh.c unpack.c getopt.c match.S
 MAN1=	gzexe.0 gzip.0 zdiff.0 zforce.0 zmore.0 znew.0
 CFLAGS+=-DASMV -DHAVE_UNISTD_H=1 -DDIRENT=1
+
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 MLINKS= gzip.1 gunzip.1  gzip.1 zcat.1  gzip.1 gzcat.1
 LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip
 LINKS+= ${BINDIR}/gzip ${BINDIR}/gzcat

gnu/usr.bin/ld/Makefile

@@ -1,8 +1,10 @@
 #	from: @(#)Makefile	6.2 (Berkeley) 4/30/91
-#	$Id: Makefile,v 1.3 1993/08/01 05:42:03 mycroft Exp $
+#	$Id: Makefile,v 1.4 1993/10/07 07:25:38 cgd Exp $
 
 PROG=	ld
 SRCS=	ld.c cplus-dem.c
 NOMAN=	noman
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
 
 .include <bsd.prog.mk>

gnu/usr.bin/lex/Makefile

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.4 (Berkeley) 6/24/90
-#	$Id: Makefile,v 1.3 1993/08/01 05:41:56 mycroft Exp $
+#	$Id: Makefile,v 1.4 1993/10/07 07:25:46 cgd Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -18,6 +18,9 @@ LFLAGS=	-is8
 SRCS=	ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.c sym.c tblcmp.c \
 	yylex.c
 OBJS+=	scan.o
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 SUBDIR=	lib
 CLEANFILES+=parse.c parse.h scan.c y.tab.h
 MAN1 = lex.0 flexdoc.0

gnu/usr.bin/pr/Makefile

@@ -1,6 +1,9 @@
-#	$Id: Makefile,v 1.2 1993/08/02 17:46:44 mycroft Exp $
+#	$Id: Makefile,v 1.3 1993/10/07 07:25:56 cgd Exp $
 
 PROG=	pr
 SRCS=	pr.c getopt.c
 
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 .include <bsd.prog.mk>

gnu/usr.bin/sdiff/Makefile

@@ -1,9 +1,11 @@
-#	$Id: Makefile,v 1.3 1993/09/16 17:40:07 jtc Exp $
+#	$Id: Makefile,v 1.4 1993/10/07 07:26:15 cgd Exp $
 
 PROG=		sdiff
 SRCS=		sdiff.c getopt.c getopt1.c version.c
 CFLAGS+=	-I$(.CURDIR)/../diff \
 		-DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\"
+LDADD+=		-lgnumalloc
+DPADD+=		/usr/lib/libgnumalloc.a
 NOMAN=		noman
 
 .include <bsd.prog.mk>

gnu/usr.bin/sort/Makefile

@@ -1,5 +1,7 @@
-#	$Id: Makefile,v 1.2 1993/08/02 17:48:18 mycroft Exp $
+#	$Id: Makefile,v 1.3 1993/10/07 07:26:26 cgd Exp $
 
 PROG=	sort
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
 
 .include <bsd.prog.mk>

gnu/usr.bin/tar/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1993/09/20 23:40:28 cgd Exp $
+#	$Id: Makefile,v 1.8 1993/10/07 07:26:39 cgd Exp $
 
 PROG=	tar
 SRCS=	buffer.c create.c diffarch.c extract.c fnmatch.c getdate.y \
@@ -10,6 +10,10 @@ CFLAGS+= -DHAVE_LIMITS_H=1 -DHAVE_STRSTR=1 -DHAVE_VALLOC=1 -DHAVE_MKDIR=1
 CFLAGS+= -DHAVE_MKNOD=1 -DHAVE_RENAME=1 -DHAVE_FTRUNCATE=1 -DHAVE_GETCWD=1
 CFLAGS+= -DHAVE_VPRINTF=1 -DNEEDPAD -I${.CURDIR}
 CFLAGS+= -DDEF_AR_FILE=\"/dev/rst0\" -DDEFBLOCKING=20
+
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 NOMAN=noman
 CLEANFILES+=y.tab.h
 

usr.bin/lex/Makefile

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.4 (Berkeley) 6/24/90
-#	$Id: Makefile,v 1.3 1993/08/01 05:41:56 mycroft Exp $
+#	$Id: Makefile,v 1.4 1993/10/07 07:25:46 cgd Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -18,6 +18,9 @@ LFLAGS=	-is8
 SRCS=	ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.c sym.c tblcmp.c \
 	yylex.c
 OBJS+=	scan.o
+LDADD+=	-lgnumalloc
+DPADD+=	/usr/lib/libgnumalloc.a
+
 SUBDIR=	lib
 CLEANFILES+=parse.c parse.h scan.c y.tab.h
 MAN1 = lex.0 flexdoc.0