mirror of https://github.com/zcash/zips.git
Makefile: add 'discard' target, to discard changes to checked-in generated files.
This is useful to avoid conflicts when merging / rebasing / doing 'git stash pop'. Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
parent
9acf1b6667
commit
bbb2bac1ac
5
Makefile
5
Makefile
|
@ -2,7 +2,7 @@
|
||||||
# sudo apt-get install python3-pip pandoc perl sed
|
# sudo apt-get install python3-pip pandoc perl sed
|
||||||
# sudo pip3 install rst2html5
|
# sudo pip3 install rst2html5
|
||||||
|
|
||||||
.PHONY: all all-zips release protocol
|
.PHONY: all all-zips release protocol discard
|
||||||
all-zips: .Makefile.uptodate
|
all-zips: .Makefile.uptodate
|
||||||
find . -name 'zip-*.rst' -o -name 'zip-*.md' |sort >.zipfilelist.new
|
find . -name 'zip-*.rst' -o -name 'zip-*.md' |sort >.zipfilelist.new
|
||||||
diff .zipfilelist.current .zipfilelist.new || cp -f .zipfilelist.new .zipfilelist.current
|
diff .zipfilelist.current .zipfilelist.new || cp -f .zipfilelist.new .zipfilelist.current
|
||||||
|
@ -18,6 +18,9 @@ release:
|
||||||
protocol:
|
protocol:
|
||||||
$(MAKE) -C protocol
|
$(MAKE) -C protocol
|
||||||
|
|
||||||
|
discard:
|
||||||
|
git checkout -- '*.html' 'protocol/*.pdf'
|
||||||
|
|
||||||
.Makefile.uptodate: Makefile
|
.Makefile.uptodate: Makefile
|
||||||
$(MAKE) clean
|
$(MAKE) clean
|
||||||
touch .Makefile.uptodate
|
touch .Makefile.uptodate
|
||||||
|
|
Loading…
Reference in New Issue