main: fix problem when redirecting to newliner on MacOS X.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index b9ed07b00c6bdab26c2a6af6c57395e522a8928e..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 memtest _hashsplit$(SOEXT) \
+all: cmds bup lib/bup/_hashsplit$(SOEXT) \
        Documentation/all
        
 %/all:
@@ -31,10 +28,10 @@ all: bup-split bup-join bup-save bup-init bup-server bup-index bup-tick \
 %/clean:
        $(MAKE) -C $* clean
 
-_hashsplit$(SOEXT): _hashsplit.c csetup.py
+lib/bup/_hashsplit$(SOEXT): lib/bup/_hashsplit.c lib/bup/csetup.py
        @rm -f $@
-       python csetup.py build
-       cp build/*/_hashsplit$(SOEXT) .
+       cd lib/bup && python csetup.py build
+       cp lib/bup/build/*/_hashsplit$(SOEXT) lib/bup/
        
 runtests: all runtests-python runtests-cmdline
 
@@ -53,13 +50,15 @@ test: all
 %: %.o
        $(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS)
        
-bup: bup.py
+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 $@
@@ -73,7 +72,8 @@ bup-%: cmd-%.sh
        gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
 clean: Documentation/clean
-       rm -f *.o *.so *.dll *.exe *~ .*~ *.pyc */*.pyc */*~ \
-               bup bup-* randomgen memtest \
+       rm -f *.o *.so */*/*.so *.dll *.exe .*~ *~ */*~ */*/*~ \
+               *.pyc */*.pyc */*/*.pyc\
+               bup bup-* cmd/bup-* randomgen memtest \
                out[12] out2[tc] tags[12] tags2[tc]
-       rm -rf *.tmp build
+       rm -rf *.tmp build lib/bup/build