X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=Makefile;h=e126a9fa1db1e2eb06200bea0755425d5014a866;hb=a5741a3f5e8f2f92951d3d32f0a1badb3028c32f;hp=2eb226fdbde1e4046bf980a5c2bc1945d60ea899;hpb=8192ebe1f874b22b0c27e675a4136a06e46a68ce;p=youtube-dl

diff --git a/Makefile b/Makefile
index 2eb226fdb..e126a9fa1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-all: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion LATEST_VERSION
-# TODO: re-add youtube-dl.exe, and make sure it's 1. safe and 2. doesn't need sudo
+all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
 
 clean:
-	rm -f youtube-dl youtube-dl.exe youtube-dl.1 LATEST_VERSION
+	rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
 
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
@@ -20,8 +19,7 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
 test:
 	nosetests2 --nocapture test
 
-.PHONY: all clean install test README.md youtube-dl.bash-completion
-# TODO un-phony README.md and youtube-dl.bash_completion by reading from .in files and generating from them
+.PHONY: all clean install test
 
 youtube-dl: youtube_dl/*.py
 	zip --quiet youtube-dl youtube_dl/*.py
@@ -31,9 +29,6 @@ youtube-dl: youtube_dl/*.py
 	rm youtube-dl.zip
 	chmod a+x youtube-dl
 
-youtube-dl.exe: youtube_dl/*.py
-	bash devscripts/wine-py2exe.sh build_exe.py
-
 README.md: youtube_dl/*.py
 	@options=$$(COLUMNS=80 python -m youtube_dl --help | sed -e '1,/.*General Options.*/ d' -e 's/^\W\{2\}\(\w\)/## \1/') && \
 		header=$$(sed -e '/.*# OPTIONS/,$$ d' README.md) && \
@@ -46,13 +41,13 @@ README.md: youtube_dl/*.py
 		echo '# CONFIGURATION' >> README.md && \
 		echo "$${footer}" >> README.md
 
+README.txt: README.md
+	pandoc -s -f markdown -t plain README.md -o README.txt
+
 youtube-dl.1: README.md
-	pandoc -s -w man README.md -o youtube-dl.1
+	pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md
+youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
 	@options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
-		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion` && \
+		content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion.in` && \
 		echo "$${content}" > youtube-dl.bash-completion
-
-LATEST_VERSION: youtube_dl/__init__.py
-	python -m youtube_dl --version > LATEST_VERSION