![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/Makefile b/Makefile
index cee61d8c287ee03c13170fde028639d9e7708f94..3b211117320d44bddf5e5310255bd0f367b01032 100644 (file)
--- a/Makefile
+++ b/Makefile
prefix ?= $(HOME)
bindir ?= $(prefix)/bin
-mandir ?= $(prefix)/man
datarootdir ?= $(prefix)/share
+sysconfdir ?= $(prefix)/etc
docdir ?= $(datarootdir)/doc
+mandir ?= $(datarootdir)/man
# DESTDIR=
# Get version either via git or from VERSION file. Allow either
LDLIBS ?= -lcurses
CFLAGS ?= -Wall -O2
-DFLAGS = -g -DDEBUG -Werror
+DFLAGS = -g -DDEBUG -Werror -O0
PROGS = tig
-MANDOC = tig.1 tigrc.5
-HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
+TESTS = test-graph
+SOURCE = tig.c tig.h io.c io.h graph.c graph.h
+TXTDOC = tig.1.txt tigrc.5.txt manual.txt NEWS README INSTALL BUGS TODO
+MANDOC = tig.1 tigrc.5 tigmanual.7
+HTMLDOC = tig.1.html tigrc.5.html manual.html README.html NEWS.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)"'
+override CPPFLAGS += '-DTIG_VERSION="$(VERSION)"'
+override CPPFLAGS += '-DSYSCONFDIR="$(sysconfdir)"'
AUTORECONF ?= autoreconf
ASCIIDOC ?= asciidoc
+ASCIIDOC_FLAGS = -aversion=$(VERSION) -asysconfdir=$(sysconfdir)
XMLTO ?= xmlto
DOCBOOK2PDF ?= docbook2pdf
-all: $(PROGS)
-all-debug: $(PROGS)
+all: $(PROGS) $(TESTS)
+all-debug: $(PROGS) $(TESTS)
all-debug: CFLAGS += $(DFLAGS)
doc: $(ALLDOC)
doc-man: $(MANDOC)
install: all
mkdir -p $(DESTDIR)$(bindir) && \
for prog in $(PROGS); do \
- install -p -m 0755 $$prog $(DESTDIR)$(bindir); \
+ install -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \
done
install-doc-man: doc-man
mkdir -p $(DESTDIR)$(mandir)/man1 \
- $(DESTDIR)$(mandir)/man5
+ $(DESTDIR)$(mandir)/man5 \
+ $(DESTDIR)$(mandir)/man7
for doc in $(MANDOC); do \
+ sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \
case "$$doc" in \
- *.1) install -p -m 0644 $$doc $(DESTDIR)$(mandir)/man1 ;; \
- *.5) install -p -m 0644 $$doc $(DESTDIR)$(mandir)/man5 ;; \
- esac \
+ *.1) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \
+ *.5) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \
+ *.7) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man7/$$doc" ;; \
+ esac; \
+ $(RM) "$$doc+"; \
done
+install-release-doc-man:
+ GIT_INDEX_FILE=.tmp-doc-index git read-tree origin/release
+ GIT_INDEX_FILE=.tmp-doc-index git checkout-index -f --prefix=./ $(MANDOC)
+ rm -f .tmp-doc-index
+ $(MAKE) install-doc-man
+
install-doc-html: doc-html
mkdir -p $(DESTDIR)$(docdir)/tig
for doc in $(HTMLDOC); do \
+ sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \
case "$$doc" in \
- *.html) install -p -m 0644 $$doc $(DESTDIR)$(docdir)/tig ;; \
- esac \
+ *.html) install -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \
+ esac; \
+ $(RM) "$$doc+"; \
done
+install-release-doc-html:
+ GIT_INDEX_FILE=.tmp-doc-index git read-tree origin/release
+ GIT_INDEX_FILE=.tmp-doc-index git checkout-index -f --prefix=./ $(HTMLDOC)
+ rm -f .tmp-doc-index
+ $(MAKE) install-doc-html
+
install-doc: install-doc-man install-doc-html
+install-release-doc: install-release-doc-man install-release-doc-html
clean:
$(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
+ $(RM) -r manual.html-chunked autom4te.cache
+ $(RM) *.toc $(ALLDOC) aclocal.m4 configure
+ $(RM) config.h config.log config.make config.status config.h.in
spell-check:
- aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
+ for file in $(TXTDOC) tig.c; do \
+ aspell --lang=en --dont-backup \
+ --personal=./contrib/aspell.dict check $$file; \
+ done
strip: $(PROGS)
strip $(PROGS)
tar rf $(TARNAME).tar `find $(TARNAME)/*` && \
gzip -f -9 $(TARNAME).tar && \
md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
- @rm -rf $(TARNAME)
+ @$(RM) -r $(TARNAME)
rpm: dist
rpmbuild -ta $(TARNAME).tar.gz
configure: configure.ac acinclude.m4
- $(AUTORECONF) -v
-
-# Maintainer stuff
-release-doc:
- git checkout release && \
- git merge master && \
- $(MAKE) distclean doc-man doc-html && \
- git add -f $(MANDOC) $(HTMLDOC) && \
- git commit -m "Sync docs" && \
- git checkout master
-
-release-dist: release-doc
- git checkout release && \
- $(MAKE) dist && \
- git checkout master
+ $(AUTORECONF) -v -I contrib
.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
+io.o: io.c io.h tig.h
+graph.o: tig.h
+tig.o: tig.c tig.h io.h
+tig: tig.o io.o graph.o
+test-graph.o: test-graph.c io.h tig.h graph.h
+test-graph: io.o graph.o
tig.spec: contrib/tig.spec.in
sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' \
*) ref="$$ref, $$line" ;; \
esac; done | sed 's/\[\[\(.*\)\]\]/\1/' > $@
-README.html: README
- $(ASCIIDOC) -b xhtml11 -d article -a readme $<
+README.html: README SITES INSTALL asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article -a readme $<
-%.pdf : %.xml
- $(DOCBOOK2PDF) $<
+NEWS.html: NEWS asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article $<
+
+tigmanual.7: manual.txt
-%.1.html : %.1.txt
- $(ASCIIDOC) -b xhtml11 -d manpage $<
+%.1.html : %.1.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d manpage $<
-%.1.xml : %.1.txt
- $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
+%.1.xml : %.1.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d manpage $<
-%.1 : %.1.xml
- $(XMLTO) -m manpage.xsl man $<
+%.5.html : %.5.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d manpage $<
-%.5.html : %.5.txt
- $(ASCIIDOC) -b xhtml11 -d manpage $<
+%.5.xml : %.5.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d manpage $<
-%.5.xml : %.5.txt
- $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
+%.7.xml : %.7.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) $<