pip installs fine!

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index aea9671486c46d5d071112b05aab958897d8ace3..e126a9fa1db1e2eb06200bea0755425d5014a866 100644 (file)
--- 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,19 +19,16 @@ 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 --junk-paths youtube-dl youtube_dl/*.py
+       zip --quiet youtube-dl youtube_dl/*.py
+       zip --quiet --junk-paths youtube-dl youtube_dl/__main__.py
        echo '#!/usr/bin/env python' > youtube-dl
        cat youtube-dl.zip >> youtube-dl
        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) && \
@@ -45,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