[checkmk-commits] make dist needs more build artefacts

Module: check_mk Branch: master Commit: a38131dd95aed80ab92848064eaa56f96aecd176 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a38131dd95aed8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 10:47:01 2017 +0200 make dist needs more build artefacts Change-Id: I2ec31dcf22e6fcf7f6df6242f50f998fb91f6cc5 --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b46594f..737bd36 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,8 @@ BEAR := bear M4_DEPS := $(wildcard m4/*) configure.ac CONFIGURE_DEPS := $(M4_DEPS) aclocal.m4 +DIST_DEPS := ar-lib compile config.guess config.sub install-sh missing depcomp configure + LIVESTATUS_SOURCES := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ api/python/{README,*.py} {nagios,nagios4}/{README,*.h} \ @@ -190,12 +192,12 @@ check-version: # is currently not used by most distros # Would also use --exclude-vcs, but this is also not available # And --transform is also missing ... -dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in configure +dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) @EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \ for X in $$(git ls-files --directory --others -i --exclude-standard) ; do \ - if [[ $$X != aclocal.m4 && $$X != config.h.in && $$X != configure && $$X != $(DISTNAME).tar.gz ]]; then \ + if [[ $$X != aclocal.m4 && $$X != config.h.in && ! "$(DIST_DEPS)" =~ (^|[[:space:]])$$X($$|[[:space:]]) && $$X != $(DISTNAME).tar.gz ]]; then \ EXCLUDES+=" --exclude $${X%*/}" ; \ fi ; \ done ; \ @@ -407,7 +409,7 @@ setup: ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4 -config.status: ar-lib compile config.guess config.sub install-sh missing depcomp configure +config.status: $(DIST_DEPS) @if test -f config.status; then \ echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \