[Emacs-diffs] master 080b9b5: Don't reimplement move-if-change badly

[Andreas Schwab]

branch: master
commit 080b9b56c99cfdfa286fb6b8c3099626688dc8ae
Author: Andreas Schwab <address@hidden>
Commit: Andreas Schwab <address@hidden>

    Don't reimplement move-if-change badly
    
    * Makefile.in (gl-stamp): Generate globals.h through the use of
    move-if-change.
    (globals.h): Replace with empty command.
---
 src/ChangeLog   |    6 ++++++
 src/Makefile.in |   12 +++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 61d1067..6208738 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-31  Andreas Schwab  <address@hidden>
+
+       * Makefile.in (gl-stamp): Generate globals.h through the use of
+       move-if-change.
+       (globals.h): Replace with empty command.
+
 2015-01-31  Eli Zaretskii  <address@hidden>
 
        * keyboard.c (kbd_buffer_store_event_hold): Ignore FOCUS_OUT_EVENT
diff --git a/src/Makefile.in b/src/Makefile.in
index 2ac34f5..32615c8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -494,11 +494,17 @@ buildobj.h: Makefile
 
 GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m)
 
+AM_V_GLOBALS = $(address@hidden@)
+am__v_GLOBALS_ = $(address@hidden@)
+am__v_GLOBALS_0 = @echo "  GEN     " globals.h;
+am__v_GLOBALS_1 =
+
 gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
-       $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@
+       $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > 
globals.tmp
+       $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h
+       $(AM_V_at)echo timestamp > $@
 
-globals.h: gl-stamp
-       $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@
+globals.h: gl-stamp; @true
 
 $(ALLOBJS): globals.h