From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giuseppe Scrivano Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Silence error if globals.h doesn't exist Date: Fri, 30 Jan 2015 19:45:07 +0100 Message-ID: <87mw50nm4s.fsf@redhat.com> References: <87wq44nt3f.fsf@redhat.com> <87r3ucgrb0.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422644173 24097 80.91.229.3 (30 Jan 2015 18:56:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 30 Jan 2015 18:56:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 30 19:56:13 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YHGjk-0003E5-JR for ged-emacs-devel@m.gmane.org; Fri, 30 Jan 2015 19:56:12 +0100 Original-Received: from localhost ([::1]:38318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHGjj-0004mY-Ti for ged-emacs-devel@m.gmane.org; Fri, 30 Jan 2015 13:56:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHGZC-0004vk-HY for emacs-devel@gnu.org; Fri, 30 Jan 2015 13:45:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHGZ8-0001UL-DR for emacs-devel@gnu.org; Fri, 30 Jan 2015 13:45:18 -0500 Original-Received: from mx1.redhat.com ([209.132.183.28]:42599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHGZ8-0001U9-5T for emacs-devel@gnu.org; Fri, 30 Jan 2015 13:45:14 -0500 Original-Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0UIjD7W017275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 30 Jan 2015 13:45:13 -0500 Original-Received: from foobarbaz (vpn1-7-76.ams2.redhat.com [10.36.7.76]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0UIj8j2026582 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Fri, 30 Jan 2015 13:45:10 -0500 In-Reply-To: <87r3ucgrb0.fsf@igel.home> (Andreas Schwab's message of "Fri, 30 Jan 2015 17:35:15 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:182086 Archived-At: Andreas Schwab writes: > Giuseppe Scrivano writes: > >> diff --git a/src/Makefile.in b/src/Makefile.in >> index 2ac34f5..cd661fb 100644 >> --- a/src/Makefile.in >> +++ b/src/Makefile.in >> @@ -498,7 +498,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) >> $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@ >> >> globals.h: gl-stamp >> - $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@ >> + $(AM_V_GEN)cmp $< $@ >/dev/null 2>&1 || cp $< $@ > > That should use move-if-change. thanks for the review, is OK something like the following? >From 52192756b0969a6f646c5b67206b5192edd153f7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 30 Jan 2015 17:09:37 +0100 Subject: [PATCH] Silence error if globals.h doesn't exist --- src/ChangeLog | 4 ++++ src/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2130312..735ebb2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2015-01-30 Giuseppe Scrivano + + * Makefile.in (globals.h): Redirect 'cmp' stderr to /dev/null. + 2015-01-30 Eli Zaretskii * dired.c (read_dirent): Accept an additional argument diff --git a/src/Makefile.in b/src/Makefile.in index 2ac34f5..45cc2f4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -498,7 +498,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@ globals.h: gl-stamp - $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@ + $(AM_V_GEN)${top_srcdir}/build-aux/move-if-change $< $@ $(ALLOBJS): globals.h -- 2.1.0