Makefile: eliminate phony/duplicate bup target

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 1935d74b1465a2dc84d4c20f788d3450760f26b8..9b4678efdbaf2600d9c218b2d74c12fe16684f32 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)
@@ -17,7 +18,8 @@ default: all
 all: bup Documentation/all
        t/configure-sampledata --setup
 
-bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
+bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds main.py
+       ln -sf main.py bup
 
 Documentation/all: bup
 
@@ -88,18 +90,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-restore-exclude-rx.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:
@@ -110,10 +121,6 @@ test: all
 
 check: test
 
-bup: main.py
-       rm -f $@
-       ln -s $< $@
-
 cmds: \
     $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
     $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
@@ -143,13 +150,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)
 
@@ -168,17 +175,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 t/force-delete t/tmp; fi
        t/configure-sampledata --clean