===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.156
retrieving revision 1.164
diff -u -p -r1.156 -r1.164
--- mandoc/Makefile	2009/03/25 15:36:05	1.156
+++ mandoc/Makefile	2009/03/27 15:00:15	1.164
@@ -9,8 +9,8 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.7.3
-VDATE	   = 24 March 2009
+VERSION	   = 1.7.7
+VDATE	   = 27 March 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
@@ -18,14 +18,14 @@ LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
 
 MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln strings.ln xstd.ln \
-	     argv.ln mdoc_validate.ln mdoc_action.ln lib.ln att.ln \
-	     arch.ln vol.ln msec.ln st.ln
-MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o argv.o \
-	     mdoc_validate.o mdoc_action.o lib.o att.o arch.o vol.o \
-	     msec.o st.o
-MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c argv.c \
-	     mdoc_validate.c mdoc_action.c lib.c att.c arch.c vol.c \
-	     msec.c st.c
+	     mdoc_argv.ln mdoc_validate.ln mdoc_action.ln lib.ln \
+	     att.ln arch.ln vol.ln msec.ln st.ln
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o \
+	     mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+	     arch.o vol.o msec.o st.o
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c \
+	     mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+	     arch.c vol.c msec.c st.c
 
 MANLNS	   = man_macro.ln man.ln man_hash.ln man_validate.ln \
 	     man_action.ln
@@ -34,14 +34,17 @@ MANOBJS	   = man_macro.o man.o man_hash.o man_validate
 MANSRCS	   = man_macro.c man.c man_hash.c man_validate.c \
 	     man_action.c
 
-MAINLNS	   = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln
-MAINOBJS   = main.o term.o ascii.o terminal.o tree.o compat.o
-MAINSRCS   = main.c term.c ascii.c terminal.c tree.c compat.c
+MAINLNS	   = main.ln mdoc_term.ln ascii.ln terminal.ln tree.ln \
+	     compat.ln man_term.ln
+MAINOBJS   = main.o mdoc_term.o ascii.o terminal.o tree.o compat.o \
+	     man_term.o
+MAINSRCS   = main.c mdoc_term.c ascii.c terminal.c tree.c compat.c \
+	     man_term.c
 
 LLNS	   = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
-LNS	   = $(MAINLNS) $(MDOCLNS)
+LNS	   = $(MAINLNS) $(MDOCLNS) $(MANLNS)
 LIBS	   = libmdoc.a libman.a
-OBJS	   = $(MDOCOBJS) $(MAINOBJS)
+OBJS	   = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
 SRCS	   = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
 DATAS	   = arch.in att.in lib.in msec.in st.in vol.in ascii.in
 HEADS	   = mdoc.h libmdoc.h man.h libman.h term.h 
@@ -129,8 +132,8 @@ st.o: st.c st.in libmdoc.h
 mdoc_macro.ln: mdoc_macro.c libmdoc.h
 mdoc_macro.o: mdoc_macro.c libmdoc.h
 
-term.ln: term.c term.h 
-term.o: term.c term.h
+mdoc_term.ln: mdoc_term.c term.h mdoc.h
+mdoc_term.o: mdoc_term.c term.h mdoc.h
 
 strings.ln: strings.c libmdoc.h
 strings.o: strings.c libmdoc.h
@@ -150,14 +153,14 @@ man.o: man.c libman.h
 main.ln: main.c mdoc.h
 main.o: main.c mdoc.h
 
-terminal.ln: terminal.c term.h
-terminal.o: terminal.c term.h
+terminal.ln: terminal.c term.h man.h mdoc.h
+terminal.o: terminal.c term.h man.h mdoc.h
 
 xstd.ln: xstd.c libmdoc.h
 xstd.o: xstd.c libmdoc.h
 
-argv.ln: argv.c libmdoc.h
-argv.o: argv.c libmdoc.h
+mdoc_argv.ln: mdoc_argv.c libmdoc.h
+mdoc_argv.o: mdoc_argv.c libmdoc.h
 
 man_validate.ln: man_validate.c libman.h
 man_validate.o: man_validate.c libman.h
@@ -170,8 +173,6 @@ mdoc_action.o: mdoc_action.c libmdoc.h
 
 libmdoc.h: mdoc.h
 
-term.h: mdoc.h
-
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
 	mkdir -p .dist/mdocml/
 	sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
@@ -195,7 +196,7 @@ mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.
 	rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
 	sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
 	install -m 0644 DESCR .dist/mdocml/pkg/DESCR
-	echo @comment $$OpenBSD: Makefile,v 1.156 2009/03/25 15:36:05 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
+	echo @comment $$OpenBSD: Makefile,v 1.164 2009/03/27 15:00:15 kristaps Exp $$ > .dist/mdocml/pkg/PLIST
 	echo bin/mandoc >> .dist/mdocml/pkg/PLIST
 	echo @man man/man1/mandoc.1 >> .dist/mdocml/pkg/PLIST
 	echo @man man/man7/mdoc.7 >> .dist/mdocml/pkg/PLIST