From 88d7f67ec4bee1f6041ed77d68540101735399a5 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Wed, 22 Aug 2007 19:41:12 +0200 Subject: [PATCH] Build intermediate tig.o file to fix tig dependency on config.h --- .gitignore | 1 + Makefile | 9 +++++---- config.make.in | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4469f10..a49c82b 100644 --- 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 588d67f..bc2e654 100644 --- 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 f863248..3af2ea9 100644 --- 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 -- 2.30.2