From patchwork Fri Apr 5 10:19:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 234101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id EB5FD2C00A4 for ; Fri, 5 Apr 2013 21:19:57 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:reply-to:mime-version:content-type; q=dns; s=default; b=LRCUhfUjZLMmiCvatQYyksOtGbxfYp1TJhNCn9XNlEX bjUV+VEuO1iHrN+266TWW6WQzCuNmTxdKrXaLvTch2V2485gnSvWXnzKnfP5CEqq DIsZOlBxGBsIiRRwNxXTwwQ3EAOEq+oQ0+iQB74J7mRTcc7rUT8BMFQYFTn0orqo = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:reply-to:mime-version:content-type; s=default; bh=nRYuI7SXEzFd9VeHcCx49AG+EVo=; b=hL20e87CUNiYCOakO 6V7cbDCN7uKF3RWO2YM46wikKN24KSChwB30EwtArbOdO6FU8yTq+G0sXjerhCnl AKFh3uWYO2LmDpj8Nf/O0faHl3UmP3CwbYK7ry++ShPWOmPm8w9S+qZEUko8bzwm 16qzRp2y1pVwxYVuwTtO+DXpOk= Received: (qmail 11047 invoked by alias); 5 Apr 2013 10:19:48 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 11038 invoked by uid 89); 5 Apr 2013 10:19:47 -0000 X-Spam-SWARE-Status: No, score=-7.6 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 05 Apr 2013 10:19:45 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r35AJiKG026700 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 5 Apr 2013 06:19:44 -0400 Received: from zalov.cz (vpn1-5-203.ams2.redhat.com [10.36.5.203]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r35AJgar019057 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 5 Apr 2013 06:19:43 -0400 Received: from zalov.cz (localhost [127.0.0.1]) by zalov.cz (8.14.5/8.14.5) with ESMTP id r35AJf64021184 for ; Fri, 5 Apr 2013 12:19:41 +0200 Received: (from jakub@localhost) by zalov.cz (8.14.5/8.14.5/Submit) id r35AJfuH021183 for gcc-patches@gcc.gnu.org; Fri, 5 Apr 2013 12:19:41 +0200 Date: Fri, 5 Apr 2013 12:19:41 +0200 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [committed] Another no-dist case (in 4.6 this time) (PR other/43620) Message-ID: <20130405101940.GC20334@tucnak.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Hi! I've noticed another place where distdir: goal was present, in boehm-gc/include/Makefile.in on 4.6 branch. Fixed thusly, committed to 4.6. 2013-04-05 Jakub Jelinek PR other/43620 * Makefile.am (AUTOMAKE_OPTIONS): Add no-dist. * include/Makefile.am (AUTOMAKE_OPTIONS): Likewise. * Makefile.in: Regenerated. * include/Makefile.in: Regenerated. Jakub --- boehm-gc/Makefile.am (revision 197510) +++ boehm-gc/Makefile.am (working copy) @@ -4,7 +4,7 @@ ## files that should be in the distribution are not mentioned in this ## Makefile.am. -AUTOMAKE_OPTIONS = cygnus subdir-objects +AUTOMAKE_OPTIONS = cygnus subdir-objects no-dist ACLOCAL_AMFLAGS = -I .. -I ../config SUBDIRS = include --- boehm-gc/include/Makefile.am (revision 197510) +++ boehm-gc/include/Makefile.am (working copy) @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign no-dist noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ gc_pthread_redirects.h gc_cpp.h --- boehm-gc/Makefile.in (revision 197510) +++ boehm-gc/Makefile.in (working copy) @@ -283,7 +283,7 @@ toolexeclibdir = @toolexeclibdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = cygnus subdir-objects +AUTOMAKE_OPTIONS = cygnus subdir-objects no-dist ACLOCAL_AMFLAGS = -I .. -I ../config SUBDIRS = include noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la --- boehm-gc/include/Makefile.in (revision 197510) +++ boehm-gc/include/Makefile.in (working copy) @@ -36,9 +36,9 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = include -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gc_config.h.in \ - $(srcdir)/gc_ext_config.h.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/gc_config.h.in $(srcdir)/gc_ext_config.h.in \ + $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ @@ -55,11 +55,9 @@ CONFIG_HEADER = gc_config.h gc_ext_confi CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = -DIST_SOURCES = HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CPPFLAGS = @AM_CPPFLAGS@ @@ -199,7 +197,7 @@ toolexeclibdir = @toolexeclibdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign no-dist noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ gc_pthread_redirects.h gc_cpp.h @@ -322,37 +320,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done check-am: all-am check: check-am all-am: Makefile $(HEADERS) gc_config.h gc_ext_config.h @@ -452,16 +419,15 @@ uninstall-am: .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am + distclean-libtool distclean-tags dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables.