===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.23
retrieving revision 1.395.2.12
diff -u -p -r1.23 -r1.395.2.12
--- mandoc/Makefile	2008/12/04 16:19:52	1.23
+++ mandoc/Makefile	2014/01/04 13:49:22	1.395.2.12
@@ -1,91 +1,410 @@
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
+.PHONY: 	 clean install installwww
+.SUFFIXES:	 .sgml .html .md5 .h .h.html
+.SUFFIXES:	 .1       .3       .7       .8
+.SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
 
-LINTFLAGS += -c -e -f -u
+# Specify this if you want to hard-code the operating system to appear
+# in the lower-left hand corner of -mdoc manuals.
+#
+# CFLAGS	+= -DOSNAME="\"OpenBSD 5.4\""
 
-LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln
+VERSION		 = 1.12.3
+VDATE		 = 31 December 2013
 
-LLNS	= llib-lmdocml.ln
+# IFF your system supports multi-byte functions (setlocale(), wcwidth(),
+# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
+# UCS-4 value) should you define USE_WCHAR.  If you define it and your
+# system DOESN'T support this, -Tlocale will produce garbage.
+# If you don't define it, -Tlocale is a synonym for -Tacsii.
+#
+CFLAGS	 	+= -DUSE_WCHAR
 
-LIBS	= libmdocml.a
+# If your system has manpath(1), uncomment this.  This is most any
+# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1),
+# mandocdb(8), and man.cgi will popen(3) manpath(1) to get the MANPATH
+# variable.
+#CFLAGS		+= -DUSE_MANPATH
 
-OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o compat.o tokens.o
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
+STATIC		 = -static
+# Linux requires -pthread to statically link with libdb.
+#STATIC		+= -pthread
 
-SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c compat.c tokens.c
+CFLAGS		+= -g -DHAVE_CONFIG_H
+CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+PREFIX		 = /usr/local
+WWWPREFIX	 = /var/www
+HTDOCDIR	 = $(WWWPREFIX)/htdocs
+CGIBINDIR	 = $(WWWPREFIX)/cgi-bin
+BINDIR		 = $(PREFIX)/bin
+INCLUDEDIR	 = $(PREFIX)/include/mandoc
+LIBDIR		 = $(PREFIX)/lib/mandoc
+MANDIR		 = $(PREFIX)/man
+EXAMPLEDIR	 = $(PREFIX)/share/examples/mandoc
+INSTALL		 = install
+INSTALL_PROGRAM	 = $(INSTALL) -m 0755
+INSTALL_DATA	 = $(INSTALL) -m 0444
+INSTALL_LIB	 = $(INSTALL) -m 0644
+INSTALL_SOURCE	 = $(INSTALL) -m 0644
+INSTALL_MAN	 = $(INSTALL_DATA)
 
-HEADS	= libmdocml.h private.h
+# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
+# apropos.
+# However, if you don't have -ldb at all (or it's not native), then
+# comment out apropos and mandocdb. 
+#
+#DBLIB		 = -ldb
+DBBIN		 = apropos mandocdb man.cgi catman whatis
+DBLN		 = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln
 
-MANS	= mdocml.1
+all: mandoc preconv demandoc $(DBBIN)
 
-CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS)
+TESTSRCS	 = test-betoh64.c \
+		   test-fgetln.c \
+		   test-getsubopt.c \
+		   test-mmap.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strnlen.c \
+		   test-strptime.c
 
-INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS)
+SRCS		 = Makefile \
+		   NEWS \
+		   TODO \
+		   apropos.1 \
+		   apropos.c \
+		   apropos_db.c \
+		   apropos_db.h \
+		   arch.c \
+		   arch.in \
+		   att.c \
+		   att.in \
+		   catman.8 \
+		   catman.c \
+		   cgi.c \
+		   chars.c \
+		   chars.in \
+		   compat_fgetln.c \
+		   compat_getsubopt.c \
+		   compat_strcasestr.c \
+		   compat_strlcat.c \
+		   compat_strlcpy.c \
+		   compat_strnlen.c \
+		   compat_strsep.c \
+		   config.h.post \
+		   config.h.pre \
+		   demandoc.1 \
+		   demandoc.c \
+		   eqn.7 \
+		   eqn.c \
+		   eqn_html.c \
+		   eqn_term.c \
+		   example.style.css \
+		   external.png \
+		   gmdiff \
+		   html.c \
+		   html.h \
+		   index.css \
+		   index.sgml \
+		   lib.c \
+		   lib.in \
+		   libman.h \
+		   libmandoc.h \
+		   libmdoc.h \
+		   libroff.h \
+		   main.c \
+		   main.h \
+		   man.7 \
+		   man.c \
+		   man.cgi.7 \
+		   man-cgi.css \
+		   man.h \
+		   man_hash.c \
+		   man_html.c \
+		   man_macro.c \
+		   man_term.c \
+		   man_validate.c \
+		   mandoc.1 \
+		   mandoc.3 \
+		   mandoc.c \
+		   mandoc.h \
+		   mandoc_char.7 \
+		   mandocdb.8 \
+		   mandocdb.c \
+		   mandocdb.h \
+		   manpath.c \
+		   manpath.h \
+		   mdoc.7 \
+		   mdoc.c \
+		   mdoc.h \
+		   mdoc_argv.c \
+		   mdoc_hash.c \
+		   mdoc_html.c \
+		   mdoc_macro.c \
+		   mdoc_man.c \
+		   mdoc_term.c \
+		   mdoc_validate.c \
+		   msec.c \
+		   msec.in \
+		   out.c \
+		   out.h \
+		   preconv.1 \
+		   preconv.c \
+		   predefs.in \
+		   read.c \
+		   roff.7 \
+		   roff.c \
+		   st.c \
+		   st.in \
+		   style.css \
+		   tbl.3 \
+		   tbl.7 \
+		   tbl.c \
+		   tbl_data.c \
+		   tbl_html.c \
+		   tbl_layout.c \
+		   tbl_opts.c \
+		   tbl_term.c \
+		   term.c \
+		   term.h \
+		   term_ascii.c \
+		   term_ps.c \
+		   tree.c \
+		   vol.c \
+		   vol.in \
+		   whatis.1 \
+		   $(TESTSRCS)
 
-FAIL	= test.0 test.1 test.2 test.3 test.4 test.5 test.6 \
-	  test.15 test.20 test.22 test.24 test.26 test.27 test.30 \
-	  test.36 test.37 test.40
+LIBMAN_OBJS	 = man.o \
+		   man_hash.o \
+		   man_macro.o \
+		   man_validate.o
 
-SUCCEED	= test.7 test.8 test.9 test.10 test.11 test.12 test.13 \
-	  test.14 test.16 test.17 test.18 test.19 test.21 test.23 \
-	  test.25 test.28 test.29 test.31 test.32 test.33 test.34 \
-	  test.35 test.37 test.38 test.39
+LIBMDOC_OBJS	 = arch.o \
+		   att.o \
+		   lib.o \
+		   mdoc.o \
+		   mdoc_argv.o \
+		   mdoc_hash.o \
+		   mdoc_macro.o \
+		   mdoc_validate.o \
+		   st.o \
+		   vol.o
 
+LIBROFF_OBJS	 = eqn.o \
+		   roff.o \
+		   tbl.o \
+		   tbl_data.o \
+		   tbl_layout.o \
+		   tbl_opts.o
 
-all: mdocml
+LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
+		   $(LIBMDOC_OBJS) \
+		   $(LIBROFF_OBJS) \
+		   chars.o \
+		   mandoc.o \
+		   msec.o \
+		   read.o
 
-lint: llib-lmdocml.ln
+COMPAT_OBJS	 = compat_fgetln.o \
+		   compat_getsubopt.o \
+		   compat_strcasestr.o \
+		   compat_strlcat.o \
+		   compat_strlcpy.o \
+		   compat_strnlen.o \
+		   compat_strsep.o
 
-dist: mdocml.tgz
+arch.o: arch.in
+att.o: att.in
+chars.o: chars.in
+lib.o: lib.in
+msec.o: msec.in
+roff.o: predefs.in
+st.o: st.in
+vol.o: vol.in
 
-regress: mdocml
-	@for f in $(FAIL); do ./mdocml $$f 1>/dev/null 2>/dev/null || continue ; done
-	@for f in $(SUCCEED); do ./mdocml $$f 1>/dev/null || exit 1 ; done
+$(LIBMAN_OBJS): libman.h
+$(LIBMDOC_OBJS): libmdoc.h
+$(LIBROFF_OBJS): libroff.h
+$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(COMPAT_OBJS): config.h
 
-mdocml: mdocml.o libmdocml.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
+MANDOC_HTML_OBJS = eqn_html.o \
+		   html.o \
+		   man_html.o \
+		   mdoc_html.o \
+		   tbl_html.o
+$(MANDOC_HTML_OBJS): html.h
 
+MANDOC_MAN_OBJS  = mdoc_man.o
+
+MANDOC_TERM_OBJS = eqn_term.o \
+		   man_term.o \
+		   mdoc_term.o \
+		   term.o \
+		   term_ascii.o \
+		   term_ps.o \
+		   tbl_term.o
+$(MANDOC_TERM_OBJS): term.h
+
+MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   main.o \
+		   out.o \
+		   tree.o
+$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
+
+MANDOCDB_OBJS	 = mandocdb.o manpath.o
+$(MANDOCDB_OBJS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h
+
+PRECONV_OBJS	 = preconv.o
+$(PRECONV_OBJS): config.h
+
+APROPOS_OBJS	 = apropos.o apropos_db.o manpath.o
+$(APROPOS_OBJS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
+
+CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   cgi.o \
+		   apropos_db.o \
+		   manpath.o \
+		   out.o \
+		   tree.o
+$(CGI_OBJS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h manpath.h mandocdb.h
+
+CATMAN_OBJS	 = catman.o manpath.o
+$(CATMAN_OBJS): config.h mandoc.h manpath.h mandocdb.h
+
+DEMANDOC_OBJS	 = demandoc.o
+$(DEMANDOC_OBJS): config.h
+
+INDEX_MANS	 = apropos.1.html \
+		   catman.8.html \
+		   demandoc.1.html \
+		   mandoc.1.html \
+		   whatis.1.html \
+		   mandoc.3.html \
+		   tbl.3.html \
+		   eqn.7.html \
+		   man.7.html \
+		   man.cgi.7.html \
+		   mandoc_char.7.html \
+		   mdoc.7.html \
+		   preconv.1.html \
+		   roff.7.html \
+		   tbl.7.html \
+		   mandocdb.8.html
+
+$(INDEX_MANS): mandoc
+
+INDEX_OBJS	 = $(INDEX_MANS) \
+		   man.h.html \
+		   mandoc.h.html \
+		   mdoc.h.html \
+		   mdocml.tar.gz \
+		   mdocml.md5
+
+www: index.html
+
 clean:
-	rm -f $(CLEAN)
+	rm -f libmandoc.a $(LIBMANDOC_OBJS)
+	rm -f mandocdb $(MANDOCDB_OBJS)
+	rm -f preconv $(PRECONV_OBJS)
+	rm -f apropos whatis $(APROPOS_OBJS)
+	rm -f man.cgi $(CGI_OBJS)
+	rm -f catman $(CATMAN_OBJS)
+	rm -f demandoc $(DEMANDOC_OBJS)
+	rm -f mandoc $(MANDOC_OBJS)
+	rm -f config.h config.log $(COMPAT_OBJS)
+	rm -f mdocml.tar.gz
+	rm -f index.html $(INDEX_OBJS)
+	rm -rf *.dSYM
 
-mdocml.tgz: $(INSTALL)
-	mkdir -p .dist/mdocml/
-	install -m 0644 $(INSTALL) .dist/mdocml/
-	( cd .dist/ && tar zcf ../mdocml.tgz mdocml/ )
-	rm -rf .dist/
+install: all
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+	mkdir -p $(DESTDIR)$(LIBDIR)
+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) mandoc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln
+installcgi: all
+	mkdir -p $(DESTDIR)$(CGIBINDIR)
+	mkdir -p $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+	$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
+	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
-mdocml.ln: mdocml.c libmdocml.h
+installwww: www
+	mkdir -p $(PREFIX)/snapshots
+	mkdir -p $(PREFIX)/binaries
+	$(INSTALL_DATA) index.html external.png index.css $(PREFIX)
+	$(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX)
+	$(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX)
+	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots
+	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots
+	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz
+	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5
 
-mdocml.o: mdocml.c libmdocml.h
+libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o
-	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o
+mandoc: $(MANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-xml.ln: xml.c private.h libmdocml.h ml.h
+mandocdb: $(MANDOCDB_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
 
-xml.o: xml.c private.h libmdocml.h ml.h
+preconv: $(PRECONV_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
-html.ln: html.c private.h libmdocml.h
+whatis: apropos
+	cp -f apropos whatis
 
-html.o: html.c private.h libmdocml.h
+apropos: $(APROPOS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
-roff.ln: roff.c private.h libmdocml.h
+catman: $(CATMAN_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(CATMAN_OBJS) libmandoc.a $(DBLIB)
 
-roff.o: roff.c private.h libmdocml.h
+man.cgi: $(CGI_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
 
-libmdocml.ln: libmdocml.c private.h libmdocml.h
+demandoc: $(DEMANDOC_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
-libmdocml.o: libmdocml.c private.h libmdocml.h
+mdocml.md5: mdocml.tar.gz
+	md5 mdocml.tar.gz >$@
 
-ml.ln: ml.c private.h libmdocml.h ml.h
+mdocml.tar.gz: $(SRCS)
+	mkdir -p .dist/mdocml-$(VERSION)/
+	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
+	( cd .dist/ && tar zcf ../$@ ./ )
+	rm -rf .dist/
 
-ml.o: ml.c private.h libmdocml.h ml.h
+index.html: $(INDEX_OBJS)
 
-mlg.ln: mlg.c private.h libmdocml.h ml.h
+config.h: configure config.h.pre config.h.post $(TESTSRCS)
+	rm -f config.log
+	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
-mlg.o: mlg.c private.h libmdocml.h ml.h
+.h.h.html:
+	highlight -I $< >$@
 
-compat.ln: compat.c
+.1.1.html .3.3.html .7.7.html .8.8.html:
+	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
 
-compat.o: compat.c
+.sgml.html:
+	validate --warn $<
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@