Build intermediate tig.o file to fix tig dependency on config.h

diff --git a/.gitignore b/.gitignore
index 4469f10149b14689ee61efdc5893175b9d1eb1bb..a49c82bba17660b781fd390d6117e73b26fa954c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ tig.1.html
 tig.spec
 tigrc.5
 tigrc.5.html
+*.o

diff --git a/Makefile b/Makefile
index 588d67fe091f0c2ef4d9a1416f2cb582b5ba0e99..bc2e654a7212aa0473c83dab01c31f1a44bf5d73 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,13 +83,13 @@ install-doc: install-doc-man install-doc-html
 
 clean:
        rm -rf manual.html-chunked $(TARNAME)
-       rm -f $(PROGS) $(ALLDOC) core *.xml *.toc
+       rm -f $(PROGS) $(ALLDOC) core *.o *.xml *.toc
        rm -f *.spec tig-*.tar.gz tig-*.tar.gz.md5
 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
 
-strip: all
+strip: $(PROGS)
        strip $(PROGS)
 
 dist: tig.spec
@@ -127,12 +127,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 \

diff --git a/config.make.in b/config.make.in
index f863248d3fa2378003cdbd8cf4a3d62452788a88..3af2ea941390118c54255b6fd104208461840dcb 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -15,4 +15,4 @@ ASCIIDOC = @ASCIIDOC@
 XMLTO = @XMLTO@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 
-tig: config.h
+tig.o: config.h