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: [PATCH] Silence error if globals.h doesn't exist Date: Fri, 30 Jan 2015 17:14:44 +0100 Message-ID: <87wq44nt3f.fsf@redhat.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422634511 18789 80.91.229.3 (30 Jan 2015 16:15:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 30 Jan 2015 16:15:11 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 30 17:15:11 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 1YHEDq-0001Fo-76 for ged-emacs-devel@m.gmane.org; Fri, 30 Jan 2015 17:15:06 +0100 Original-Received: from localhost ([::1]:37533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHEDp-000837-IJ for ged-emacs-devel@m.gmane.org; Fri, 30 Jan 2015 11:15:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHEDd-000832-2m for emacs-devel@gnu.org; Fri, 30 Jan 2015 11:14:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHEDY-0008KZ-Vc for emacs-devel@gnu.org; Fri, 30 Jan 2015 11:14:53 -0500 Original-Received: from mx1.redhat.com ([209.132.183.28]:37374) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHEDY-0008KV-Nm for emacs-devel@gnu.org; Fri, 30 Jan 2015 11:14:48 -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 t0UGElCv030617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 30 Jan 2015 11:14:48 -0500 Original-Received: from foobarbaz (vpn1-7-80.ams2.redhat.com [10.36.7.80]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0UGEjs6026742 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO) for ; Fri, 30 Jan 2015 11:14:46 -0500 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:182070 Archived-At: a trivial fix, introduced by commit "d703a4dce564ede122f5c307889e4bd0e3f3e75c" Just "run make clean && make" to see the error while building. Regards, Giuseppe >From 04619422fd84beb5abf63f3a990aaba38937b889 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..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 $< $@ $(ALLOBJS): globals.h -- 2.1.0