Merge remote-tracking branch 'joelverhagen/master'

[youtube-dl] / Makefile

diff --git a/Makefile b/Makefile
index 3746c08bd105dc3a81722cfbfbcaa6548ce26133..aea9671486c46d5d071112b05aab958897d8ace3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,10 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
        install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
        install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
 
-.PHONY: all clean install README.md 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
 
 youtube-dl: youtube_dl/*.py
@@ -33,13 +36,13 @@ youtube-dl.exe: youtube_dl/*.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) && \
-               footer=$$(sed -e '1,/.*# FAQ/ d' README.md) && \
+               footer=$$(sed -e '1,/.*# CONFIGURATION/ d' README.md) && \
                echo "$${header}" > README.md && \
                echo >> README.md && \
                echo '# OPTIONS' >> README.md && \
                echo "$${options}" >> README.md&& \
                echo >> README.md && \
-               echo '# FAQ' >> README.md && \
+               echo '# CONFIGURATION' >> README.md && \
                echo "$${footer}" >> README.md
 
 youtube-dl.1: README.md
@@ -52,8 +55,3 @@ youtube-dl.bash-completion: README.md
 
 LATEST_VERSION: youtube_dl/__init__.py
        python -m youtube_dl --version > LATEST_VERSION
-
-test:
-       nosetests2 --nocapture test
-
-.PHONY: default compile update update-latest update-readme test clean