[Emacs-diffs] /srv/bzr/emacs/trunk r101425: Port tramp-related Makefile changes of revnos 101381, 101422 to Windows.

[Juanma Barranquero]

------------------------------------------------------------
revno: 101425
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-13 18:33:56 +0200
message:
  Port tramp-related Makefile changes of revnos 101381, 101422 to Windows.
  
  * makefile.w32-in (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
    (TRAMP_SRC): New macro.
    ($(lisp)/net/tramp-loaddefs.el): New target.
modified:
  lisp/ChangeLog
  lisp/makefile.w32-in

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-13 15:17:01 +0000
+++ b/lisp/ChangeLog    2010-09-13 16:33:56 +0000
@@ -1,3 +1,10 @@
+2010-09-13  Juanma Barranquero  <address@hidden>
+
+       Port tramp-related Makefile changes of revnos 101381, 101422 to Windows.
+       * makefile.w32-in (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
+       (TRAMP_SRC): New macro.
+       ($(lisp)/net/tramp-loaddefs.el): New target.
+
 2010-09-13  Michael Albinus  <address@hidden>
 
        Major code cleanup.  Split tramp.el into tramp.el and tramp-sh.el.

=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in      2010-08-22 21:15:20 +0000
+++ b/lisp/makefile.w32-in      2010-09-13 16:33:56 +0000
@@ -55,7 +55,7 @@
 # Automatically generated autoload files, apart from lisp/loaddefs.el.
 LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
        $(lisp)/calendar/diary-loaddefs.el $(lisp)/calendar/hol-loaddefs.el \
-       $(lisp)/mh-e/mh-loaddefs.el
+       $(lisp)/mh-e/mh-loaddefs.el $(lisp)/net/tramp-loaddefs.el
 
 AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \
        $(lisp)/finder-inf.el $(lisp)/subdirs.el $(lisp)/eshell/esh-groups.el \
@@ -403,6 +403,25 @@
           -f w32-batch-update-autoloads \
           $(ARGQUOTE)$(lisp)/mh-e/mh-loaddefs.el$(ARGQUOTE) $(MAKE) ./mh-e
 
+# Update TRAMP internal autoloads. Maybe we could move tramp*.el into
+# its own subdirectory. OTOH, it does not hurt to keep them in
+# lisp/net.
+TRAMP_SRC = $(lisp)/net/tramp.el  $(lisp)/net/tramp-cache.el  \
+       $(lisp)/net/tramp-cmds.el $(lisp)/net/tramp-compat.el \
+       $(lisp)/net/tramp-ftp.el  $(lisp)/net/tramp-gvfs.el   \
+       $(lisp)/net/tramp-gw.el   $(lisp)/net/tramp-imap.el   \
+       $(lisp)/net/tramp-sh.el   $(lisp)/net/tramp-smb.el    \
+       $(lisp)/net/tramp-uu.el   $(lisp)/net/trampver.el
+
+$(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC)
+       "$(EMACS)" $(EMACSOPT) \
+          -l autoload \
+          --eval $(ARGQUOTE)(setq generate-autoload-cookie 
$(DQUOTE);;;###tramp-autoload$(DQUOTE))$(ARGQUOTE) \
+          --eval $(ARGQUOTE)(setq find-file-suppress-same-file-warnings 
t)$(ARGQUOTE) \
+          --eval $(ARGQUOTE)(setq make-backup-files nil)$(ARGQUOTE) \
+          -f w32-batch-update-autoloads \
+          $(ARGQUOTE)$(lisp)/net/tramp-loaddefs.el$(ARGQUOTE) $(MAKE) ./net
+
 # Prepare a bootstrap in the lisp subdirectory.
 #
 # Build loaddefs.el to make sure it's up-to-date.  If it's not, that