diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0caac8d3e65..270edc59926 100644 --- 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 4007d9e8a62..4de8556a997 100644 --- 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) |