* src/Makefile.in (gl-stamp): Create globals.h here.

(globals.h): Don't do it here.
(mostlyclean): Clean globals.h and gl-stamp.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0caac8d3e659885eb5a5cf3f05533472571bb0d1..270edc599269965740a873e05bf3fcefd9921990 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * Makefile.in (gl-stamp): Create globals.h here.
+       (globals.h): Don't do it here.
+       (mostlyclean): Clean globals.h and gl-stamp.
+
 2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        * Makefile.in ($(otherobj)): Depend on globals.h.

diff --git a/src/Makefile.in b/src/Makefile.in
index 4007d9e8a6207cbe97166a4519a01d06a8cd2e4e..4de8556a997002640d9d7f4af83674ef244d57b3 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -647,15 +647,15 @@ $(libsrc)/make-docfile$(EXEEXT):
 buildobj.h: Makefile
        echo "#define BUILDOBJ \"$(obj) $(otherobj) " "\"" > buildobj.h
 
-globals.h: gl-stamp
-       cp gl-stamp globals.h
+globals.h: gl-stamp; @true
 
 GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m)
 
 gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
        @rm -f gl-tmp
        $(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
-       $(srcdir)/../move-if-change gl-tmp gl-stamp
+       $(srcdir)/../move-if-change gl-tmp globals.h
+       echo timestamp > $@
 
 $(obj) $(otherobj): globals.h
 
@@ -713,6 +713,7 @@ mostlyclean:
        rm -f ../etc/DOC
        rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
        rm -f buildobj.h
+       rm -f globals.h gl-stamp
 clean: mostlyclean
        rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT)
        -rm -rf $(DEPDIR)