diff options
| author | Juanma Barranquero <[email protected]> | 2010-09-13 18:33:56 +0200 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2010-09-13 18:33:56 +0200 |
| commit | 5d921df2ed9d98a852c369fc31e0a3b8f2ea34d7 (patch) | |
| tree | d0d54b9fa67806cf6cd4d4a031004687830488b2 | |
| parent | 459bba37ea4e261ee09dc17673403bbfa52a9548 (diff) | |
Port tramp-related Makefile changes of 2010-09-08T14:42:[email protected], 2010-09-13T15:17:[email protected] to Windows.
* makefile.w32-in (LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
(TRAMP_SRC): New macro.
($(lisp)/net/tramp-loaddefs.el): New target.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 21 |
2 files changed, 27 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c216119fd0..0d7e47e9ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-09-13 Juanma Barranquero <[email protected]> + + Port tramp-related Makefile changes of 2010-09-08T14:42:[email protected], 2010-09-13T15:17:[email protected] 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 <[email protected]> Major code cleanup. Split tramp.el into tramp.el and tramp-sh.el. diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index df997b7658..43328a9e46 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -55,7 +55,7 @@ ETAGS = "../lib-src/$(BLD)/etags" # 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 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) -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 |