===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.43
retrieving revision 1.322
diff -u -p -r1.43 -r1.322
--- mandoc/Makefile	2008/12/10 12:09:47	1.43
+++ mandoc/Makefile	2011/03/23 12:32:39	1.322
@@ -1,141 +1,306 @@
-VERSION	= 1.0.2
+.PHONY: 	 clean install installwww
+.SUFFIXES:	 .sgml .html .md5 .h .h.html
+.SUFFIXES:	 .1       .3       .7
+.SUFFIXES:	 .1.txt   .3.txt   .7.txt
+.SUFFIXES:	 .1.pdf   .3.pdf   .7.pdf
+.SUFFIXES:	 .1.ps    .3.ps    .7.ps
+.SUFFIXES:	 .1.html  .3.html  .7.html 
+.SUFFIXES:	 .1.xhtml .3.xhtml .7.xhtml 
 
-# FIXME
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
+# 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 4.5\""
 
-LNS	= mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
-	  compat.ln tokens.ln literals.ln tags.ln
+VERSION		 = 1.10.10
+VDATE		 = 20 March 2011
+CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+PREFIX		 = /usr/local
+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_MAN	 = $(INSTALL_DATA)
 
-LLNS	= llib-lmdocml.ln
+all: mandoc
 
-LIBS	= libmdocml.a
+SRCS		 = Makefile \
+		   arch.c \
+		   arch.in \
+		   att.c \
+		   att.in \
+		   chars.c \
+		   chars.in \
+		   compat.c \
+		   config.h.post \
+		   config.h.pre \
+		   eqn.7 \
+		   eqn.c \
+		   example.style.css \
+		   external.png \
+		   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_argv.c \
+		   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 \
+		   mdoc.7 \
+		   mdoc.c \
+		   mdoc_argv.c \
+		   mdoc_hash.c \
+		   mdoc_html.c \
+		   mdoc_macro.c \
+		   mdoc_term.c \
+		   mdoc_validate.c \
+		   msec.c \
+		   msec.in \
+		   out.c \
+		   out.h \
+		   read.c \
+		   roff.7 \
+		   roff.c \
+		   st.c \
+		   st.in \
+		   style.css \
+		   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 \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   tree.c \
+		   vol.c \
+		   vol.in
 
-OBJS	= mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o \
-	  compat.o tokens.o literals.o tags.o
+LIBMAN_OBJS	 = man.o \
+		   man_argv.o \
+		   man_hash.o \
+		   man_macro.o \
+		   man_validate.o
+LIBMDOC_OBJS	 = arch.o \
+		   att.o \
+		   lib.o \
+		   mdoc.o \
+		   mdoc_argv.o \
+		   mdoc_hash.o \
+		   mdoc_macro.o \
+		   mdoc_validate.o \
+		   msec.o \
+		   st.o \
+		   vol.o
+LIBROFF_OBJS	 = eqn.o \
+		   roff.o \
+		   tbl.o \
+		   tbl_data.o \
+		   tbl_layout.o \
+		   tbl_opts.o
+LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
+		   $(LIBMDOC_OBJS) \
+		   $(LIBROFF_OBJS) \
+		   mandoc.o \
+		   read.o
 
-SRCS	= mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c \
-	  compat.c tokens.c literals.c tags.c
+arch.o: arch.in
+att.o: att.in
+lib.o: lib.in
+msec.o: msec.in
+st.o: st.in
+vol.o: vol.in
 
-HEADS	= libmdocml.h private.h ml.h roff.h html.h
+$(LIBMAN_OBJS): libman.h
+$(LIBMDOC_OBJS): libmdoc.h
+$(LIBROFF_OBJS): libroff.h
+$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
 
-MANS	= mdocml.1 index.7
+MANDOC_HTML_OBJS = html.o \
+		   man_html.o \
+		   mdoc_html.o \
+		   tbl_html.o
+MANDOC_TERM_OBJS = man_term.o \
+		   mdoc_term.o \
+		   term.o \
+		   term_ascii.o \
+		   term_ps.o \
+		   tbl_term.o
+MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   chars.o \
+		   main.o \
+		   out.o \
+		   tree.o
 
-HTML	= index.html mdocml.html 
+chars.o: chars.in
 
-XML	= index.xml
+$(MANDOC_HTML_OBJS): html.h
+$(MANDOC_TERM_OBJS): term.h
+$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
 
-TEXT	= index.txt
+compat.o: config.h
 
-CLEAN	= mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) \
-	  $(XML) $(TEXT)
+INDEX_MANS	 = mandoc.1.html \
+		   mandoc.1.xhtml \
+		   mandoc.1.ps \
+		   mandoc.1.pdf \
+		   mandoc.1.txt \
+		   mandoc.3.html \
+		   mandoc.3.xhtml \
+		   mandoc.3.ps \
+		   mandoc.3.pdf \
+		   mandoc.3.txt \
+		   eqn.7.html \
+		   eqn.7.xhtml \
+		   eqn.7.ps \
+		   eqn.7.pdf \
+		   eqn.7.txt \
+		   man.7.html \
+		   man.7.xhtml \
+		   man.7.ps \
+		   man.7.pdf \
+		   man.7.txt \
+		   mandoc_char.7.html \
+		   mandoc_char.7.xhtml \
+		   mandoc_char.7.ps \
+		   mandoc_char.7.pdf \
+		   mandoc_char.7.txt \
+		   mdoc.7.html \
+		   mdoc.7.xhtml \
+		   mdoc.7.ps \
+		   mdoc.7.pdf \
+		   mdoc.7.txt \
+		   roff.7.html \
+		   roff.7.xhtml \
+		   roff.7.ps \
+		   roff.7.pdf \
+		   roff.7.txt \
+		   tbl.7.html \
+		   tbl.7.xhtml \
+		   tbl.7.ps \
+		   tbl.7.pdf \
+		   tbl.7.txt
 
-INSTALL	= Makefile $(HEADS) $(SRCS) $(MANS)
+$(INDEX_MANS): mandoc
 
-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 test.50 test.61 test.64 test.65 \
-	  test.66 test.69 test.70
+INDEX_OBJS	 = $(INDEX_MANS) \
+		   man.h.html \
+		   mandoc.h.html \
+		   mdoc.h.html \
+		   mdocml.tar.gz \
+		   mdocml.md5
 
-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.38 test.39 test.41 test.42 test.43 test.44 \
-	  test.45 test.46 test.47 test.48 test.49 test.51 test.52 \
-	  test.54 test.55 test.56 test.57 test.58 test.59 test.60 \
-	  test.62 test.63 test.67 test.68 test.71
+www: index.html
 
-all: mdocml
-
-lint: llib-lmdocml.ln
-
-dist: mdocml.tgz
-
-www: all $(HTML) $(XML) $(TEXT)
-
-regress: mdocml
-	@for f in $(FAIL); do \
-		echo "./mdocml $$f" ; \
-		./mdocml -v $$f 1>/dev/null 2>/dev/null || continue ; \
-	done
-	@for f in $(SUCCEED); do \
-		echo "./mdocml $$f" ; \
-		./mdocml -v $$f 1>/dev/null || exit 1 ; \
-	done
-
-mdocml: mdocml.o libmdocml.a
-	$(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
-
 clean:
-	rm -f $(CLEAN)
+	rm -f libmandoc.a $(LIBMANDOC_OBJS)
+	rm -f mandoc $(MANDOC_OBJS)
+	rm -f config.h compat.o config.log
+	rm -f mdocml.tar.gz
+	rm -f index.html $(INDEX_OBJS)
 
-index.html: index.7 mdocml.css
-	./mdocml -Wall -fhtml -e -o $@ index.7
+install: all
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)/
+	$(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) mandoc.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)
 
-index.xml: index.7 mdocml.css
-	./mdocml -Wall -o $@ index.7
+installwww: www
+	mkdir -p $(PREFIX)/snapshots
+	$(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
 
-index.txt: index.7
-	cp -f index.7 index.txt
+libmandoc.a: compat.o $(LIBMANDOC_OBJS)
+	$(AR) rs $@ compat.o $(LIBMANDOC_OBJS)
 
-mdocml.html: mdocml.1 mdocml.css
-	./mdocml -Wall -fhtml -e -o $@ mdocml.1
+mandoc: $(MANDOC_OBJS) libmandoc.a
+	$(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-install-www: www dist
-	install -m 0644 mdocml.tgz $(PREFIX)/mdocml-$(VERSION).tgz
-	install -m 0644 mdocml.tgz $(PREFIX)/mdocml.tgz
-	install -m 0644 $(HTML) $(XML) $(PREFIX)/
+mdocml.md5: mdocml.tar.gz
+	md5 mdocml.tar.gz >$@
 
-mdocml.tgz: $(INSTALL)
-	mkdir -p .dist/mdocml/mdocml-$(VERSION)/
-	install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
-	( cd .dist/mdocml/ && tar zcf ../../mdocml.tgz mdocml-$(VERSION)/ )
+mdocml.tar.gz: $(SRCS)
+	mkdir -p .dist/mdocml-$(VERSION)/
+	$(INSTALL) -m 0444 $(SRCS) .dist/mdocml-$(VERSION)
+	( cd .dist/ && tar zcf ../$@ ./ )
 	rm -rf .dist/
 
-llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln
-	$(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln
+index.html: $(INDEX_OBJS)
 
-mdocml.ln: mdocml.c libmdocml.h
+config.h: config.h.pre config.h.post
+	rm -f config.log
+	( cat config.h.pre; \
+	  echo; \
+	  if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCAT'; \
+		rm test-strlcat; \
+	  fi; \
+	  if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
+		echo '#define HAVE_STRLCPY'; \
+		rm test-strlcpy; \
+	  fi; \
+	  echo; \
+	  cat config.h.post \
+	) > $@
 
-mdocml.o: mdocml.c libmdocml.h
+.h.h.html:
+	highlight -I $< >$@
 
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o
-	$(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o
+.1.1.txt .3.3.txt .7.7.txt:
+	./mandoc -Tascii -Wall,stop $< | col -b >$@
 
-xml.ln: xml.c private.h libmdocml.h ml.h
+.1.1.html .3.3.html .7.7.html:
+	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
 
-xml.o: xml.c private.h libmdocml.h ml.h
+.1.1.ps .3.3.ps .7.7.ps:
+	./mandoc -Tps -Wall,stop $< >$@
 
-html.ln: html.c private.h libmdocml.h
+.1.1.xhtml .3.3.xhtml .7.7.xhtml:
+	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
 
-html.o: html.c private.h libmdocml.h
+.1.1.pdf .3.3.pdf .7.7.pdf:
+	./mandoc -Tpdf -Wall,stop $< >$@
 
-tags.ln: tags.c html.h 
-
-tags.o: tags.c html.h
-
-roff.ln: roff.c private.h roff.h libmdocml.h
-
-roff.o: roff.c private.h roff.h libmdocml.h
-
-libmdocml.ln: libmdocml.c private.h libmdocml.h
-
-libmdocml.o: libmdocml.c private.h libmdocml.h
-
-ml.ln: ml.c private.h libmdocml.h ml.h
-
-ml.o: ml.c private.h libmdocml.h ml.h
-
-mlg.ln: mlg.c private.h libmdocml.h ml.h
-
-mlg.o: mlg.c private.h libmdocml.h ml.h
-
-compat.ln: compat.c
-
-compat.o: compat.c
-
-html.h: ml.h
-
-ml.h: private.h
-
-private.h: libmdocml.h
-
+.sgml.html:
+	validate --warn $<
+	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@