cmd/memtest: use getrusage() instead of /proc/self/stat.

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index a555114c3a4e097ea3662fd5ed32122f4d964e59..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
 
@@ -37,24 +37,27 @@ install: all
                $(LIBDIR)/web
        [ ! -e Documentation/.docs-available ] || \
          $(INSTALL) -m 0644 \
-               $(wildcard Documentation/*.1) \
+               Documentation/*.1 \
                $(MANDIR)/man1
        [ ! -e Documentation/.docs-available ] || \
          $(INSTALL) -m 0644 \
-               $(wildcard Documentation/*.html) \
+               Documentation/*.html \
                $(DOCDIR)
        $(INSTALL) -m 0755 bup $(BINDIR)
        $(INSTALL) -m 0755 \
-               $(wildcard cmd/bup-*) \
+               cmd/bup-* \
                $(LIBDIR)/cmd
        $(INSTALL) -m 0644 \
-               $(wildcard lib/bup/*.so lib/bup/*.py) \
+               lib/bup/*.py \
+               $(LIBDIR)/bup
+       $(INSTALL) -m 0755 \
+               lib/bup/*$(SOEXT) \
                $(LIBDIR)/bup
        $(INSTALL) -m 0644 \
-               $(wildcard lib/tornado/*.py) \
+               lib/tornado/*.py \
                $(LIBDIR)/tornado
        $(INSTALL) -m 0644 \
-               $(wildcard lib/web/*) \
+               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: