[beast] BUILD: upgrade extended distcheck rule to automake-1.11
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast] BUILD: upgrade extended distcheck rule to automake-1.11
- Date: Mon, 30 Aug 2010 23:49:01 +0000 (UTC)
commit 1b13b1707c565af212fa2d277d3e182f7a76d255
Author: Tim Janik <timj gtk org>
Date: Mon Aug 30 22:32:57 2010 +0200
BUILD: upgrade extended distcheck rule to automake-1.11
Makefile.am | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3b54fb4..2cfabec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,14 +73,17 @@ clean_filter = $(strip \
#distcleancheck_listfiles = find . -type f -print # original automake-1.11 setting
distcleancheck_listfiles = find . -type f $(patsubst ./%, ! -path \*/%, $(clean_filter)) -print
-# fixup automake-1.9.6 distcheck:-rule, which attempts to rebuild a dist tarball from within the test-build
-# also, bsescm currently needs install: before check:
+# extend automake-1.11 distcheck rule to make report.
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -92,13 +95,16 @@ distcheck: dist
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
+ test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) report \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -114,13 +120,15 @@ distcheck: dist
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
- && echo "DISABLED: $(MAKE) $(AM_MAKEFLAGS) dist" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
&& rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
# remove non-distributed po files from distributed POTFILES.in
dist-hook:
sed 's,^\(drivers/\),# \1,' < $(distdir)/po/POTFILES.in > $(distdir)/po/POTFILES.tmp
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]