[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in

[Jason Rumney]

Index: emacs/lisp/makefile.w32-in
diff -c emacs/lisp/makefile.w32-in:1.48 emacs/lisp/makefile.w32-in:1.49
*** emacs/lisp/makefile.w32-in:1.48     Mon Oct 17 20:53:10 2005
--- emacs/lisp/makefile.w32-in  Mon Oct 17 21:08:06 2005
***************
*** 96,104 ****
  
  doit:
  
! cus-load.el:
        touch $@
! custom-deps: cus-load.el doit
        @echo Directories: $(WINS)
        -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook 
nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
  
--- 96,104 ----
  
  doit:
  
! $(lisp)/cus-load.el:
        touch $@
! custom-deps: $(lisp)/cus-load.el doit
        @echo Directories: $(WINS)
        -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook 
nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
  
***************
*** 106,112 ****
        @echo Directories: $(WINS)
        $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)
  
! loaddefs.el:
        $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE)
        cp loaddefs.el-$(SHELLTYPE) $@
        rm loaddefs.el-$(SHELLTYPE)
--- 106,112 ----
        @echo Directories: $(WINS)
        $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)
  
! $(lisp)/loaddefs.el:
        $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE)
        cp loaddefs.el-$(SHELLTYPE) $@
        rm loaddefs.el-$(SHELLTYPE)
***************
*** 139,145 ****
        echo (autoload 'define-derived-mode "derived")>> $@
        echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@
        echo (defvar cvs-global-menu nil)>> $@
!       echo ;;; >> $@
        echo ;;; Local Variables:>> $@
        echo ;;; version-control: never>> $@
        echo ;;; no-byte-compile: t>> $@
--- 139,145 ----
        echo (autoload 'define-derived-mode "derived")>> $@
        echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@
        echo (defvar cvs-global-menu nil)>> $@
!       echo.>> $@
        echo ;;; Local Variables:>> $@
        echo ;;; version-control: never>> $@
        echo ;;; no-byte-compile: t>> $@
***************
*** 147,153 ****
        echo ;;; End:>> $@
        echo ;;; loaddefs.el ends here>> $@
  
! autoloads: loaddefs.el doit
        @echo Directories: $(WINS)
        $(emacs) -l autoload \
                --eval $(ARGQUOTE)(setq find-file-hook nil \
--- 147,153 ----
        echo ;;; End:>> $@
        echo ;;; loaddefs.el ends here>> $@
  
! autoloads: $(lisp)/loaddefs.el doit
        @echo Directories: $(WINS)
        $(emacs) -l autoload \
                --eval $(ARGQUOTE)(setq find-file-hook nil \
***************
*** 156,174 ****
                          $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
                -f batch-update-autoloads $(lisp) $(WINS)
  
! subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs
  
  # Need separate version for sh and native cmd.exe
  update-subdirs: update-subdirs-$(SHELLTYPE)
  
  update-subdirs-CMD: doit
!       echo ;; -*- no-byte-compile: t -*->subdirs.el
!       echo ;; In load-path, after this directory should come>> subdirs.el
!       echo ;; certain of its subdirectories.  Here we specify them.>> 
subdirs.el
!       echo (normal-top-level-add-to-load-path $(SQUOTE)(>> subdirs.el
!       @for %%d in ($(WINS)) do if not (%%d)==(term) echo "%%d">> subdirs.el
!       echo ))>> subdirs.el
  
  update-subdirs-SH: doit
        $(srcdir)/update-subdirs $(lisp); \
--- 156,174 ----
                          $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
                -f batch-update-autoloads $(lisp) $(WINS)
  
! $(lisp)/subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs
  
  # Need separate version for sh and native cmd.exe
  update-subdirs: update-subdirs-$(SHELLTYPE)
  
  update-subdirs-CMD: doit
!       echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el
!       echo ;; In load-path, after this directory should come>> 
$(lisp)/subdirs.el
!       echo ;; certain of its subdirectories.  Here we specify them.>> 
$(lisp)/subdirs.el
!       echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el
!       @for %%d in ($(WINS)) do if not (%%d)==(term) echo "%%d">> 
$(lisp)/subdirs.el
!       echo ))>> $(lisp)/subdirs.el
  
  update-subdirs-SH: doit
        $(srcdir)/update-subdirs $(lisp); \
***************
*** 207,213 ****
  # compiled find the right files.
  
  # Need separate version for sh and native cmd.exe
! compile: subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
  
  compile-CMD:
  #     -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r 
%%g
--- 207,213 ----
  # compiled find the right files.
  
  # Need separate version for sh and native cmd.exe
! compile: $(lisp)/subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
  
  compile-CMD:
  #     -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r 
%%g
***************
*** 236,242 ****
  # unconditionally.  Some files don't actually get compiled because they
  # set the local variable no-byte-compile.
  
! compile-always: subdirs.el compile-always-$(SHELLTYPE) doit
  
  compile-always-CMD:
  #     -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r 
%%g
--- 236,242 ----
  # unconditionally.  Some files don't actually get compiled because they
  # set the local variable no-byte-compile.
  
! compile-always: $(lisp)/subdirs.el compile-always-$(SHELLTYPE) doit
  
  compile-always-CMD:
  #     -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r 
%%g
***************
*** 302,308 ****
  $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
        $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE)
        cp pre-mh-loaddefs.el-$(SHELLTYPE) $@
!       rm re-mh-loaddefs.el-$(SHELLTYPE)
        $(EMACS) $(EMACSOPT) \
           -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
--- 302,308 ----
  $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
        $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE)
        cp pre-mh-loaddefs.el-$(SHELLTYPE) $@
!       rm pre-mh-loaddefs.el-$(SHELLTYPE)
        $(EMACS) $(EMACSOPT) \
           -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
***************
*** 360,366 ****
  # sources only.
  
  # Need separate version for sh and native cmd.exe
! bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
  
  bootstrap-clean-CMD:
  #     if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
--- 360,366 ----
  # sources only.
  
  # Need separate version for sh and native cmd.exe
! bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el
  
  bootstrap-clean-CMD:
  #     if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads