aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2011-02-09 18:04:43 +0100
committerAndreas Schwab2011-02-09 18:04:43 +0100
commit33cd3ee46b26307e4f0ccd2a622a736e05041a25 (patch)
tree82348af097f6b2ad4cbc27380fc89975fc596070
parent69b2604f776421c24c00b9e631558173d59eebee (diff)
downloademacs-33cd3ee46b26307e4f0ccd2a622a736e05041a25.tar.gz
emacs-33cd3ee46b26307e4f0ccd2a622a736e05041a25.zip
* src/Makefile.in (gl-stamp): Create globals.h here.
(globals.h): Don't do it here. (mostlyclean): Clean globals.h and gl-stamp.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.in7
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 @@
12011-02-09 Andreas Schwab <schwab@linux-m68k.org>
2
3 * Makefile.in (gl-stamp): Create globals.h here.
4 (globals.h): Don't do it here.
5 (mostlyclean): Clean globals.h and gl-stamp.
6
12011-02-09 Paul Eggert <eggert@cs.ucla.edu> 72011-02-09 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 * Makefile.in ($(otherobj)): Depend on globals.h. 9 * 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):
647buildobj.h: Makefile 647buildobj.h: Makefile
648 echo "#define BUILDOBJ \"$(obj) $(otherobj) " "\"" > buildobj.h 648 echo "#define BUILDOBJ \"$(obj) $(otherobj) " "\"" > buildobj.h
649 649
650globals.h: gl-stamp 650globals.h: gl-stamp; @true
651 cp gl-stamp globals.h
652 651
653GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) 652GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m)
654 653
655gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) 654gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
656 @rm -f gl-tmp 655 @rm -f gl-tmp
657 $(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp 656 $(libsrc)/make-docfile -d $(srcdir) -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
658 $(srcdir)/../move-if-change gl-tmp gl-stamp 657 $(srcdir)/../move-if-change gl-tmp globals.h
658 echo timestamp > $@
659 659
660$(obj) $(otherobj): globals.h 660$(obj) $(otherobj): globals.h
661 661
@@ -713,6 +713,7 @@ mostlyclean:
713 rm -f ../etc/DOC 713 rm -f ../etc/DOC
714 rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) 714 rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
715 rm -f buildobj.h 715 rm -f buildobj.h
716 rm -f globals.h gl-stamp
716clean: mostlyclean 717clean: mostlyclean
717 rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT) 718 rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT)
718 -rm -rf $(DEPDIR) 719 -rm -rf $(DEPDIR)