Update to Global-3.42.

6 files changed, 28 insertions, 30 deletions

diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index b679843..73b1c59 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,4 +1,18 @@
-# $Id: Makefile.inc,v 1.3 1997/12/15 23:34:51 cwt Exp $
+# $Id: Makefile.inc,v 1.4 1997/12/17 15:18:48 cwt Exp $
 
-BINDIR?= 	/usr/bin
-CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
+.if !defined(GLOBAL_MAKEFILE_INC_BEEN_HERE)
+
+GLOBAL_MAKEFILE_INC_BEEN_HERE=yes
+BINDIR?=	/usr/bin
+.if exists(${.OBJDIR}/../lib)
+LIBDESTDIR=	${.OBJDIR}/../lib
+.else
+LIBDESTDIR=	${.CURDIR}/../lib
+.endif
+LDDESTDIR=	-L${LIBDESTDIR}
+LDADD=		-lgloutil
+DPADD=		${LIBDESTDIR}/libgloutil.a
+CFLAGS+=	-I${GLOBAL_DIR}/lib -O \
+		-Wall -Wwrite-strings -Wmissing-prototypes
+
+.endif
diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile
index ecd9fc3..12f4357 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,12 +1,8 @@
-# $Id: Makefile,v 1.3 1997/12/15 23:34:51 cwt Exp $
+# $Id: Makefile,v 1.4 1997/12/17 15:18:49 cwt Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/btreeop
 
-CFLAGS+=	-I${GLOBAL_DIR}/lib
-DPADD=		${.OBJDIR}/../lib/libglobalutil.a
-LDADD=		${.OBJDIR}/../lib/libglobalutil.a
-
 PROG=	btreeop
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile
index b4839f9..b66694a 100644
--- a/usr.bin/global/gctags/Makefile
+++ b/usr.bin/global/gctags/Makefile
@@ -1,17 +1,13 @@
 
-# $Id: Makefile,v 1.3 1997/12/15 23:34:52 cwt Exp $
+# $Id: Makefile,v 1.4 1997/12/17 15:18:52 cwt Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gctags
 
-CFLAGS+=	-I${GLOBAL_DIR}/lib
-CFLAGS+=	-I${GLOBAL_DIR}/gctags -DGLOBAL -DYACC
-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
+CFLAGS+=	-I${GLOBAL_DIR}/gctags
 
 PROG=	gctags
+SRCS=	C.c assembler.c gctags.c java.c
 
 .include <bsd.prog.mk>
 
diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile
index 94f7bc8..0deeda4 100644
--- a/usr.bin/global/global/Makefile
+++ b/usr.bin/global/global/Makefile
@@ -1,12 +1,8 @@
-# $Id: Makefile,v 1.3 1997/12/15 23:34:53 cwt Exp $
+# $Id: Makefile,v 1.4 1997/12/17 15:18:53 cwt Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/global
 
-CFLAGS+=	-I${GLOBAL_DIR}/lib
-DPADD=		${.OBJDIR}/../lib/libglobalutil.a
-LDADD=		${.OBJDIR}/../lib/libglobalutil.a
-
 PROG=	global
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile
index b21d1d2..05f506f 100644
--- a/usr.bin/global/gtags/Makefile
+++ b/usr.bin/global/gtags/Makefile
@@ -1,12 +1,8 @@
-# $Id: Makefile,v 1.4 1997/12/15 23:34:54 cwt Exp $
+# $Id: Makefile,v 1.5 1997/12/17 15:18:54 cwt Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gtags
 
-CFLAGS+=	-I${GLOBAL_DIR}/lib
-DPADD=		${.OBJDIR}/../lib/libglobalutil.a
-LDADD=		${.OBJDIR}/../lib/libglobalutil.a
-
 PROG=	gtags
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/global/lib/Makefile b/usr.bin/global/lib/Makefile
index 3d1e354..793f953 100644
--- a/usr.bin/global/lib/Makefile
+++ b/usr.bin/global/lib/Makefile
@@ -1,12 +1,12 @@
-# $Id: Makefile,v 1.1 1997/12/15 23:40:54 cwt Exp $
+# $Id: Makefile,v 1.2 1997/12/21 08:31:50 cwt Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/lib
 
-LIB=		globalutil
-SRCS=	dbio.c dbname.c find.c getdbpath.c gtagsopen.c locatestring.c \
-	lookup.c makepath.c mgets.c strop.c tab.c tag.c test.c
-
+LIB=		gloutil
+SRCS=		gtagsop.c tab.c strbuf.c mgets.c defined.c getdbpath.c \
+		find.c dbop.c test.c makepath.c locatestring.c pathop.c \
+		conf.c strmake.c usable.c token.c
 NOPROFILE=		noprofile
 INTERNALLIB=		true
 INTERNALSTATICLIB=	true