X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=Makefile;h=d96c149cb958b5dff7b8195212968216bac81002;hb=f07eb0cd7911559ffc47f4ad4ac9ddb49a0de678;hp=7dd7cdfa77d7d362c4c69803fefa844cd9fae553;hpb=938537c3a9bb76cfa7d62f931ffee0ff3359aa55;p=bup.git

diff --git a/Makefile b/Makefile
index 7dd7cdf..d96c149 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 
+MAKEFLAGS += --warn-undefined-variables
+
 SHELL := bash
 .DEFAULT_GOAL := all
 
 # See config/config.vars.in (sets bup_python, among other things)
-include config/config.vars
+-include config/config.vars
 
 pf := set -o pipefail
+cfg_py := $(CURDIR)/config/bin/python
 
 define isok
   && echo " ok" || echo " no"
@@ -39,33 +42,41 @@ else
   test_tmp := $(CURDIR)/t/tmp
 endif
 
-initial_setup := $(shell ./configure-version --update $(isok))
-initial_setup := $(call shout,$(initial_setup),Version configuration failed))
+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 \
+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.
-readline_cflags += $(shell pkg-config readline --cflags)
-readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
-readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
-ifneq ($(readline_xopen),600)
-  $(error "Unexpected pkg-config readline _XOPEN_SOURCE --cflags $(readline_cflags)")
+
+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
-readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
-readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
 
-CFLAGS += $(readline_cflags)
-LDFLAGS += $(shell pkg-config readline --libs)
+LDFLAGS += $(bup_readline_ldflags)
+
+ifeq ($(bup_have_libacl),1)
+  CFLAGS += $(bup_libacl_cflags)
+  LDFLAGS += $(bup_libacl_ldflags)
+endif
 
-bup_cmds := cmd/bup-python \
+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/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
+bup_deps := lib/bup/_helpers$(SOEXT) $(bup_cmds)
 
 all: $(bup_deps) Documentation/all $(current_sampledata)
 
@@ -106,7 +117,7 @@ install: all
 	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-* | grep -v cmd/bup-python); do \
+	for cmd in $$(ls cmd/bup-*); do \
 	  dev/install-python-script "$$cmd" "$(dest_libdir)/$$cmd"; \
 	done
 	cd "$(dest_bindir)" && \
@@ -124,6 +135,16 @@ install: all
 	$(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
+
+
+	    $(INSTALL) -pm 0644 lib/bup/checkout_info.py $(dest_libdir)/bup/; \
 
 config/config.h: config/config.vars
 
@@ -131,20 +152,12 @@ 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 && $(bup_python) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
+	cd lib/bup && $(cfg_py) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
         # Make sure there's just the one file we expect before we copy it.
-	"$(bup_python)" -c \
+	$(cfg_py) -c \
 	  "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
 	cp lib/bup/build/*/_helpers*$(SOEXT) "$@"
 
-lib/bup/_checkout.py:
-	@if grep -F '$Format' lib/bup/_release.py \
-	    && ! test -e lib/bup/_checkout.py; then \
-	  echo "Something has gone wrong; $@ should already exist."; \
-	  echo 'Check "./configure-version --update"'; \
-	  false; \
-	fi
-
 t/tmp:
 	mkdir t/tmp
 
@@ -175,6 +188,7 @@ runtests-python: all t/tmp
 	    | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
+  t/test-help \
   t/test.sh \
   t/test-argv \
   t/test-cat-file.sh \
@@ -253,9 +267,6 @@ check: test
 distcheck: all
 	./wvtest run t/test-release-archive.sh
 
-cmd/bup-python: config/config.var/bup-python
-	cd cmd && ln -sf "$$(< $(CURDIR)/config/config.var/bup-python)" bup-python
-
 long-test: export BUP_TEST_LEVEL=11
 long-test: test
 
@@ -264,10 +275,8 @@ long-check: check
 
 .PHONY: check-both
 check-both:
-	$(MAKE) clean \
-	  && PYTHON=python3 BUP_ALLOW_UNEXPECTED_PYTHON_VERSION=true $(MAKE) check
-	$(MAKE) clean \
-	  && PYTHON=python2 $(MAKE) check
+	$(MAKE) clean && PYTHON=python3 $(MAKE) check
+	$(MAKE) clean && PYTHON=python2 $(MAKE) check
 
 cmd/bup-%: cmd/%-cmd.py
 	rm -f $@
@@ -281,7 +290,7 @@ cmd/bup-%: cmd/%-cmd.sh
 Documentation/all: $(man_roff) $(man_html)
 
 Documentation/substvars: $(bup_deps)
-	echo "s,%BUP_VERSION%,$$(./bup version --tag),g" > $@
+	echo "s,%BUP_VERSION%,$$(./bup version),g" > $@
 	echo "s,%BUP_DATE%,$$(./bup version --date),g" >> $@
 
 Documentation/%.1: Documentation/%.md Documentation/substvars
@@ -313,13 +322,14 @@ 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 cmd/bup-python
+clean: Documentation/clean config/bin/python
+	cd config && rm -rf config.var
 	cd config && rm -f *~ .*~ \
 	  ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
-	cd config && rm -rf config.var
 	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 lib/bup/t/testfs.img
 	for x in $$(ls cmd/*-cmd.py cmd/*-cmd.sh | grep -vF python-cmd.sh | cut -b 5-); do \
@@ -333,7 +343,6 @@ clean: Documentation/clean cmd/bup-python
 	  then umount lib/bup/t/testfs || 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
-	./configure-version --clean
 	t/configure-sampledata --clean
         # Remove last so that cleanup tools can depend on it
-	rm -f cmd/bup-python
+	rm -rf config/bin