Merge branch 'maint'

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 8e479f6545aff1044ff2028f02b46597cffa2d87..65a8e3d8c22ace200b2abe915a1b0ef48c07889c 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
 
@@ -36,25 +36,28 @@ install: all
                $(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
                $(LIBDIR)/web
        [ ! -e Documentation/.docs-available ] || \
-         $(INSTALL) -o 0 -g 0 -m 0644 \
-               $(wildcard Documentation/*.1) \
+         $(INSTALL) -m 0644 \
+               Documentation/*.1 \
                $(MANDIR)/man1
        [ ! -e Documentation/.docs-available ] || \
-         $(INSTALL) -o 0 -g 0 -m 0644 \
-               $(wildcard Documentation/*.html) \
+         $(INSTALL) -m 0644 \
+               Documentation/*.html \
                $(DOCDIR)
-       $(INSTALL) -o 0 -g 0 -m 0755 bup $(BINDIR)
-       $(INSTALL) -o 0 -g 0 -m 0755 \
-               $(wildcard cmd/bup-*) \
+       $(INSTALL) -m 0755 bup $(BINDIR)
+       $(INSTALL) -m 0755 \
+               cmd/bup-* \
                $(LIBDIR)/cmd
-       $(INSTALL) -o 0 -g 0 -m 0644 \
-               $(wildcard lib/bup/*.so lib/bup/*.py) \
+       $(INSTALL) -m 0644 \
+               lib/bup/*.py \
                $(LIBDIR)/bup
-       $(INSTALL) -o 0 -g 0 -m 0644 \
-               $(wildcard lib/tornado/*.py) \
+       $(INSTALL) -m 0755 \
+               lib/bup/*$(SOEXT) \
+               $(LIBDIR)/bup
+       $(INSTALL) -m 0644 \
+               lib/tornado/*.py \
                $(LIBDIR)/tornado
-       $(INSTALL) -o 0 -g 0 -m 0644 \
-               $(wildcard lib/web/*) \
+       $(INSTALL) -m 0644 \
+               lib/web/* \
                $(LIBDIR)/web
 %/all:
        $(MAKE) -C $* all
@@ -62,10 +65,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:
@@ -87,6 +91,8 @@ stupid:
 test: all
        ./wvtestrun $(MAKE) PYTHON=$(PYTHON) runtests
 
+check: test
+
 %: %.o
        $(CC) $(CFLAGS) (LDFLAGS) -o $@ $^ $(LIBS)
 
@@ -112,8 +118,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