Fixed STRUCTURE repeat (schwarze@openbsd.org).

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index a404b804d8bf877172e526a0b26cd3358b71520f..cefef5471a621487e8aee7f51f14a4c6635e95cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.SUFFIXES:     .html .sgml .1.txt .3.txt .7.txt .1 .3 .7
+.SUFFIXES:     .html .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz
 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
@@ -9,13 +9,13 @@ INSTALL_DATA  = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.7.10
-VDATE     = 05 April 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 mdoc_strings.ln \
             mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
@@ -51,6 +51,10 @@ 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 \
@@ -61,7 +65,7 @@ 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) tags $(TEXTS)
+            $(TARGZS) tags $(TEXTS) ChangeLog
 MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
             Makefile
 INSTALL           = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
@@ -79,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)
+
+md5:   $(MD5)
 
-www:   all $(HTMLS) $(TARGZS) $(TEXTS)
+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/
@@ -157,6 +162,9 @@ man.o: man.c libman.h
 main.ln: main.c mdoc.h
 main.o: main.c mdoc.h
 
+compat.ln: compat.c 
+compat.o: compat.c
+
 term.ln: term.c term.h man.h mdoc.h
 term.o: term.c term.h man.h mdoc.h
 
@@ -174,6 +182,9 @@ mdoc_action.o: mdoc_action.c libmdoc.h
 
 libmdoc.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/
        sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
@@ -225,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)
@@ -247,10 +258,13 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
 
 .1.1.txt:
-       ./mandoc -Wall,error $< | col -b > $@
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
 
 .3.3.txt:
-       ./mandoc -Wall,error $< | col -b > $@
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
 
 .7.7.txt:
-       ./mandoc -Wall,error $< | col -b > $@
+       ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.tar.gz.md5:
+       md5 $< $@