mdoc_atosec -> mdoc_str2sec (consistent with str2 being different from a2).

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 7f097eebafeb0fda65dc64a02d4cecc5ea0a484d..a91066734bdd882628ebb5e558e38735dbb4ea56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,31 @@
-.SUFFIXES:     .html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml
+.SUFFIXES:     .html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml .h .h.html

 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
 LIBDIR         = $(PREFIX)/lib
 MANDIR         = $(PREFIX)/man
 EXAMPLEDIR     = $(PREFIX)/share/examples/mandoc
 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
 LIBDIR         = $(PREFIX)/lib
 MANDIR         = $(PREFIX)/man
 EXAMPLEDIR     = $(PREFIX)/share/examples/mandoc

-INSTALL_PROGRAM        = install -m 0755
-INSTALL_DATA   = install -m 0444
-INSTALL_LIB    = install -m 0644
+INSTALL                ?= install
+INSTALL_PROGRAM        = $(INSTALL) -m 0755
+INSTALL_DATA   = $(INSTALL) -m 0444
+INSTALL_LIB    = $(INSTALL) -m 0644

 INSTALL_MAN    = $(INSTALL_DATA)
 
 INSTALL_MAN    = $(INSTALL_DATA)
 

-VERSION           = 1.9.16
-VDATE     = 22 March 2010
+VERSION           = 1.9.24
+VDATE     = 09 May 2010

 
 

-VFLAGS     = -DVERSION="\"$(VERSION)\"" -DHAVE_CONFIG_H
+VFLAGS    = -DVERSION="\"$(VERSION)\""

 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings

-CFLAGS    += -g $(VFLAGS) $(WFLAGS)
-#CFLAGS          += -DOSNAME="\"OpenBSD 4.5\""
+CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
+
+# 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\""
+
+# Unset this if you don't want Xo/Xc allowing split `It' lines, which
+# breaks symmetry.
+CFLAGS   += -DUGLY
+

 LINTFLAGS += $(VFLAGS)
 
 MANDOCFLAGS = -Wall -fstrict
 LINTFLAGS += $(VFLAGS)
 
 MANDOCFLAGS = -Wall -fstrict


@@ -60,7 +69,7 @@ HEADS    = mdoc.h libmdoc.h man.h libman.h term.h \
 GSGMLS    = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
             mandoc_char.7.sgml man.7.sgml man.3.sgml
 SGMLS     = index.sgml
 GSGMLS    = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
             mandoc_char.7.sgml man.7.sgml man.3.sgml
 SGMLS     = index.sgml

-HTMLS     = ChangeLog.html index.html
+HTMLS     = ChangeLog.html index.html man.h.html mdoc.h.html

 XSLS      = ChangeLog.xsl
 GHTMLS    = mandoc.1.html mdoc.3.html man.3.html mdoc.7.html \
             man.7.html mandoc_char.7.html manuals.7.html
 XSLS      = ChangeLog.xsl
 GHTMLS    = mandoc.1.html mdoc.3.html man.3.html mdoc.7.html \
             man.7.html mandoc_char.7.html manuals.7.html


@@ -76,10 +85,10 @@ MANS           = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
 BINS      = mandoc
 TESTS     = test-strlcat.c test-strlcpy.c
 CONFIGS           = config.h.pre config.h.post
 BINS      = mandoc
 TESTS     = test-strlcat.c test-strlcpy.c
 CONFIGS           = config.h.pre config.h.post

-CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+DOCLEAN           = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \

             $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
             $(GHTMLS) config.h config.log
             $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
             $(GHTMLS) config.h config.log

-INSTALL           = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+DOINSTALL  = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \

             $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
 
 all:   $(BINS)
             $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)
 
 all:   $(BINS)


@@ -87,7 +96,7 @@ all:  $(BINS)
 lint:  $(LLNS)
 
 clean:
 lint:  $(LLNS)
 
 clean:

-       rm -f $(CLEAN)
+       rm -f $(DOCLEAN)

 
 cleanlint:
        rm -f $(LNS) $(LLNS)
 
 cleanlint:
        rm -f $(LNS) $(LLNS)


@@ -102,11 +111,11 @@ www:      all $(GSGMLS) $(GHTMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS)
 htmls: all $(GSGMLS) $(GHTMLS)
 
 installwww: www
 htmls: all $(GSGMLS) $(GHTMLS)
 
 installwww: www

-       install -m 0444 $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
-       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
-       install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
-       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
-       install -m 0444 mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
+       $(INSTALL_DATA) $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(PREFIX)/
+       $(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+       $(INSTALL_DATA) mdocml-$(VERSION).md5 $(PREFIX)/snapshots/
+       $(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+       $(INSTALL_DATA) mdocml-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5

 
 install:
        mkdir -p $(BINDIR)
 
 install:
        mkdir -p $(BINDIR)


@@ -115,7 +124,7 @@ install:
        mkdir -p $(MANDIR)/man7
        $(INSTALL_PROGRAM) mandoc $(BINDIR)
        $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
        mkdir -p $(MANDIR)/man7
        $(INSTALL_PROGRAM) mandoc $(BINDIR)
        $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1

-       $(INSTALL_MAN) man.7 mdoc.7 $(MANDIR)/man7
+       $(INSTALL_MAN) man.7 mdoc.7 mandoc_char.7 $(MANDIR)/man7

        $(INSTALL_DATA) example.style.css $(EXAMPLEDIR)
 
 uninstall:
        $(INSTALL_DATA) example.style.css $(EXAMPLEDIR)
 
 uninstall:


@@ -123,6 +132,7 @@ uninstall:
        rm -f $(MANDIR)/man1/mandoc.1
        rm -f $(MANDIR)/man7/mdoc.7
        rm -f $(MANDIR)/man7/man.7
        rm -f $(MANDIR)/man1/mandoc.1
        rm -f $(MANDIR)/man7/mdoc.7
        rm -f $(MANDIR)/man7/man.7

+       rm -f $(MANDIR)/man7/mandoc_char.7

        rm -f $(EXAMPLEDIR)/example.style.css
 
 $(OBJS): config.h
        rm -f $(EXAMPLEDIR)/example.style.css
 
 $(OBJS): config.h


@@ -196,9 +206,9 @@ ChangeLog.txt:
 ChangeLog.html: ChangeLog.xml ChangeLog.xsl
        xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 
 ChangeLog.html: ChangeLog.xml ChangeLog.xsl
        xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
 

-mdocml-$(VERSION).tar.gz: $(INSTALL)
+mdocml-$(VERSION).tar.gz: $(DOINSTALL)

        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/

-       cp -f $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+       cp -f $(DOINSTALL) .dist/mdocml/mdocml-$(VERSION)/

        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 


@@ -233,6 +243,9 @@ mandoc: $(MAINOBJS) libmdoc.a libman.a
 .tar.gz.md5:
        md5 $< > $@
 
 .tar.gz.md5:
        md5 $< > $@
 

+.h.h.html:
+       highlight -I $< >$@
+

 config.h: config.h.pre config.h.post
        rm -f config.log
        ( cat config.h.pre; \
 config.h: config.h.pre config.h.post
        rm -f config.log
        ( cat config.h.pre; \