Makefile: remove default target in favor of all

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index b129a7e08f1818770d0d213c972bb139498ca80a..eb838d470390f1fb51eb6df19d6b972279f0c604 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,12 @@ else
   test_tmp := $(CURDIR)/t/tmp
 endif
 
-default: all
-
+.PHONY: all
 all: bup Documentation/all
        t/configure-sampledata --setup
 
-bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
+bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds main.py
+       ln -sf main.py bup
 
 Documentation/all: bup
 
@@ -81,14 +81,15 @@ lib/bup/_version.py:
        ./format-subst.pl $@.pre >$@.new
        mv $@.new $@
 
+t/tmp:
+       mkdir t/tmp
+
 runtests: all runtests-python runtests-cmdline
 
-runtests-python: all
-       test -e t/tmp || mkdir t/tmp
+runtests-python: all t/tmp
        TMPDIR="$(test_tmp)" $(PYTHON) wvtest.py t/t*.py lib/*/t/t*.py
 
-runtests-cmdline: all
-       test -e t/tmp || mkdir t/tmp
+runtests-cmdline: all t/tmp
        TMPDIR="$(test_tmp)" t/test-fuse.sh
        TMPDIR="$(test_tmp)" t/test-drecurse.sh
        TMPDIR="$(test_tmp)" t/test-cat-file.sh
@@ -120,10 +121,6 @@ test: all
 
 check: test
 
-bup: main.py
-       rm -f $@
-       ln -s $< $@
-
 cmds: \
     $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
     $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
@@ -132,14 +129,6 @@ cmd/bup-%: cmd/%-cmd.py
        rm -f $@
        ln -s $*-cmd.py $@
 
-%: %.py
-       rm -f $@
-       ln -s $< $@
-
-bup-%: cmd-%.sh
-       rm -f $@
-       ln -s $< $@
-
 cmd/bup-%: cmd/%-cmd.sh
        rm -f $@
        ln -s $*-cmd.sh $@
@@ -153,13 +142,13 @@ export-docs: Documentation/all
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.1 && \
        git update-ref refs/heads/man \
-               $$(echo "Autogenerated man pages for $$(git describe)" \
+               $$(echo "Autogenerated man pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/man) && \
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.html && \
        git update-ref refs/heads/html \
-               $$(echo "Autogenerated html pages for $$(git describe)" \
+               $$(echo "Autogenerated html pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/html)