Have 'make' output better GEN names

* lisp/Makefile.in (PHONY_EXTRAS): New macro.
(.PHONY): Depend on it, and on $(lisp)/loaddefs.el, so that the
relevant files' time stamps are ignored.
(custom-deps, $(lisp)/cus-load.el, finder-data)
($(lisp)/finder-inf.el): Use PHONY_EXTRAS.
(custom-deps, $(lisp)/cus-load.el, finder-data)
($(lisp)/finder-inf.el, autoloads, $(lisp)/loaddefs.el)
($(lisp)/subdirs.el, update-subdirs):
Output more-accurate destination names with GEN.
* src/Makefile.in (gl-stamp, globals.h): Simplify by putting the new
contents of globals.h into gl-stamp.  This lets us use AM_V_GEN
more naturally so that 'make' can output more-accurate names.

2 files changed, 11 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3767622836e..75e9ad51835 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Have 'make' output better GEN names
+        * Makefile.in (gl-stamp, globals.h): Simplify by putting the new
+        contents of globals.h into gl-stamp.  This lets us use AM_V_GEN
+        more naturally so that 'make' can output more-accurate names.
+
 2015-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * buffer.c (init_buffer_once): Initialize buffer_local_flags before
diff --git a/src/Makefile.in b/src/Makefile.in
index a2754eadacd..2ac34f5c44d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -492,14 +492,13 @@ buildobj.h: Makefile
         done >$@.tmp
         $(AM_V_at)mv $@.tmp $@
 
-globals.h: gl-stamp; @true
-
 GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m)
 
 gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
-        $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp
-        $(AM_V_at)$(top_srcdir)/build-aux/move-if-change gl.tmp globals.h
-        $(AM_V_at)echo timestamp > $@
+        $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) >$@
+
+globals.h: gl-stamp
+        $(AM_V_GEN)cmp $< $@ >/dev/null || cp $< $@
 
 $(ALLOBJS): globals.h