From c097ee04f01e9e86f77dfa261a6f9f96bdb361ba Mon Sep 17 00:00:00 2001 From: cwt Date: Wed, 17 Dec 1997 15:18:54 +0000 Subject: [PATCH] DPADD repairs suggested by Bruce Evans --- usr.bin/global/Makefile.inc | 4 +--- usr.bin/global/btreeop/Makefile | 5 +++-- usr.bin/global/gctags/Makefile | 5 +++-- usr.bin/global/global/Makefile | 5 +++-- usr.bin/global/gtags/Makefile | 5 +++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc index 679d2001fe03..b6798433b79d 100644 --- a/usr.bin/global/Makefile.inc +++ b/usr.bin/global/Makefile.inc @@ -1,6 +1,4 @@ -# $Id: Makefile.inc,v 1.3 1997/12/15 02:28:05 skynyrd Exp $ +# $Id: Makefile.inc,v 1.3 1997/12/15 23:34:51 cwt Exp $ BINDIR?= /usr/bin CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes - -LIBGLOBALUTIL= ${.OBJDIR}/../lib/libutil.a diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile index 2157544eea0b..ecd9fc3dede7 100644 --- a/usr.bin/global/btreeop/Makefile +++ b/usr.bin/global/btreeop/Makefile @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.3 1997/12/15 02:28:08 skynyrd Exp $ +# $Id: Makefile,v 1.3 1997/12/15 23:34:51 cwt Exp $ GLOBAL_DIR= ${.CURDIR}/../../../contrib/global .PATH: ${GLOBAL_DIR}/btreeop CFLAGS+= -I${GLOBAL_DIR}/lib -LDADD= -L${.OBJDIR}/../lib -lglobalutil +DPADD= ${.OBJDIR}/../lib/libglobalutil.a +LDADD= ${.OBJDIR}/../lib/libglobalutil.a PROG= btreeop diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile index 66cf1c4ca730..b4839f948c23 100644 --- a/usr.bin/global/gctags/Makefile +++ b/usr.bin/global/gctags/Makefile @@ -1,12 +1,13 @@ -# $Id: Makefile,v 1.3 1997/12/15 02:28:10 skynyrd Exp $ +# $Id: Makefile,v 1.3 1997/12/15 23:34:52 cwt Exp $ GLOBAL_DIR= ${.CURDIR}/../../../contrib/global .PATH: ${GLOBAL_DIR}/gctags CFLAGS+= -I${GLOBAL_DIR}/lib CFLAGS+= -I${GLOBAL_DIR}/gctags -DGLOBAL -DYACC -LDADD= -L${.OBJDIR}/../lib -lglobalutil +DPADD= ${.OBJDIR}/../lib/libglobalutil.a +LDADD= ${.OBJDIR}/../lib/libglobalutil.a SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c assembler.c diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile index 2894553cf6fa..94f7bc89ffaa 100644 --- a/usr.bin/global/global/Makefile +++ b/usr.bin/global/global/Makefile @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.3 1997/12/15 02:28:14 skynyrd Exp $ +# $Id: Makefile,v 1.3 1997/12/15 23:34:53 cwt Exp $ GLOBAL_DIR= ${.CURDIR}/../../../contrib/global .PATH: ${GLOBAL_DIR}/global CFLAGS+= -I${GLOBAL_DIR}/lib -LDADD= -L${.OBJDIR}/../lib -lglobalutil +DPADD= ${.OBJDIR}/../lib/libglobalutil.a +LDADD= ${.OBJDIR}/../lib/libglobalutil.a PROG= global diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile index 9989d8903c14..b21d1d278158 100644 --- a/usr.bin/global/gtags/Makefile +++ b/usr.bin/global/gtags/Makefile @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.4 1997/12/15 02:28:17 skynyrd Exp $ +# $Id: Makefile,v 1.4 1997/12/15 23:34:54 cwt Exp $ GLOBAL_DIR= ${.CURDIR}/../../../contrib/global .PATH: ${GLOBAL_DIR}/gtags CFLAGS+= -I${GLOBAL_DIR}/lib -LDADD= -L${.OBJDIR}/../lib -lglobalutil +DPADD= ${.OBJDIR}/../lib/libglobalutil.a +LDADD= ${.OBJDIR}/../lib/libglobalutil.a PROG= gtags