get_author_initials: various fixes

[tig.git] / Makefile

diff --git a/Makefile b/Makefile
index 02d84dc0cd0420cb47448b9fa26668783f8db45a..3b211117320d44bddf5e5310255bd0f367b01032 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,8 @@ LDLIBS ?= -lcurses
 CFLAGS ?= -Wall -O2
 DFLAGS = -g -DDEBUG -Werror -O0
 PROGS  = tig
+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
@@ -58,8 +60,8 @@ 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)
@@ -85,6 +87,12 @@ install-doc-man: doc-man
                $(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 \
@@ -95,7 +103,14 @@ install-doc-html: doc-html
                $(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
@@ -130,13 +145,17 @@ rpm: dist
        rpmbuild -ta $(TARNAME).tar.gz
 
 configure: configure.ac acinclude.m4
-       $(AUTORECONF) -v
+       $(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' \