[Emacs-diffs] Changes to emacs/msdos/mainmake.v2 [lexbind]

[Miles Bader]

Index: emacs/msdos/mainmake.v2
diff -c emacs/msdos/mainmake.v2:1.31.2.2 emacs/msdos/mainmake.v2:1.31.2.3
*** emacs/msdos/mainmake.v2:1.31.2.2    Tue Oct 14 22:51:23 2003
--- emacs/msdos/mainmake.v2     Fri Nov 12 04:21:21 2004
***************
*** 21,27 ****
  # Boston, MA 02111-1307, USA.
  
  # make all    to compile and build Emacs.
! # make install        to install it.
  # make TAGS   to update tags tables.
  #
  # make clean  or  make mostlyclean
--- 21,27 ----
  # Boston, MA 02111-1307, USA.
  
  # make all    to compile and build Emacs.
! # make install        to install it (installs in-place, in `bin' subdir of 
top dir).
  # make TAGS   to update tags tables.
  #
  # make clean  or  make mostlyclean
***************
*** 40,50 ****
  #      `make distclean' should leave only the files that were in the
  #      distribution.
  #
! # make realclean
  #      Delete everything from the current directory that can be
  #      reconstructed with this Makefile.  This typically includes
! #      everything deleted by distclean, plus more: C source files
! #      produced by Bison, tags tables, info files, and so on.
  #
  # make extraclean
  #      Still more severe - delete backup and autosave files, too.
--- 40,51 ----
  #      `make distclean' should leave only the files that were in the
  #      distribution.
  #
! # make maintainer-clean
  #      Delete everything from the current directory that can be
  #      reconstructed with this Makefile.  This typically includes
! #      everything deleted by distclean, plus more: *.elc files,
! #      C source files produced by Bison, tags tables, info files,
! #      and so on.
  #
  # make extraclean
  #      Still more severe - delete backup and autosave files, too.
***************
*** 135,156 ****
  check:
        @echo "We don't have any tests for GNU Emacs yet."
  
! clean:
        cd lib-src
!       $(MAKE) clean
        cd ..
        cd src
!       $(MAKE) clean
        cd ..
        cd oldxmenu
!       -$(MAKE) clean
        cd ..
        cd leim
!       if exist Makefile redir $(MAKE) clean
        cd ..
  
! .PHONY: bootstrap bootstrap-lisp-1 boostrap-src bootstrap-lisp bootstrap-clean
! .PHONY: maybe_bootstrap
  
  maybe_bootstrap:
        @if not exist lisp\abbrev.elc djecho \
--- 136,224 ----
  check:
        @echo "We don't have any tests for GNU Emacs yet."
  
! clean mostlyclean:
        cd lib-src
!       $(MAKE) $(MFLAGS) $@
        cd ..
        cd src
!       $(MAKE) $(MFLAGS) $@
        cd ..
        cd oldxmenu
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd man
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lispref
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lispintro
!       -$(MAKE) $(MFLAGS) $@
        cd ..
        cd leim
!       if exist Makefile redir $(MAKE) $(MFLAGS) $@
        cd ..
+       -$(MAKE) $(MFLAGS) $@
  
! top_distclean=rm -f Makefile */Makefile src/_gdbinit
! 
! distclean maintainer-clean: FRC
!       cd src
!       $(MAKE) $(MFLAGS) $@
!       cd ..
!       cd oldxmenu
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lib-src
!       $(MAKE) $(MFLAGS) $@
!       cd ..
!       cd man
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lispref
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lispintro
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd leim
!       if exist Makefile redir $(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lisp
!       $(MAKE) $(MFLAGS) $@
!       cd ..
!       ${top_distclean}
! 
! extraclean:
!       cd src
!       $(MAKE) $(MFLAGS) $@
!       cd ..
!       cd oldxmenu
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lib-src
!       $(MAKE) $(MFLAGS) $@
!       cd ..
!       cd man
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lispref
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lispintro
!       -$(MAKE) $(MFLAGS) $@
!       cd ..
!       cd leim
!       if exist Makefile redir $(MAKE) $(MFLAGS) $@
!       cd ..
!       cd lisp
!       $(MAKE) $(MFLAGS) $@
!       cd ..
!       ${top_distclean}
!       -rm -f *~ #*
! 
! .PHONY: bootstrap bootstrap-lisp-1 bootstrap-src bootstrap-lisp 
bootstrap-clean
! .PHONY: maybe_bootstrap bootfast
  
  maybe_bootstrap:
        @if not exist lisp\abbrev.elc djecho \
***************
*** 158,163 ****
--- 226,235 ----
        @if not exist lisp\abbrev.elc redir -e /dev/null -oe redir 
fail-this-make.exe
  
  bootstrap: bootstrap-clean-before bootstrap-lisp-1 bootstrap-src 
bootstrap-lisp bootstrap-clean-after all info
+       cd lisp; $(MAKE) $(MFLAGS) bootstrap-after; cd ..
+ 
+ bootfast: bootstrap-clean-before bootstrap-src bootstrap-lisp 
bootstrap-clean-after all info
+       cd lisp; $(MAKE) $(MFLAGS) bootstrap-after; cd ..
  
  bootstrap-lisp-1:
        cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean; cd ..
***************
*** 172,178 ****
  bootstrap-clean-before: FRC
        cd src;      $(MAKE) $(MFLAGS) mostlyclean; cd ..
        cd lib-src;  $(MAKE) $(MFLAGS) clean;       cd ..
!       cd leim;     $(MAKE) $(MFLAGS) clean;       cd ..
  
  bootstrap-clean-after:
        cd src; $(MAKE) $(MFLAGS) mostlyclean; cd ..
--- 244,253 ----
  bootstrap-clean-before: FRC
        cd src;      $(MAKE) $(MFLAGS) mostlyclean; cd ..
        cd lib-src;  $(MAKE) $(MFLAGS) clean;       cd ..
!       -cd man;     $(MAKE) $(MFLAGS) clean;       cd ..
!       -cd lispref; $(MAKE) $(MFLAGS) clean;       cd ..
!       -cd lispintro; $(MAKE) $(MFLAGS) clean;     cd ..
!       cd leim;     if exist Makefile redir $(MAKE) $(MFLAGS) clean; cd ..
  
  bootstrap-clean-after:
        cd src; $(MAKE) $(MFLAGS) mostlyclean; cd ..