Skip to content

Commit

Permalink
Build intermediate tig.o file to fix tig dependency on config.h
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas committed Aug 22, 2007
1 parent da63332 commit 88d7f67
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ tig.1.html
tig.spec
tigrc.5
tigrc.5.html
*.o
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion config.make.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ ASCIIDOC = @ASCIIDOC@
XMLTO = @XMLTO@
DOCBOOK2PDF = @DOCBOOK2PDF@

tig: config.h
tig.o: config.h

0 comments on commit 88d7f67

Please sign in to comment.