cmd/margin: interpret the meaning of the margin bits.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 527419d5862cfa83967cf509546800c95ea539cc..7f38c7fabf228dd686ac00003c9a65295b181175 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ default: all
 
 all: bup Documentation/all
 
-bup: lib/bup/_version.py lib/bup/_hashsplit$(SOEXT) cmds
+bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
 
 Documentation/all: bup
 
@@ -62,10 +62,11 @@ install: all
 %/clean:
        $(MAKE) -C $* clean
 
-lib/bup/_hashsplit$(SOEXT): lib/bup/_hashsplit.c lib/bup/csetup.py
+lib/bup/_helpers$(SOEXT): \
+               lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
        @rm -f $@
        cd lib/bup && $(PYTHON) csetup.py build
-       cp lib/bup/build/*/_hashsplit$(SOEXT) lib/bup/
+       cp lib/bup/build/*/_helpers$(SOEXT) lib/bup/
 
 .PHONY: lib/bup/_version.py
 lib/bup/_version.py:
@@ -114,8 +115,9 @@ bup-%: cmd-%.sh
        gcc -c -o $@ $< $(CPPFLAGS) $(CFLAGS)
 
 clean: Documentation/clean
-       rm -f *.o *.so */*/*.so *.dll *.exe .*~ *~ */*~ */*/*~ \
-               *.pyc */*.pyc */*/*.pyc \
+       rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll *.exe \
+               .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
+               *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
                bup bup-* cmd/bup-* lib/bup/_version.py randomgen memtest \
                out[12] out2[tc] tags[12] tags2[tc]
-       rm -rf *.tmp t/*.tmp build lib/bup/build
+       rm -rf *.tmp t/*.tmp lib/*/*/*.tmp build lib/bup/build