diff options
| author | Michael Albinus | 2012-12-04 17:56:04 +0100 |
|---|---|---|
| committer | Michael Albinus | 2012-12-04 17:56:04 +0100 |
| commit | 72cebfb7b1fc4169ba9594e4fb8540fe54c04dc9 (patch) | |
| tree | b220b778f02898550ceeca0c102440df824926c4 | |
| parent | 0ec3f7ead16c3fa7bbc08364bfe5fd6fa44d3de2 (diff) | |
| download | emacs-72cebfb7b1fc4169ba9594e4fb8540fe54c04dc9.tar.gz emacs-72cebfb7b1fc4169ba9594e4fb8540fe54c04dc9.zip | |
* Makefile.in (TRAMP_SRC):
* makefile.w32-in (TRAMP_SRC): Add tramp-adb.el.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 12 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 21 |
3 files changed, 22 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 849e9947754..1ff1491edf9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-04 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * Makefile.in (TRAMP_SRC): | ||
| 4 | * makefile.w32-in (TRAMP_SRC): Add tramp-adb.el. | ||
| 5 | |||
| 1 | 2012-12-04 Juergen Hoetzel <juergen@archlinux.org> | 6 | 2012-12-04 Juergen Hoetzel <juergen@archlinux.org> |
| 2 | 7 | ||
| 3 | * net/tramp-adb.el: New package. | 8 | * net/tramp-adb.el: New package. |
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 643b698c6e8..0b56dc8aec4 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -377,12 +377,12 @@ $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) | |||
| 377 | # an own subdirectory. OTOH, it does not hurt to keep them in | 377 | # an own subdirectory. OTOH, it does not hurt to keep them in |
| 378 | # lisp/net. | 378 | # lisp/net. |
| 379 | TRAMP_DIR = $(lisp)/net | 379 | TRAMP_DIR = $(lisp)/net |
| 380 | TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-cache.el \ | 380 | TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-adb.el \ |
| 381 | $(TRAMP_DIR)/tramp-cmds.el $(TRAMP_DIR)/tramp-compat.el \ | 381 | $(TRAMP_DIR)/tramp-cache.el $(TRAMP_DIR)/tramp-cmds.el \ |
| 382 | $(TRAMP_DIR)/tramp-ftp.el $(TRAMP_DIR)/tramp-gvfs.el \ | 382 | $(TRAMP_DIR)/tramp-compat.el $(TRAMP_DIR)/tramp-ftp.el \ |
| 383 | $(TRAMP_DIR)/tramp-gw.el $(TRAMP_DIR)/tramp-sh.el \ | 383 | $(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el \ |
| 384 | $(TRAMP_DIR)/tramp-smb.el $(TRAMP_DIR)/tramp-uu.el \ | 384 | $(TRAMP_DIR)/tramp-sh.el $(TRAMP_DIR)/tramp-smb.el \ |
| 385 | $(TRAMP_DIR)/trampver.el | 385 | $(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el |
| 386 | 386 | ||
| 387 | $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) | 387 | $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) |
| 388 | $(emacs) -l autoload \ | 388 | $(emacs) -l autoload \ |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 756d2b949fa..9f1b57e85b1 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -447,23 +447,24 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) $(lisp)/subdirs.el | |||
| 447 | $(ARGQUOTE)$(lisp)/mh-e/mh-loaddefs.el$(ARGQUOTE) $(MAKE) ./mh-e | 447 | $(ARGQUOTE)$(lisp)/mh-e/mh-loaddefs.el$(ARGQUOTE) $(MAKE) ./mh-e |
| 448 | 448 | ||
| 449 | # Update TRAMP internal autoloads. Maybe we could move tramp*.el into | 449 | # Update TRAMP internal autoloads. Maybe we could move tramp*.el into |
| 450 | # its own subdirectory. OTOH, it does not hurt to keep them in | 450 | # an own subdirectory. OTOH, it does not hurt to keep them in |
| 451 | # lisp/net. | 451 | # lisp/net. |
| 452 | TRAMP_SRC = $(lisp)/net/tramp.el $(lisp)/net/tramp-cache.el \ | 452 | TRAMP_DIR = $(lisp)/net |
| 453 | $(lisp)/net/tramp-cmds.el $(lisp)/net/tramp-compat.el \ | 453 | TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-adb.el \ |
| 454 | $(lisp)/net/tramp-ftp.el $(lisp)/net/tramp-gvfs.el \ | 454 | $(TRAMP_DIR)/tramp-cache.el $(TRAMP_DIR)/tramp-cmds.el \ |
| 455 | $(lisp)/net/tramp-gw.el $(lisp)/net/tramp-sh.el \ | 455 | $(TRAMP_DIR)/tramp-compat.el $(TRAMP_DIR)/tramp-ftp.el \ |
| 456 | $(lisp)/net/tramp-smb.el $(lisp)/net/tramp-uu.el \ | 456 | $(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el \ |
| 457 | $(lisp)/net/trampver.el | 457 | $(TRAMP_DIR)/tramp-sh.el $(TRAMP_DIR)/tramp-smb.el \ |
| 458 | 458 | $(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el | |
| 459 | $(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC) $(lisp)/subdirs.el | 459 | |
| 460 | $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) $(lisp)/subdirs.el | ||
| 460 | "$(EMACS)" $(EMACSOPT) \ | 461 | "$(EMACS)" $(EMACSOPT) \ |
| 461 | -l autoload \ | 462 | -l autoload \ |
| 462 | --eval $(ARGQUOTE)(setq generate-autoload-cookie $(DQUOTE);;;###tramp-autoload$(DQUOTE))$(ARGQUOTE) \ | 463 | --eval $(ARGQUOTE)(setq generate-autoload-cookie $(DQUOTE);;;###tramp-autoload$(DQUOTE))$(ARGQUOTE) \ |
| 463 | --eval $(ARGQUOTE)(setq find-file-suppress-same-file-warnings t)$(ARGQUOTE) \ | 464 | --eval $(ARGQUOTE)(setq find-file-suppress-same-file-warnings t)$(ARGQUOTE) \ |
| 464 | --eval $(ARGQUOTE)(setq make-backup-files nil)$(ARGQUOTE) \ | 465 | --eval $(ARGQUOTE)(setq make-backup-files nil)$(ARGQUOTE) \ |
| 465 | -f w32-batch-update-autoloads \ | 466 | -f w32-batch-update-autoloads \ |
| 466 | $(ARGQUOTE)$(lisp)/net/tramp-loaddefs.el$(ARGQUOTE) $(MAKE) ./net | 467 | $(ARGQUOTE)$(TRAMP_DIR)/tramp-loaddefs.el$(ARGQUOTE) $(MAKE) ./net |
| 467 | 468 | ||
| 468 | # Prepare a bootstrap in the lisp subdirectory. | 469 | # Prepare a bootstrap in the lisp subdirectory. |
| 469 | # | 470 | # |