~mdw
/
tig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support cherry-picking commits in main view to current branch
[tig]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
446fc3e
..
5bf60e3
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,7
@@
## Makefile for tig
## Makefile for tig
+all:
+
# Include setting from the configure script
-include config.make
# Include setting from the configure script
-include config.make
@@
-38,10
+40,9
@@
HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
TARNAME = tig-$(RPM_VERSION)-$(RPM_RELEASE)
ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
TARNAME = tig-$(RPM_VERSION)-$(RPM_RELEASE)
-override CFLAGS += '-DVERSION="$(VERSION)"'
+override CFLAGS += '-D
TIG_
VERSION="$(VERSION)"'
-AUTOHEADER ?= autoheader
-AUTOCONF ?= autoconf
+AUTORECONF ?= autoreconf
ASCIIDOC ?= asciidoc
XMLTO ?= xmlto
DOCBOOK2PDF ?= docbook2pdf
ASCIIDOC ?= asciidoc
XMLTO ?= xmlto
DOCBOOK2PDF ?= docbook2pdf
@@
-81,13
+82,13
@@
install-doc: install-doc-man install-doc-html
clean:
rm -rf manual.html-chunked $(TARNAME)
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
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
strip $(PROGS)
dist: tig.spec
@@
-104,16
+105,15
@@
dist: tig.spec
rpm: dist
rpmbuild -ta $(TARNAME).tar.gz
rpm: dist
rpmbuild -ta $(TARNAME).tar.gz
-configure: configure.ac
- $(AUTOHEADER)
- $(AUTOCONF)
+configure: configure.ac acinclude.m4
+ $(AUTORECONF) -v
# Maintainer stuff
release-doc:
git checkout release && \
git merge master && \
$(MAKE) clean doc-man doc-html && \
# Maintainer stuff
release-doc:
git checkout release && \
git merge master && \
$(MAKE) clean doc-man doc-html && \
- git add $(MANDOC) $(HTMLDOC) && \
+ git add
-f
$(MANDOC) $(HTMLDOC) && \
git commit -m "Sync docs" && \
git checkout master
git commit -m "Sync docs" && \
git checkout master
@@
-125,12
+125,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
.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.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 \
manual.html: manual.toc
manual.toc: manual.txt
sed -n '/^\[\[/,/\(---\|~~~\)/p' < $< | while read line; do \