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

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 8b3be5520f3ac4d6628cc2697a1b9b5e3ab7cc19..40cae28223c0d55b49a6085164877bef36747fb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-MACHINE:=$(shell uname -m)
 CFLAGS=-Wall -g -O2 -Werror $(PYINCLUDE) -g
 ifneq ($(OS),CYGWIN)
   CFLAGS += -fPIC
@@ -8,6 +7,7 @@ SHARED=-shared
 SOEXT:=.so
 
 ifeq (${OS},Darwin)
+  MACHINE:=$(shell arch)
   CFLAGS += -arch $(MACHINE)
   SHARED = -dynamiclib
 endif
@@ -19,17 +19,19 @@ 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 memtest randomgen$(EXT) _hashsplit$(SOEXT)
-
-randomgen$(EXT): randomgen.o
-       $(CC) $(CFLAGS) -o $@ $<
+all: cmds bup lib/bup/_hashsplit$(SOEXT) \
+       Documentation/all
+       
+%/all:
+       $(MAKE) -C $* all
+       
+%/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.so .
+       cd lib/bup && python csetup.py build
+       cp lib/bup/build/*/_hashsplit$(SOEXT) lib/bup/
        
 runtests: all runtests-python runtests-cmdline
 
@@ -48,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 $@
@@ -67,8 +71,9 @@ bup-%: cmd-%.sh
 %.o: %.c
        gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
-clean:
-       rm -f *.o *.so *.dll *.exe *~ .*~ *.pyc */*.pyc */*~ \
-               bup bup-* randomgen memtest \
+clean: Documentation/clean
+       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