summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcwt <cwt@FreeBSD.org>1997-12-17 15:18:54 +0000
committercwt <cwt@FreeBSD.org>1997-12-17 15:18:54 +0000
commitc097ee04f01e9e86f77dfa261a6f9f96bdb361ba (patch)
tree5ac3e7c0bd5ca60d307e9f58d92536cd271d0d42
parent60c58bdca7883203e82a73da5b86be70ecb7bf3a (diff)
downloadFreeBSD-src-c097ee04f01e9e86f77dfa261a6f9f96bdb361ba.zip
FreeBSD-src-c097ee04f01e9e86f77dfa261a6f9f96bdb361ba.tar.gz
DPADD repairs suggested by Bruce Evans <bde@zeta.org.au>
-rw-r--r--usr.bin/global/Makefile.inc4
-rw-r--r--usr.bin/global/btreeop/Makefile5
-rw-r--r--usr.bin/global/gctags/Makefile5
-rw-r--r--usr.bin/global/global/Makefile5
-rw-r--r--usr.bin/global/gtags/Makefile5
5 files changed, 13 insertions, 11 deletions
diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 679d200..b679843 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 2157544..ecd9fc3 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 66cf1c4..b4839f9 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 2894553..94f7bc8 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 9989d89..b21d1d2 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
OpenPOWER on IntegriCloud