Add lib/Makefile and adjust as necessary to build global 2.2.1 from contrib sources.

8 files changed, 26 insertions, 23 deletions

diff --git a/usr.bin/global/Makefile b/usr.bin/global/Makefile
index 132ac86..8676dc3 100644
--- a/usr.bin/global/Makefile
+++ b/usr.bin/global/Makefile
@@ -1,5 +1,5 @@
-# $Id: Makefile,v 1.4 1997/07/29 22:58:43 skynyrd Exp $
+# $Id: Makefile,v 1.3 1997/12/15 02:28:04 skynyrd Exp $
 
-SUBDIR= gctags global gtags btreeop htags systags
+SUBDIR= lib global gtags gctags btreeop htags systags
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 50fbb49..679d200 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,5 +1,6 @@
-# $Id: Makefile.inc,v 1.5 1997/07/30 04:30:31 skynyrd Exp $
+# $Id: Makefile.inc,v 1.3 1997/12/15 02:28:05 skynyrd Exp $
 
 BINDIR?= 	/usr/bin
-COPTS?=		-Wall -Wstrict-prototypes -Wmissing-prototypes
+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 3666c68..2157544 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,8 +1,11 @@
-# $Id: Makefile,v 1.3 1997/07/30 04:52:56 skynyrd Exp $
+# $Id: Makefile,v 1.3 1997/12/15 02:28:08 skynyrd Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/btreeop
 
+CFLAGS+=	-I${GLOBAL_DIR}/lib
+LDADD=		-L${.OBJDIR}/../lib -lglobalutil
+
 PROG=	btreeop
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile
index f6c4015..66cf1c4 100644
--- a/usr.bin/global/gctags/Makefile
+++ b/usr.bin/global/gctags/Makefile
@@ -1,15 +1,16 @@
 
-# $Id: Makefile,v 1.6 1997/07/30 04:30:40 skynyrd Exp $
+# $Id: Makefile,v 1.3 1997/12/15 02:28:10 skynyrd Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gctags
 
-
-PROG=	gctags
+CFLAGS+=	-I${GLOBAL_DIR}/lib
+CFLAGS+=	-I${GLOBAL_DIR}/gctags -DGLOBAL -DYACC
+LDADD=		-L${.OBJDIR}/../lib -lglobalutil
 
 SRCS=	C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c assembler.c
 
-CFLAGS+=	-I${GLOBAL_DIR}/gctags -DGTAGS -DBUGFIX -DMODIFY -DYACC
+PROG=	gctags
 
 .include <bsd.prog.mk>
 
diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile
index 8a544a0..2894553 100644
--- a/usr.bin/global/global/Makefile
+++ b/usr.bin/global/global/Makefile
@@ -1,12 +1,11 @@
-# $Id: Makefile,v 1.3 1997/07/30 04:40:51 skynyrd Exp $
+# $Id: Makefile,v 1.3 1997/12/15 02:28:14 skynyrd Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/global
 
-MAN1=	global.1
+CFLAGS+=	-I${GLOBAL_DIR}/lib
+LDADD=		-L${.OBJDIR}/../lib -lglobalutil
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${GLOBAL_DIR}/global/global.pl ${DESTDIR}/usr/bin/global
+PROG=	global
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile
index 1b45a7c..9989d89 100644
--- a/usr.bin/global/gtags/Makefile
+++ b/usr.bin/global/gtags/Makefile
@@ -1,12 +1,11 @@
-# $Id: Makefile,v 1.5 1997/07/30 04:55:34 skynyrd Exp $
+# $Id: Makefile,v 1.4 1997/12/15 02:28:17 skynyrd Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gtags
 
-MAN1=	gtags.1
+CFLAGS+=	-I${GLOBAL_DIR}/lib
+LDADD=		-L${.OBJDIR}/../lib -lglobalutil
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${GLOBAL_DIR}/gtags/gtags.pl ${DESTDIR}/usr/bin/gtags
+PROG=	gtags
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/global/htags/Makefile b/usr.bin/global/htags/Makefile
index ac41ab0..c842dec 100644
--- a/usr.bin/global/htags/Makefile
+++ b/usr.bin/global/htags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/07/30 04:52:59 skynyrd Exp $
+# $Id: Makefile,v 1.3 1997/12/15 02:28:19 skynyrd Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/htags
@@ -7,6 +7,6 @@ MAN1=	htags.1
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${GLOBAL_DIR}/htags/htags.pl ${DESTDIR}/usr/bin/htags
+	    ${GLOBAL_DIR}/htags/htags.pl ${DESTDIR}${BINDIR}/htags
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/global/systags/Makefile b/usr.bin/global/systags/Makefile
index 0892516..427a743 100644
--- a/usr.bin/global/systags/Makefile
+++ b/usr.bin/global/systags/Makefile
@@ -1,10 +1,10 @@
-# $Id: Makefile,v 1.3 1997/07/30 04:53:01 skynyrd Exp $
+# $Id: Makefile,v 1.3 1997/12/15 02:28:24 skynyrd Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/systags
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${GLOBAL_DIR}/systags/systags.sh ${DESTDIR}/usr/bin/systags
+	    ${GLOBAL_DIR}/systags/systags.sh ${DESTDIR}${BINDIR}/systags
 
 .include <bsd.prog.mk>