sampledata: use a local absolute symlink, not /etc

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 0e2fc90699c7c095422bd0253407a8aa54315aa4..1870a87533946d9d23b33ca2bd0ee5a6f93a07b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(OS),CYGWIN)
@@ -30,7 +31,7 @@ BINDIR=$(DESTDIR)$(PREFIX)/bin
 LIBDIR=$(DESTDIR)$(PREFIX)/lib/bup
 install: all
        $(INSTALL) -d $(MANDIR)/man1 $(DOCDIR) $(BINDIR) \
-               $(LIBDIR)/bup $(LIBDIR)/cmd $(LIBDIR)/tornado \
+               $(LIBDIR)/bup $(LIBDIR)/cmd \
                $(LIBDIR)/web $(LIBDIR)/web/static
        [ ! -e Documentation/.docs-available ] || \
          $(INSTALL) -m 0644 \
@@ -50,9 +51,6 @@ install: all
        $(INSTALL) -pm 0755 \
                lib/bup/*$(SOEXT) \
                $(LIBDIR)/bup
-       $(INSTALL) -pm 0644 \
-               lib/tornado/*.py \
-               $(LIBDIR)/tornado
        $(INSTALL) -pm 0644 \
                lib/web/static/* \
                $(LIBDIR)/web/static/
@@ -91,14 +89,27 @@ runtests-python: all
 
 runtests-cmdline: all
        test -e t/tmp || mkdir t/tmp
+       TMPDIR="$(test_tmp)" t/test-fuse.sh
+       TMPDIR="$(test_tmp)" t/test-drecurse.sh
        TMPDIR="$(test_tmp)" t/test-cat-file.sh
+       TMPDIR="$(test_tmp)" t/test-compression.sh
+       TMPDIR="$(test_tmp)" t/test-fsck.sh
+       TMPDIR="$(test_tmp)" t/test-index-clear.sh
        TMPDIR="$(test_tmp)" t/test-index-check-device.sh
+       TMPDIR="$(test_tmp)" t/test-ls.sh
        TMPDIR="$(test_tmp)" t/test-meta.sh
+       TMPDIR="$(test_tmp)" t/test-on.sh
        TMPDIR="$(test_tmp)" t/test-restore-map-owner.sh
        TMPDIR="$(test_tmp)" t/test-restore-single-file.sh
        TMPDIR="$(test_tmp)" t/test-rm-between-index-and-save.sh
+       TMPDIR="$(test_tmp)" t/test-sparse-files.sh
        TMPDIR="$(test_tmp)" t/test-command-without-init-fails.sh
        TMPDIR="$(test_tmp)" t/test-redundant-saves.sh
+       TMPDIR="$(test_tmp)" t/test-save-creates-no-unrefs.sh
+       TMPDIR="$(test_tmp)" t/test-save-restore-excludes.sh
+       TMPDIR="$(test_tmp)" t/test-save-strip-graft.sh
+       TMPDIR="$(test_tmp)" t/test-import-rdiff-backup.sh
+       TMPDIR="$(test_tmp)" t/test-xdev.sh
        TMPDIR="$(test_tmp)" t/test.sh
 
 stupid:
@@ -142,13 +153,13 @@ export-docs: Documentation/all
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.1 && \
        git update-ref refs/heads/man \
-               $$(echo "Autogenerated man pages for $$(git describe)" \
+               $$(echo "Autogenerated man pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/man) && \
        rm -f $${GIT_INDEX_FILE} && \
        git add -f Documentation/*.html && \
        git update-ref refs/heads/html \
-               $$(echo "Autogenerated html pages for $$(git describe)" \
+               $$(echo "Autogenerated html pages for $$(git describe --always)" \
                    | git commit-tree $$(git write-tree --prefix=Documentation) \
                                -p refs/heads/html)
 
@@ -167,17 +178,13 @@ clean: Documentation/clean config/clean
                .*~ *~ */*~ 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] \
                testfs.img lib/bup/t/testfs.img
-       umount t/mnt/* || true
+       if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
        if test -e t/mnt; then rm -r t/mnt; fi
+       if test -e t/tmp; then t/cleanup-mounts-under t/tmp; fi
         # FIXME: migrate these to t/mnt/
-       if test -e bupmeta.tmp/testfs; \
-         then umount bupmeta.tmp/testfs || true; fi
        if test -e lib/bup/t/testfs; \
          then umount lib/bup/t/testfs || true; fi
-       if test -e bupmeta.tmp/testfs-limited; \
-         then umount bupmeta.tmp/testfs-limited || true; fi
        rm -rf *.tmp *.tmp.meta t/*.tmp lib/*/*/*.tmp build lib/bup/build lib/bup/t/testfs
-       if test -e t/tmp; then rm -r t/tmp; fi
+       if test -e t/tmp; then t/force-delete t/tmp; fi
        t/configure-sampledata --clean