Merge branch 'master' of https://github.com/rg3/youtube-dl

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index 119c1eeaa08fa2eaaf1e626a5b0860e299f0afd2..0069e79753205499cb104b73179d1acaf16eae8f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion
 
 clean:
-       rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
+       rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/
 
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
@@ -17,7 +17,8 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
        install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
 
 test:
-       nosetests2 --nocapture test
+       #nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
+       nosetests --verbose test
 
 .PHONY: all clean install test
 
@@ -38,11 +39,9 @@ README.txt: README.md
 youtube-dl.1: README.md
        pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md devscripts/bash_completion.template
-       python devscripts/bash_completion.py
+youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.in
+       python devscripts/bash-completion.py
 
 youtube-dl.tar.gz: all
-       tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
-               --exclude="*.pyc" --exclude="*.pyo" --exclude="*~" --exclude="youtube-dl.exe" \
-               --exclude="wine-py2exe/" --exclude="py2exe.log" --exclude="*.kate-swp" \
-               --exclude="build/" --exclude="dist/" --exclude="MANIFEST" --exclude=".git/" .
+       tar -cvzf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \
+               --exclude-from=".tarignore" -- .