[PATCH] Silence error if globals.h doesn't exist

[PATCH] Silence error if globals.h doesn't exist

[Giuseppe Scrivano]

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 <gscrivano@gnu.org>
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  <gscrivano@gnu.org>
+
+	* Makefile.in (globals.h): Redirect 'cmp' stderr to /dev/null.
+
 2015-01-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* 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

Re: [PATCH] Silence error if globals.h doesn't exist

[Andreas Schwab]

Giuseppe Scrivano <gscrivano@gnu.org> 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.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] Silence error if globals.h doesn't exist

[Giuseppe Scrivano]

Andreas Schwab <schwab@linux-m68k.org> writes:

> Giuseppe Scrivano <gscrivano@gnu.org> 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 <gscrivano@gnu.org>
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  <gscrivano@gnu.org>
+
+	* Makefile.in (globals.h): Redirect 'cmp' stderr to /dev/null.
+
 2015-01-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* 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

Re: [PATCH] Silence error if globals.h doesn't exist

[Paul Eggert]

Andreas Schwab wrote:
> That should use move-if-change.

No, because move-if-change would remove gl-stamp, and the time stamp of the 
resulting globals.h would be older than the current time.  Neither objection is 
fatal, but other things being equal it's typically better for ordinary 'make' 
actions to not remove files named as Makefile targets, and to have these files' 
time stamps be when the files were created.

Re: [PATCH] Silence error if globals.h doesn't exist

[Andreas Schwab]

Paul Eggert <eggert@cs.ucla.edu> writes:

> Andreas Schwab wrote:
>> That should use move-if-change.
>
> No, because move-if-change would remove gl-stamp,

You need to rearrange the rules first, of course.  But reimplementing it
badly is never the right thing to do.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] Silence error if globals.h doesn't exist

[Giuseppe Scrivano]

Andreas Schwab <schwab@linux-m68k.org> writes:

> Paul Eggert <eggert@cs.ucla.edu> writes:
>
>> Andreas Schwab wrote:
>>> That should use move-if-change.
>>
>> No, because move-if-change would remove gl-stamp,
>
> You need to rearrange the rules first, of course.  But reimplementing it
> badly is never the right thing to do.

the cost of that would be to use an additional temporary file, right?
The solution with cmp and cp looks cleaner to me.

Regards,
Giuseppe