Move cmd-*.py to cmd/*-cmd.py.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index b47dad657bfb8581b2bb15485ba14bb5f85ebd8a..40cae28223c0d55b49a6085164877bef36747fb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,7 @@ endif
 
 default: all
 
-all: bup-split bup-join bup-save bup-init bup-server bup-index bup-tick \
-       bup-midx bup-fuse bup-ls bup-damage bup-fsck bup-margin bup-drecurse \
-       bup-random bup-ftp bup-newliner bup-memtest \
-       bup lib/bup/_hashsplit$(SOEXT) \
+all: cmds bup lib/bup/_hashsplit$(SOEXT) \
        Documentation/all
        
 %/all:
@@ -57,9 +54,11 @@ bup: main.py
        rm -f $@
        ln -s $< $@
        
-bup-%: cmd-%.py
+cmds: $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py))
+
+cmd/bup-%: cmd/%-cmd.py
        rm -f $@
-       ln -s $< $@
+       ln -s $*-cmd.py $@
        
 %: %.py
        rm -f $@
@@ -75,6 +74,6 @@ bup-%: cmd-%.sh
 clean: Documentation/clean
        rm -f *.o *.so */*/*.so *.dll *.exe .*~ *~ */*~ */*/*~ \
                *.pyc */*.pyc */*/*.pyc\
-               bup bup-* randomgen memtest \
+               bup bup-* cmd/bup-* randomgen memtest \
                out[12] out2[tc] tags[12] tags2[tc]
        rm -rf *.tmp build lib/bup/build