X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=bup.git;a=blobdiff_plain;f=Makefile;h=c4e74b59ed94e5c279b2f4a7f891f53fe3a8ce6b;hp=270653c777153b787d9dda39c30134ad4d8126ad;hb=HEAD;hpb=51369249eb13f732a07368defbd27b06cb0ed5e3

diff --git a/Makefile b/Makefile
index 270653c..e7f6ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,326 +1,15 @@
 
-MAKEFLAGS += --warn-undefined-variables
+# Redirect to GNU make
 
-SHELL := bash
-.DEFAULT_GOAL := all
+.SUFFIXES:
 
-# See config/config.vars.in (sets bup_python, among other things)
--include config/config.vars
+default: config/finished
+	config/bin/make
 
-pf := set -o pipefail
-cfg_py := $(CURDIR)/config/bin/python
+.DEFAULT:
+	$(MAKE) config/finished
+	config/bin/make $(.TARGETS)
 
-define isok
-  && echo " ok" || echo " no"
-endef
-
-# If ok, strip trailing " ok" and return the output, otherwise, error
-define shout
-$(if $(subst ok,,$(lastword $(1))),$(error $(2)),$(shell x="$(1)"; echo $${x%???}))
-endef
-
-sampledata_rev := $(shell dev/configure-sampledata --revision $(isok))
-sampledata_rev := \
-  $(call shout,$(sampledata_rev),Could not parse sampledata revision)
-
-current_sampledata := test/sampledata/var/rev/v$(sampledata_rev)
-
-os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
-os := $(call shout,$(os),Unable to determine OS)
-
-CFLAGS := -O2 -Wall -Werror -Wformat=2 $(CFLAGS)
-CFLAGS := -Wno-unknown-pragmas -Wsign-compare $(CFLAGS)
-CFLAGS := -D_FILE_OFFSET_BITS=64 $(PYINCLUDE) $(CFLAGS)
-SOEXT:=.so
-
-ifeq ($(os),CYGWIN)
-  SOEXT:=.dll
-endif
-
-ifdef TMPDIR
-  test_tmp := $(TMPDIR)
-else
-  test_tmp := $(CURDIR)/test/tmp
-endif
-
-initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
-initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
-
-config/config.vars: \
-  configure config/configure config/configure.inc \
-  $(wildcard config/*.in)
-	MAKE="$(MAKE)" ./configure
-
-# On some platforms, Python.h and readline.h fight over the
-# _XOPEN_SOURCE version, i.e. -Werror crashes on a mismatch, so for
-# now, we're just going to let Python's version win.
-
-ifneq ($(strip $(bup_readline_cflags)),)
-  readline_cflags += $(bup_readline_cflags)
-  readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
-  readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
-  readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
-  readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
-  CFLAGS += $(readline_cflags)
-endif
-
-LDFLAGS += $(bup_readline_ldflags)
-
-ifeq ($(bup_have_libacl),1)
-  CFLAGS += $(bup_libacl_cflags)
-  LDFLAGS += $(bup_libacl_ldflags)
-endif
-
-config/bin/python: config/config.vars
-
-bup_cmds := \
-  $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
-  $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
-
-bup_deps := lib/bup/_helpers$(SOEXT) $(bup_cmds)
-
-all: $(bup_deps) Documentation/all $(current_sampledata)
-
-$(current_sampledata):
-	dev/configure-sampledata --setup
-
-PANDOC ?= $(shell type -p pandoc)
-
-ifeq (,$(PANDOC))
-  $(shell echo "Warning: pandoc not found; skipping manpage generation" 1>&2)
-  man_md :=
-else
-  man_md := $(wildcard Documentation/*.md)
-endif
-
-man_roff := $(patsubst %.md,%.1,$(man_md))
-man_html := $(patsubst %.md,%.html,$(man_md))
-
-INSTALL=install
-PREFIX=/usr/local
-MANDIR=$(PREFIX)/share/man
-DOCDIR=$(PREFIX)/share/doc/bup
-BINDIR=$(PREFIX)/bin
-LIBDIR=$(PREFIX)/lib/bup
-
-dest_mandir := $(DESTDIR)$(MANDIR)
-dest_docdir := $(DESTDIR)$(DOCDIR)
-dest_bindir := $(DESTDIR)$(BINDIR)
-dest_libdir := $(DESTDIR)$(LIBDIR)
-
-install: all
-	$(INSTALL) -d $(dest_bindir) \
-		$(dest_libdir)/bup $(dest_libdir)/cmd \
-		$(dest_libdir)/web $(dest_libdir)/web/static
-	test -z "$(man_roff)" || install -d $(dest_mandir)/man1
-	test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1
-	test -z "$(man_html)" || install -d $(dest_docdir)
-	test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_html) $(dest_docdir)
-	dev/install-python-script lib/cmd/bup "$(dest_libdir)/cmd/bup"
-	set -e; \
-	for cmd in $$(ls cmd/bup-*); do \
-	  dev/install-python-script "$$cmd" "$(dest_libdir)/$$cmd"; \
-	done
-	cd "$(dest_bindir)" && \
-	  ln -sf "$$($(bup_python) -c 'import os; print(os.path.relpath("$(abspath $(dest_libdir))/cmd/bup"))')"
-	set -e; \
-	$(INSTALL) -pm 0644 \
-		lib/bup/*.py \
-		$(dest_libdir)/bup
-	$(INSTALL) -pm 0755 \
-		lib/bup/*$(SOEXT) \
-		$(dest_libdir)/bup
-	$(INSTALL) -pm 0644 \
-		lib/web/static/* \
-		$(dest_libdir)/web/static/
-	$(INSTALL) -pm 0644 \
-		lib/web/*.html \
-		$(dest_libdir)/web/
-	if test -e lib/bup/checkout_info.py; then \
-	    $(INSTALL) -pm 0644 lib/bup/checkout_info.py \
-	        $(dest_libdir)/bup/source_info.py; \
-	else \
-	    ! grep -qF '$$Format' lib/bup/source_info.py; \
-	    $(INSTALL) -pm 0644 lib/bup/source_info.py $(dest_libdir)/bup/; \
-	fi
-
-config/config.h: config/config.vars
-
-lib/bup/_helpers$(SOEXT): \
-		config/config.h lib/bup/bupsplit.h \
-		lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
-	@rm -f $@
-	cd lib/bup && $(cfg_py) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
-        # Make sure there's just the one file we expect before we copy it.
-	$(cfg_py) -c \
-	  "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
-	cp lib/bup/build/*/_helpers*$(SOEXT) "$@"
-
-test/tmp:
-	mkdir test/tmp
-
-runtests: runtests-python runtests-cmdline
-
-runtests-python: all test/tmp
-	./pytest
-
-cmdline_tests := \
-  test/ext/test.sh \
-  test/ext/test-argv \
-  test/ext/test-cat-file.sh \
-  test/ext/test-command-without-init-fails.sh \
-  test/ext/test-compression.sh \
-  test/ext/test-drecurse.sh \
-  test/ext/test-fsck.sh \
-  test/ext/test-fuse.sh \
-  test/ext/test-ftp \
-  test/ext/test-help \
-  test/ext/test-web.sh \
-  test/ext/test-gc.sh \
-  test/ext/test-import-duplicity.sh \
-  test/ext/test-import-rdiff-backup.sh \
-  test/ext/test-index.sh \
-  test/ext/test-index-check-device.sh \
-  test/ext/test-index-clear.sh \
-  test/ext/test-list-idx.sh \
-  test/ext/test-ls \
-  test/ext/test-ls-remote \
-  test/ext/test-main.sh \
-  test/ext/test-meta.sh \
-  test/ext/test-on.sh \
-  test/ext/test-packsizelimit \
-  test/ext/test-prune-older \
-  test/ext/test-redundant-saves.sh \
-  test/ext/test-restore-map-owner.sh \
-  test/ext/test-restore-single-file.sh \
-  test/ext/test-rm.sh \
-  test/ext/test-rm-between-index-and-save.sh \
-  test/ext/test-save-creates-no-unrefs.sh \
-  test/ext/test-save-restore \
-  test/ext/test-save-errors \
-  test/ext/test-save-restore-excludes.sh \
-  test/ext/test-save-strip-graft.sh \
-  test/ext/test-save-with-valid-parent.sh \
-  test/ext/test-sparse-files.sh \
-  test/ext/test-split-join.sh \
-  test/ext/test-tz.sh \
-  test/ext/test-xdev.sh
-
-tmp-target-run-test-get-%: all test/tmp
-	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-	  test/ext/test-get $* 2>&1 | tee -a test/tmp/test-log/$$$$.log
-
-test_get_targets += \
-  tmp-target-run-test-get-replace \
-  tmp-target-run-test-get-universal \
-  tmp-target-run-test-get-ff \
-  tmp-target-run-test-get-append \
-  tmp-target-run-test-get-pick \
-  tmp-target-run-test-get-new-tag \
-  tmp-target-run-test-get-unnamed
-
-# For parallel runs.
-# The "pwd -P" here may not be appropriate in the long run, but we
-# need it until we settle the relevant drecurse/exclusion questions:
-# https://groups.google.com/forum/#!topic/bup-list/9ke-Mbp10Q0
-tmp-target-run-test%: all test/tmp
-	$(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
-	  test/ext/test$* 2>&1 | tee -a test/tmp/test-log/$$$$.log
-
-runtests-cmdline: $(test_get_targets) $(subst test/ext/test,tmp-target-run-test,$(cmdline_tests))
-
-stupid:
-	PATH=/bin:/usr/bin $(MAKE) test
-
-test: all
-	if test -e test/tmp/test-log; then rm -r test/tmp/test-log; fi
-	mkdir -p test/tmp/test-log
-	$(MAKE) runtests-python
-	./wvtest watch --no-counts \
-	  $(MAKE) runtests-cmdline 2>test/tmp/test-log/$$$$.log
-	./wvtest report test/tmp/test-log/*.log
-
-check: test
-
-distcheck: all
-	./wvtest run test/ext/test-release-archive.sh
-
-long-test: export BUP_TEST_LEVEL=11
-long-test: test
-
-long-check: export BUP_TEST_LEVEL=11
-long-check: check
-
-.PHONY: check-both
-check-both:
-	$(MAKE) clean && PYTHON=python3 $(MAKE) check
-	$(MAKE) clean && PYTHON=python2 $(MAKE) check
-
-cmd/bup-%: cmd/%-cmd.py
-	rm -f $@
-	ln -s $*-cmd.py $@
-
-cmd/bup-%: cmd/%-cmd.sh
-	rm -f $@
-	ln -s $*-cmd.sh $@
-
-.PHONY: Documentation/all
-Documentation/all: $(man_roff) $(man_html)
-
-Documentation/substvars: $(bup_deps)
-	echo "s,%BUP_VERSION%,$$(./bup version),g" > $@
-	echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@
-
-Documentation/%.1: Documentation/%.md Documentation/substvars
-	$(pf); sed -f Documentation/substvars $< \
-	  | $(PANDOC) -s -r markdown -w man -o $@
-
-Documentation/%.html: Documentation/%.md Documentation/substvars
-	$(pf); sed -f Documentation/substvars $< \
-	  | $(PANDOC) -s -r markdown -w html -o $@
-
-.PHONY: Documentation/clean
-Documentation/clean:
-	cd Documentation && rm -f *~ .*~ *.[0-9] *.html substvars
-
-# Note: this adds commits containing the current manpages in roff and
-# html format to the man and html branches respectively.  The version
-# is determined by "git describe --always".
-.PHONY: update-doc-branches
-update-doc-branches: Documentation/all
-	dev/update-doc-branches refs/heads/man refs/heads/html
-
-# push the pregenerated doc files to origin/man and origin/html
-push-docs: export-docs
-	git push origin man html
-
-# import pregenerated doc files from origin/man and origin/html, in case you
-# don't have pandoc but still want to be able to install the docs.
-import-docs: Documentation/clean
-	$(pf); git archive origin/html | (cd Documentation && tar -xvf -)
-	$(pf); git archive origin/man | (cd Documentation && tar -xvf -)
-
-clean: Documentation/clean config/bin/python
-	cd config && rm -rf config.var
-	cd config && rm -f *~ .*~ \
-	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
-	rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
-		.*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
-		*.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
-		lib/bup/checkout_info.py \
-		randomgen memtest \
-		testfs.img test/int/testfs.img
-	for x in $$(ls cmd/*-cmd.py cmd/*-cmd.sh | grep -vF python-cmd.sh | cut -b 5-); do \
-	    echo "cmd/bup-$${x%-cmd.*}"; \
-	done | xargs -t rm -f
-	if test -e test/mnt; then dev/cleanup-mounts-under test/mnt; fi
-	if test -e test/mnt; then rm -r test/mnt; fi
-	if test -e test/tmp; then dev/cleanup-mounts-under test/tmp; fi
-        # FIXME: migrate these to test/mnt/
-	if test -e test/int/testfs; \
-	  then umount test/int/testfs || true; fi
-	rm -rf *.tmp *.tmp.meta test/*.tmp lib/*/*/*.tmp build lib/bup/build test/int/testfs
-	if test -e test/tmp; then dev/force-delete test/tmp; fi
-	dev/configure-sampledata --clean
-        # Remove last so that cleanup tools can depend on it
-	rm -rf config/bin
+# Dependency changes here should be mirrored in GNUmakefile
+config/finished: configure config/configure config/configure.inc config/*.in
+	MAKE= ./configure