Simplify documentation building and fix asciidoc.conf dependency

[tig.git] / Makefile

diff --git a/Makefile b/Makefile
index 588d67fe091f0c2ef4d9a1416f2cb582b5ba0e99..6cc4e424e6ef84a3e4c716a25be18cb6db6d86a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,9 @@ all:
 
 prefix ?= $(HOME)
 bindir ?= $(prefix)/bin
-mandir ?= $(prefix)/man
 datarootdir ?= $(prefix)/share
 docdir ?= $(datarootdir)/doc
+mandir ?= $(datarootdir)/man
 # DESTDIR=
 
 # Get version either via git or from VERSION file. Allow either
@@ -38,13 +38,20 @@ PROGS       = tig
 MANDOC = tig.1 tigrc.5
 HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
 ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
+
+# Never include the release number in the tarname for tagged
+# versions.
+ifneq ($(if $(DIST_VERSION),$(words $(RPM_VERLIST))),2)
 TARNAME        = tig-$(RPM_VERSION)-$(RPM_RELEASE)
+else
+TARNAME        = tig-$(RPM_VERSION)
+endif
 
 override CFLAGS += '-DTIG_VERSION="$(VERSION)"'
 
-AUTOHEADER ?= autoheader
-AUTOCONF ?= autoconf
+AUTORECONF ?= autoreconf
 ASCIIDOC ?= asciidoc
+ASCIIDOC_FLAGS = -aversion=$(VERSION)
 XMLTO ?= xmlto
 DOCBOOK2PDF ?= docbook2pdf
 
@@ -82,23 +89,26 @@ install-doc-html: doc-html
 install-doc: install-doc-man install-doc-html
 
 clean:
-       rm -rf manual.html-chunked $(TARNAME)
-       rm -f $(PROGS) $(ALLDOC) core *.xml *.toc
-       rm -f *.spec tig-*.tar.gz tig-*.tar.gz.md5
+       $(RM) -r $(TARNAME) *.spec tig-*.tar.gz tig-*.tar.gz.md5
+       $(RM) $(PROGS) core *.o *.xml
+
+distclean: clean
+       $(RM) -r manual.html-chunked *.toc $(ALLDOC)
+       $(RM) -r autom4te.cache aclocal.m4 config.{h,log,make,status} config.h.in configure
 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
 
-strip: all
+strip: $(PROGS)
        strip $(PROGS)
 
-dist: tig.spec
+dist: configure tig.spec
        @mkdir -p $(TARNAME) && \
-       cp tig.spec $(TARNAME) && \
+       cp tig.spec configure config.h.in aclocal.m4 $(TARNAME) && \
        echo $(VERSION) > $(TARNAME)/VERSION
        git archive --format=tar --prefix=$(TARNAME)/ HEAD | \
        tar --delete $(TARNAME)/VERSION > $(TARNAME).tar && \
-       tar rf $(TARNAME).tar $(TARNAME)/tig.spec $(TARNAME)/VERSION && \
+       tar rf $(TARNAME).tar `find $(TARNAME)/*` && \
        gzip -f -9 $(TARNAME).tar && \
        md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
        @rm -rf $(TARNAME)
@@ -106,16 +116,15 @@ dist: tig.spec
 rpm: dist
        rpmbuild -ta $(TARNAME).tar.gz
 
-configure: configure.ac
-       $(AUTOHEADER)
-       $(AUTOCONF)
+configure: configure.ac acinclude.m4
+       $(AUTORECONF) -v
 
 # Maintainer stuff
 release-doc:
        git checkout release && \
        git merge master && \
-       $(MAKE) clean doc-man doc-html && \
-       git add $(MANDOC) $(HTMLDOC) && \
+       $(MAKE) distclean doc-man doc-html && \
+       git add -f $(MANDOC) $(HTMLDOC) && \
        git commit -m "Sync docs" && \
        git checkout master
 
@@ -127,12 +136,13 @@ release-dist: release-doc
 .PHONY: all all-debug doc doc-man doc-html install install-doc \
        install-doc-man install-doc-html clean spell-check dist rpm
 
+tig.o: tig.c
+tig: tig.o
+
 tig.spec: contrib/tig.spec.in
        sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' \
            -e 's/@@RELEASE@@/$(RPM_RELEASE)/g' < $< > $@
 
-tig: tig.c
-
 manual.html: manual.toc
 manual.toc: manual.txt
        sed -n '/^\[\[/,/\(---\|~~~\)/p' < $< | while read line; do \
@@ -143,35 +153,32 @@ manual.toc: manual.txt
                *)         ref="$$ref, $$line" ;; \
                esac; done | sed 's/\[\[\(.*\)\]\]/\1/' > $@
 
-README.html: README
-       $(ASCIIDOC) -b xhtml11 -d article -a readme $<
+README.html: README asciidoc.conf
+       $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article -a readme $<
 
-%.pdf : %.xml
-       $(DOCBOOK2PDF) $<
-
-%.1.html : %.1.txt
-       $(ASCIIDOC) -b xhtml11 -d manpage $<
-
-%.1.xml : %.1.txt
-       $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
+%.1.html : %.1.txt asciidoc.conf
+       $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d manpage $<
 
-%.1 : %.1.xml
-       $(XMLTO) -m manpage.xsl man $<
+%.1.xml : %.1.txt asciidoc.conf
+       $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d manpage $<
 
-%.5.html : %.5.txt
-       $(ASCIIDOC) -b xhtml11 -d manpage $<
+%.5.html : %.5.txt asciidoc.conf
+       $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d manpage $<
 
-%.5.xml : %.5.txt
-       $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
+%.5.xml : %.5.txt asciidoc.conf
+       $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d manpage $<
 
-%.5 : %.5.xml
-       $(XMLTO) -m manpage.xsl man $<
+%.html : %.txt asciidoc.conf
+       $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article -n $<
 
-%.html : %.txt
-       $(ASCIIDOC) -b xhtml11 -d article -n $<
+%.xml : %.txt asciidoc.conf
+       $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d article $<
 
-%.xml : %.txt
-       $(ASCIIDOC) -b docbook -d article $<
+% : %.xml
+       $(XMLTO) man $<
 
 %.html-chunked : %.xml
        $(XMLTO) html -o $@ $<
+
+%.pdf : %.xml
+       $(DOCBOOK2PDF) $<