Fixed STRUCTURE repeat (schwarze@openbsd.org).

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index d41c14318a0e16f1f503b80b5222fee168554b66..cefef5471a621487e8aee7f51f14a4c6635e95cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.SUFFIXES:     .html .sgml
+.SUFFIXES:     .html .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz
 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
@@ -9,23 +9,23 @@ INSTALL_DATA  = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.7.4
-VDATE     = 26 March 2009
+VERSION           = 1.7.20
+VDATE     = 22 June 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
-LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
+LINTFLAGS += $(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
+MDOCLNS           = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+            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 mdoc_strings.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 mdoc_strings.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,9 +34,12 @@ MANOBJS         = man_macro.o man.o man_hash.o man_validate.o \
 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 term.ln tree.ln \
+            compat.ln man_term.ln
+MAINOBJS   = main.o mdoc_term.o ascii.o term.o tree.o compat.o \
+            man_term.o
+MAINSRCS   = main.c mdoc_term.c ascii.c term.c tree.c compat.c \
+            man_term.c
 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
 LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS)
@@ -48,13 +51,21 @@ HEADS          = mdoc.h libmdoc.h man.h libman.h term.h
 SGMLS     = index.sgml 
 HTMLS     = index.html
 STATICS           = style.css external.png
+MD5S      = mdocml-$(VERSION).md5 \
+            mdocml-oport-$(VERSION).md5 \
+            mdocml-fport-$(VERSION).md5 \
+            mdocml-nport-$(VERSION).md5
 TARGZS    = mdocml-$(VERSION).tar.gz \
             mdocml-oport-$(VERSION).tar.gz \
             mdocml-fport-$(VERSION).tar.gz \
             mdocml-nport-$(VERSION).tar.gz
-MANS      = mandoc.1 mdoc.3 mdoc.7 manuals.7
+MANS      = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
+            man.7 man.3
+TEXTS     = mandoc.1.txt mdoc.3.txt mdoc.7.txt manuals.7.txt \
+            mandoc_char.7.txt man.7.txt man.3.txt
 BINS      = mandoc
-CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
+CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+            $(TARGZS) tags $(TEXTS) ChangeLog
 MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
             Makefile
 INSTALL           = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
@@ -72,14 +83,15 @@ cleanlint:
 
 dist:  mdocml-$(VERSION).tar.gz
 
-port:  mdocml-oport-$(VERSION).tar.gz \
-       mdocml-fport-$(VERSION).tar.gz \
-       mdocml-nport-$(VERSION).tar.gz
+html:  $(HTMLS)
 
-www:   $(HTMLS) $(TARGZS)
+md5:   $(MD5)
+
+www:   all $(TARGZS) $(TEXTS) ChangeLog
 
 installwww: www
-       install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
+       install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/
+       install -m 0444 ChangeLog $(PREFIX)/snapshots/
        install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
        install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
        install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
@@ -129,11 +141,11 @@ 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
+mdoc_strings.ln: mdoc_strings.c libmdoc.h
+mdoc_strings.o: mdoc_strings.c libmdoc.h
 
 man_hash.ln: man_hash.c libman.h
 man_hash.o: man_hash.c libman.h
@@ -150,14 +162,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
+compat.ln: compat.c 
+compat.o: compat.c
 
-xstd.ln: xstd.c libmdoc.h
-xstd.o: xstd.c libmdoc.h
+term.ln: term.c term.h man.h mdoc.h
+term.o: term.c term.h man.h mdoc.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,7 +182,8 @@ mdoc_action.o: mdoc_action.c libmdoc.h
 
 libmdoc.h: mdoc.h
 
-term.h: mdoc.h
+ChangeLog:
+       cvs2cl -P -t --no-indent --FSF --no-times
 
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
        mkdir -p .dist/mdocml/
@@ -223,13 +236,13 @@ mdocml-$(VERSION).tar.gz: $(INSTALL)
        rm -rf .dist/
 
 llib-llibmdoc.ln: $(MDOCLNS)
-       $(LINT) $(LINTFLAGS) -Clibmdoc $(MDOCLNS)
+       $(LINT) -Clibmdoc $(MDOCLNS)
 
 llib-llibman.ln: $(MANLNS)
-       $(LINT) $(LINTFLAGS) -Clibman $(MANLNS)
+       $(LINT) -Clibman $(MANLNS)
 
 llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
-       $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+       $(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
 
 libmdoc.a: $(MDOCOBJS)
        $(AR) rs $@ $(MDOCOBJS)
@@ -243,3 +256,15 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 .sgml.html:
        validate $<
        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
+
+.1.1.txt:
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.3.3.txt:
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.7.7.txt:
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.tar.gz.md5:
+       md5 $< $@