2013-07-23 22:57:17 +00:00
|
|
|
### @configure_input@
|
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
# Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
2001-02-20 13:36:21 +00:00
|
|
|
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
2001-02-20 13:36:21 +00:00
|
|
|
# it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
2001-02-20 13:36:21 +00:00
|
|
|
|
|
|
|
# GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1999-10-07 23:29:39 +00:00
|
|
|
|
2013-08-28 06:01:52 +00:00
|
|
|
SHELL = @SHELL@
|
2000-06-15 16:10:25 +00:00
|
|
|
|
2010-03-21 11:57:49 +00:00
|
|
|
srcdir = @srcdir@
|
|
|
|
top_srcdir = @top_srcdir@
|
|
|
|
lisp = $(srcdir)
|
|
|
|
VPATH = $(srcdir)
|
2000-06-14 20:26:14 +00:00
|
|
|
|
2013-04-14 15:05:42 +00:00
|
|
|
# Empty for all systems except MinGW, where xargs needs an explicit
|
|
|
|
# limitation.
|
|
|
|
XARGS_LIMIT = @XARGS_LIMIT@
|
|
|
|
|
1999-10-07 23:29:39 +00:00
|
|
|
# You can specify a different executable on the make command line,
|
|
|
|
# e.g. "make EMACS=../src/emacs ...".
|
|
|
|
|
2013-11-02 20:05:15 +00:00
|
|
|
# We never change directory before running Emacs, so a relative file
|
|
|
|
# name is fine, and makes life easier. If we need to change
|
|
|
|
# directory, we can use emacs --chdir.
|
|
|
|
EMACS = ../src/emacs
|
1999-10-07 23:29:39 +00:00
|
|
|
|
2010-08-22 21:15:20 +00:00
|
|
|
# Command line flags for Emacs.
|
1999-10-07 23:29:39 +00:00
|
|
|
|
2011-01-07 03:10:39 +00:00
|
|
|
EMACSOPT = -batch --no-site-file --no-site-lisp
|
1999-10-07 23:29:39 +00:00
|
|
|
|
2007-10-29 18:32:32 +00:00
|
|
|
# Extra flags to pass to the byte compiler
|
2008-07-24 21:56:29 +00:00
|
|
|
BYTE_COMPILE_EXTRA_FLAGS =
|
2007-10-29 18:32:32 +00:00
|
|
|
# For example to not display the undefined function warnings you can use this:
|
|
|
|
# BYTE_COMPILE_EXTRA_FLAGS = --eval '(setq byte-compile-warnings (quote (not unresolved)))'
|
|
|
|
# The example above is just for developers, it should not be used by default.
|
|
|
|
|
2008-03-13 06:05:25 +00:00
|
|
|
# Automatically generated autoload files, apart from lisp/loaddefs.el.
|
2008-04-10 03:40:06 +00:00
|
|
|
# Note this includes only those files that need special rules to
|
|
|
|
# build; ie it does not need to include things created via
|
|
|
|
# generated-autoload-file (eg calc/calc-loaddefs.el).
|
2008-03-13 06:05:25 +00:00
|
|
|
LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
|
2008-04-05 18:52:02 +00:00
|
|
|
$(lisp)/calendar/diary-loaddefs.el \
|
|
|
|
$(lisp)/calendar/hol-loaddefs.el \
|
Migrate to Tramp 2.2. Rearrange load dependencies.
(Bug#1529, Bug#5448, Bug#5705)
* Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
($(TRAMP_DIR)/tramp-loaddefs.el): New target.
(LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
* net/tramp.el (top): Remove all other tramp-* loads except
tramp-compat.el. Remove all changes to tramp-unload-hook for
other tramp-* packages. Rearrange defun order. Change calls of
`tramp-compat-call-process', `tramp-compat-decimal-to-octal',
`tramp-compat-octal-to-decimal' to new function names.
(tramp-terminal-type, tramp-initial-end-of-output)
(tramp-methods, tramp-foreign-file-name-handler-alist)
(tramp-tramp-file-p, tramp-completion-mode-p)
(tramp-send-command-and-check, tramp-get-remote-path)
(tramp-get-remote-tmpdir, tramp-get-remote-ln)
(tramp-shell-quote-argument): Set tramp-autoload cookie.
(with-file-property, with-connection-property): Move to
tramp-cache.el.
(tramp-local-call-process, tramp-decimal-to-octal)
(tramp-octal-to-decimal): Move to tramp-compat.el.
(tramp-handle-shell-command): Do not require 'shell.
(tramp-compute-multi-hops): No special handling for tramp-gw-*
symbols.
(tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
* net/tramp-cache.el (top): Require 'tramp. Add to
`tramp-unload-hook'.
(tramp-cache-data, tramp-get-file-property)
(tramp-set-file-property, tramp-flush-file-property)
(tramp-flush-directory-property, tramp-get-connection-property)
(tramp-set-connection-property, tramp-flush-connection-property)
(tramp-cache-print, tramp-list-connections): Set tramp-autoload
cookie.
(with-file-property, with-connection-property): New defuns, moved
from tramp.el.
(tramp-flush-file-function): Use `with-parsed-tramp-file-name'
macro.
* net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
(tramp-version): Set tramp-autoload cookie.
* net/tramp-compat.el (top): Require 'tramp-loaddefs. Remove all
changes to tramp-unload-hook for other tramp-* packages. Add to
`tramp-unload-hook'.
(tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
(tramp-compat-call-process): New defuns, moved from tramp.el.
* net/tramp-fish.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change call of
`tramp-compat-decimal-to-octal' to new function name.
(tramp-fish-method): Make it a defconst.
(tramp-fish-file-name-p): Make it a defsubst.
(tramp-fish-method, tramp-fish-file-name-handler)
(tramp-fish-file-name-p): Set tramp-autoload cookie.
* net/tramp-ftp.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-ftp-method): Make it a defconst.
(tramp-ftp-file-name-p): Make it a defsubst.
(tramp-ftp-method, tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p): Set tramp-autoload cookie.
* net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-gvfs-file-name-p): Make it a defsubst.
(tramp-gvfs-methods, tramp-gvfs-file-name-handler)
(tramp-gvfs-file-name-p): Set tramp-autoload cookie.
(tramp-gvfs-handle-file-directory-p): New defun.
(tramp-gvfs-file-name-handler-alist): Use it.
* net/tramp-gw.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
(tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
defconst.
(tramp-gw-tunnel-method, tramp-gw-socks-method)
(tramp-gw-open-connection): Set tramp-autoload cookie.
* net/tramp-imap.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-imap-file-name-p): Make it a defsubst.
(tramp-imap-method, tramp-imaps-method)
(tramp-imap-file-name-handler)
(tramp-imap-file-name-p): Set tramp-autoload cookie.
* net/tramp-smb.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded. Change call of `tramp-compat-decimal-to-octal' to new
function name.
(tramp-smb-tunnel-method): Make it a defconst.
(tramp-smb-file-name-p): Make it a defsubst.
(tramp-smb-method, tramp-smb-file-name-handler)
(tramp-smb-file-name-p): Set tramp-autoload cookie.
* net/tramp-uu.el (top) Add to `tramp-unload-hook'.
(tramp-uuencode-region): Set tramp-autoload cookie.
* net/trampver.el (top) Add to `tramp-unload-hook'.
(tramp-version, tramp-bug-report-address): Set tramp-autoload
cookie. Update release number.
2010-09-08 14:42:54 +00:00
|
|
|
$(lisp)/mh-e/mh-loaddefs.el \
|
|
|
|
$(lisp)/net/tramp-loaddefs.el
|
2008-03-13 06:05:25 +00:00
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
# Elisp files auto-generated.
|
|
|
|
AUTOGENEL = loaddefs.el \
|
2008-03-13 06:05:25 +00:00
|
|
|
$(LOADDEFS) \
|
2004-04-16 12:51:06 +00:00
|
|
|
cus-load.el \
|
|
|
|
finder-inf.el \
|
|
|
|
subdirs.el \
|
2013-06-20 20:01:51 +00:00
|
|
|
emacs-lisp/cl-loaddefs.el \
|
2008-04-11 17:13:30 +00:00
|
|
|
calc/calc-loaddefs.el \
|
2009-09-29 02:17:00 +00:00
|
|
|
eshell/esh-groups.el \
|
|
|
|
cedet/semantic/loaddefs.el \
|
|
|
|
cedet/ede/loaddefs.el \
|
2013-10-30 17:17:12 +00:00
|
|
|
cedet/srecode/loaddefs.el \
|
|
|
|
org/org-loaddefs.el
|
2004-04-16 12:51:06 +00:00
|
|
|
|
2011-04-06 02:13:16 +00:00
|
|
|
# Versioned files that are the value of someone's `generated-autoload-file'.
|
|
|
|
# Note that update_loaddefs parses this.
|
|
|
|
AUTOGEN_VCS = \
|
|
|
|
ps-print.el \
|
2014-06-02 01:10:47 +00:00
|
|
|
obsolete/tpu-edt.el \
|
2011-04-06 02:13:16 +00:00
|
|
|
mail/rmail.el \
|
|
|
|
dired.el \
|
|
|
|
ibuffer.el \
|
|
|
|
htmlfontify.el \
|
2014-03-29 00:53:32 +00:00
|
|
|
emacs-lisp/eieio.el \
|
|
|
|
textmodes/reftex.el
|
2011-04-06 02:13:16 +00:00
|
|
|
|
2010-06-13 20:36:17 +00:00
|
|
|
# Value of max-lisp-eval-depth when compiling initially.
|
|
|
|
# During bootstrapping the byte-compiler is run interpreted when compiling
|
|
|
|
# itself, and uses more stack than usual.
|
|
|
|
#
|
2012-06-09 17:03:43 +00:00
|
|
|
BIG_STACK_DEPTH = 2200
|
2010-06-13 20:36:17 +00:00
|
|
|
BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))"
|
|
|
|
|
2013-12-18 03:21:48 +00:00
|
|
|
# Set load-prefer-newer for the benefit of the non-bootstrappers.
|
2014-01-20 07:56:28 +00:00
|
|
|
BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \
|
|
|
|
--eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS)
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
|
2001-03-21 12:56:09 +00:00
|
|
|
# Files to compile before others during a bootstrap. This is done to
|
Further GV/CL cleanups.
* lisp/emacs-lisp/gv.el (gv-get): Autoload functions to find their
gv-expander.
(gv--defun-declaration): New function.
(defun-declarations-alist): Use it.
(gv-define-modify-macro, gv-pushnew!, gv-inc!, gv-dec!): Remove.
(gv-place): Autoload.
* lisp/emacs-lisp/cl.el (cl--dotimes, cl--dolist): Remember subr.el's
original definition of dotimes and dolist.
* lisp/emacs-lisp/cl-macs.el (cl-expr-access-order): Remove unused.
(cl-dolist, cl-dotimes): Use `dolist' and `dotimes'.
* lisp/emacs-lisp/cl-lib.el: Move gv handlers from cl-macs to here.
(cl-fifth, cl-sixth, cl-seventh, cl-eighth)
(cl-ninth, cl-tenth): Move gv handler to the function's definition.
* lisp/emacs-lisp/cl-extra.el (cl-subseq, cl-get, cl-getf): Move gv handler
to the function's definition.
* lisp/Makefile.in (COMPILE_FIRST): Re-order to speed it up by about 50%.
* lisp/window.el:
* lisp/files.el:
* lisp/faces.el:
* lisp/env.el: Don't use CL.
2012-06-22 21:24:54 +00:00
|
|
|
# speed up the bootstrap process. They're ordered by size, so we use
|
|
|
|
# the slowest-compiler on the smallest file and move to larger files as the
|
|
|
|
# compiler gets faster. `autoload.elc' comes last because it is not used by
|
|
|
|
# the compiler (so its compilation does not speed up subsequent compilations),
|
|
|
|
# it's only placed here so as to speed up generation of the loaddefs.el file.
|
2000-03-24 22:51:40 +00:00
|
|
|
|
2000-06-14 20:26:14 +00:00
|
|
|
COMPILE_FIRST = \
|
2010-10-15 21:55:33 +00:00
|
|
|
$(lisp)/emacs-lisp/macroexp.elc \
|
Further GV/CL cleanups.
* lisp/emacs-lisp/gv.el (gv-get): Autoload functions to find their
gv-expander.
(gv--defun-declaration): New function.
(defun-declarations-alist): Use it.
(gv-define-modify-macro, gv-pushnew!, gv-inc!, gv-dec!): Remove.
(gv-place): Autoload.
* lisp/emacs-lisp/cl.el (cl--dotimes, cl--dolist): Remember subr.el's
original definition of dotimes and dolist.
* lisp/emacs-lisp/cl-macs.el (cl-expr-access-order): Remove unused.
(cl-dolist, cl-dotimes): Use `dolist' and `dotimes'.
* lisp/emacs-lisp/cl-lib.el: Move gv handlers from cl-macs to here.
(cl-fifth, cl-sixth, cl-seventh, cl-eighth)
(cl-ninth, cl-tenth): Move gv handler to the function's definition.
* lisp/emacs-lisp/cl-extra.el (cl-subseq, cl-get, cl-getf): Move gv handler
to the function's definition.
* lisp/Makefile.in (COMPILE_FIRST): Re-order to speed it up by about 50%.
* lisp/window.el:
* lisp/files.el:
* lisp/faces.el:
* lisp/env.el: Don't use CL.
2012-06-22 21:24:54 +00:00
|
|
|
$(lisp)/emacs-lisp/cconv.elc \
|
|
|
|
$(lisp)/emacs-lisp/byte-opt.elc \
|
|
|
|
$(lisp)/emacs-lisp/bytecomp.elc \
|
2008-06-22 13:57:28 +00:00
|
|
|
$(lisp)/emacs-lisp/autoload.elc
|
2000-03-24 22:51:40 +00:00
|
|
|
|
2014-04-11 06:51:49 +00:00
|
|
|
# Prevent any settings in the user environment causing problems.
|
|
|
|
unexport EMACSDATA EMACSDOC EMACSPATH
|
|
|
|
|
1999-10-07 23:29:39 +00:00
|
|
|
# The actual Emacs command run in the targets below.
|
2014-01-20 07:56:28 +00:00
|
|
|
# Prevent any setting of EMACSLOADPATH in user environment causing problems.
|
|
|
|
emacs = EMACSLOADPATH= '$(EMACS)' $(EMACSOPT)
|
1999-10-07 23:29:39 +00:00
|
|
|
|
1999-10-10 00:41:59 +00:00
|
|
|
# Common command to find subdirectories
|
2013-11-06 08:09:15 +00:00
|
|
|
setwins=for file in `find . -type d -print`; do \
|
|
|
|
case $$file in */.* ) ;; \
|
2013-09-01 02:12:32 +00:00
|
|
|
*) wins="$$wins$${wins:+ }$$file" ;; \
|
1997-05-12 00:51:53 +00:00
|
|
|
esac; \
|
2013-11-06 08:37:01 +00:00
|
|
|
done
|
2001-08-15 08:54:01 +00:00
|
|
|
|
2008-05-31 02:24:12 +00:00
|
|
|
# Find all subdirectories except `obsolete' and `term'.
|
2013-11-06 08:37:01 +00:00
|
|
|
setwins_almost=for file in `find ${srcdir} -type d -print`; do \
|
2013-11-06 17:56:48 +00:00
|
|
|
case $$file in ${srcdir}*/obsolete | ${srcdir}*/term ) ;; \
|
Move runtime leim lisp files to lisp/leim directory
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.
* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* leim/README: Update for moved leim/ directory.
* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.
* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.
* lisp/startup.el (normal-top-level): No more leim directory.
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* lisp/leim/quail: Move here from ../leim.
* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.
* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* src/epaths.in (PATH_DUMPLOADSEARCH):
* src/lread.c (load_path_default):
* src/nsterm.m (ns_load_path): No more leim directory.
* .bzrignore: Update for relocated leim files.
2013-11-27 06:15:06 +00:00
|
|
|
*) wins="$$wins$${wins:+ }$$file" ;; \
|
2001-04-09 14:50:44 +00:00
|
|
|
esac; \
|
|
|
|
done
|
1999-10-10 00:41:59 +00:00
|
|
|
|
2014-03-14 17:54:12 +00:00
|
|
|
# Find all subdirectories except `obsolete', `term', and `leim' (and subdirs).
|
|
|
|
# We don't want the leim files listed as packages, especially
|
|
|
|
# since many share basenames with files in language/.
|
|
|
|
setwins_finder=for file in `find ${srcdir} -type d -print`; do \
|
|
|
|
case $$file in ${srcdir}*/obsolete | ${srcdir}*/term | ${srcdir}*/leim* ) ;; \
|
|
|
|
*) wins="$$wins$${wins:+ }$$file" ;; \
|
|
|
|
esac; \
|
|
|
|
done
|
|
|
|
|
2013-11-06 08:37:01 +00:00
|
|
|
# Find all subdirectories in which we might want to create subdirs.el.
|
|
|
|
setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \
|
Move runtime leim lisp files to lisp/leim directory
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.
* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* leim/README: Update for moved leim/ directory.
* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.
* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.
* lisp/startup.el (normal-top-level): No more leim directory.
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* lisp/leim/quail: Move here from ../leim.
* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.
* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* src/epaths.in (PATH_DUMPLOADSEARCH):
* src/lread.c (load_path_default):
* src/nsterm.m (ns_load_path): No more leim directory.
* .bzrignore: Update for relocated leim files.
2013-11-27 06:15:06 +00:00
|
|
|
case $$file in \
|
|
|
|
${srcdir}*/cedet* | ${srcdir}*/leim* ) ;; \
|
|
|
|
*) wins="$$wins$${wins:+ }$$file" ;; \
|
2009-09-27 23:25:03 +00:00
|
|
|
esac; \
|
|
|
|
done
|
|
|
|
|
2008-06-21 19:33:21 +00:00
|
|
|
# cus-load and finder-inf are not explicitly requested by anything, so
|
2008-06-21 01:38:39 +00:00
|
|
|
# we add them here to make sure they get built.
|
2009-12-14 23:22:54 +00:00
|
|
|
all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
|
2008-06-20 21:48:17 +00:00
|
|
|
|
1999-10-10 00:41:59 +00:00
|
|
|
doit:
|
|
|
|
|
2012-07-30 16:20:35 +00:00
|
|
|
.PHONY: all doit custom-deps finder-data autoloads update-subdirs
|
|
|
|
|
2008-06-05 02:36:11 +00:00
|
|
|
# custom-deps and finder-data both used to scan _all_ the *.el files.
|
2008-06-21 19:33:21 +00:00
|
|
|
# This could lead to problems in parallel builds if automatically
|
|
|
|
# generated *.el files (eg loaddefs etc) were being changed at the same time.
|
2008-06-05 02:36:11 +00:00
|
|
|
# One solution was to add autoloads as a prerequisite:
|
|
|
|
# http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00469.html
|
|
|
|
# http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-12/msg00171.html
|
2008-06-21 19:33:21 +00:00
|
|
|
# However, this meant that running these targets modified loaddefs.el,
|
2008-06-05 02:36:11 +00:00
|
|
|
# every time (due to time-stamping). Calling these rules from
|
|
|
|
# bootstrap-after would modify loaddefs after src/emacs, resulting
|
|
|
|
# in make install remaking src/emacs for no real reason:
|
|
|
|
# http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg00311.html
|
2008-06-21 19:33:21 +00:00
|
|
|
# Nowadays these commands don't scan automatically generated files,
|
|
|
|
# since they will never contain any useful information
|
|
|
|
# (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp).
|
2008-06-21 01:38:39 +00:00
|
|
|
$(lisp)/cus-load.el:
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
$(MAKE) custom-deps
|
2008-06-21 01:38:39 +00:00
|
|
|
custom-deps: doit
|
2013-11-06 08:37:01 +00:00
|
|
|
$(setwins_almost); \
|
1998-04-24 21:17:17 +00:00
|
|
|
echo Directories: $$wins; \
|
2013-11-06 08:37:01 +00:00
|
|
|
$(emacs) -l cus-dep \
|
2013-12-11 17:05:28 +00:00
|
|
|
--eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(srcdir)/cus-load.el"))' \
|
2013-11-06 08:37:01 +00:00
|
|
|
-f custom-make-dependencies $$wins
|
1997-04-11 19:40:29 +00:00
|
|
|
|
2008-06-21 01:38:39 +00:00
|
|
|
$(lisp)/finder-inf.el:
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
$(MAKE) finder-data
|
2008-06-21 01:38:39 +00:00
|
|
|
finder-data: doit
|
2014-03-14 17:54:12 +00:00
|
|
|
$(setwins_finder); \
|
1998-04-24 21:17:17 +00:00
|
|
|
echo Directories: $$wins; \
|
2013-11-06 08:37:01 +00:00
|
|
|
$(emacs) -l finder \
|
2013-12-11 17:05:28 +00:00
|
|
|
--eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \
|
2013-11-02 20:05:15 +00:00
|
|
|
-f finder-compile-keywords-make-dist $$wins
|
1997-04-11 19:40:29 +00:00
|
|
|
|
2011-04-06 02:13:16 +00:00
|
|
|
# The chmod +w is to handle env var CVSREAD=1.
|
2013-11-02 19:43:11 +00:00
|
|
|
# Use expand-file-name rather than $abs_scrdir so that Emacs does not
|
2013-10-30 20:27:35 +00:00
|
|
|
# get confused when it compares file-names for equality.
|
Move runtime leim lisp files to lisp/leim directory
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.
* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* leim/README: Update for moved leim/ directory.
* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.
* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.
* lisp/startup.el (normal-top-level): No more leim directory.
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* lisp/leim/quail: Move here from ../leim.
* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.
* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* src/epaths.in (PATH_DUMPLOADSEARCH):
* src/lread.c (load_path_default):
* src/nsterm.m (ns_load_path): No more leim directory.
* .bzrignore: Update for relocated leim files.
2013-11-27 06:15:06 +00:00
|
|
|
#
|
|
|
|
# Note that we set no-update-autoloads in _generated_ leim files.
|
|
|
|
# If you want to allow autoloads in such files, remove that,
|
|
|
|
# and make this depend on leim.
|
2009-10-07 07:19:07 +00:00
|
|
|
autoloads: $(LOADDEFS) doit
|
2011-04-06 02:13:16 +00:00
|
|
|
cd $(lisp) && chmod +w $(AUTOGEN_VCS)
|
2013-11-06 08:37:01 +00:00
|
|
|
$(setwins_almost); \
|
1998-04-24 21:17:17 +00:00
|
|
|
echo Directories: $$wins; \
|
2013-11-06 08:37:01 +00:00
|
|
|
$(emacs) -l autoload \
|
2013-06-15 15:36:11 +00:00
|
|
|
--eval '(setq autoload-builtin-package-versions t)' \
|
2013-12-10 20:56:59 +00:00
|
|
|
--eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
|
2013-06-15 15:36:11 +00:00
|
|
|
-f batch-update-autoloads $$wins
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
$(MAKE) obsolete-autoloads
|
2014-03-27 19:00:49 +00:00
|
|
|
|
|
|
|
# The obsolete/ subdirectory is normally not scanned for autoloads.
|
|
|
|
# Sometimes we still want to autoload something from that directory,
|
|
|
|
# eg iswitchb.
|
|
|
|
.PHONY: obsolete-autoloads
|
|
|
|
obsolete-autoloads: ${lisp}/obsolete/*.el
|
|
|
|
$(emacs) -l autoload \
|
|
|
|
--eval '(setq generate-autoload-cookie ";;;###obsolete-autoload")' \
|
|
|
|
--eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
|
|
|
|
-f batch-update-autoloads ${lisp}/obsolete
|
1997-05-12 00:51:53 +00:00
|
|
|
|
2008-06-22 13:57:28 +00:00
|
|
|
# This is required by the bootstrap-emacs target in ../src/Makefile, so
|
2008-06-21 01:38:39 +00:00
|
|
|
# we know that if we have an emacs executable, we also have a subdirs.el.
|
2002-12-29 18:01:39 +00:00
|
|
|
$(lisp)/subdirs.el:
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
$(MAKE) update-subdirs
|
1997-05-12 00:59:57 +00:00
|
|
|
update-subdirs: doit
|
2013-11-06 08:37:01 +00:00
|
|
|
$(setwins_for_subdirs); \
|
1997-05-12 00:59:57 +00:00
|
|
|
for file in $$wins; do \
|
2013-11-06 08:37:01 +00:00
|
|
|
$(srcdir)/../build-aux/update-subdirs $$file; \
|
1997-05-12 00:59:57 +00:00
|
|
|
done;
|
|
|
|
|
2012-07-30 16:20:35 +00:00
|
|
|
.PHONY: updates bzr-update update-authors
|
|
|
|
|
2012-07-06 01:31:54 +00:00
|
|
|
# Some modes of make-dist use this.
|
2006-01-05 22:49:42 +00:00
|
|
|
updates: update-subdirs autoloads finder-data custom-deps
|
1997-04-11 13:14:52 +00:00
|
|
|
|
2012-07-06 01:31:54 +00:00
|
|
|
# This is useful after "bzr up"; but it doesn't do anything that a
|
|
|
|
# plain "make" at top-level doesn't.
|
2012-07-06 07:29:43 +00:00
|
|
|
# The only difference between this and this directory's "all" rule
|
|
|
|
# is that this runs "autoloads" as well (because it uses "compile"
|
|
|
|
# rather than "compile-main"). In a bootstrap, $(lisp) in src/Makefile
|
|
|
|
# triggers this directory's autoloads rule.
|
2012-07-06 07:06:13 +00:00
|
|
|
bzr-update: compile finder-data custom-deps
|
2010-01-02 10:42:11 +00:00
|
|
|
|
2000-10-25 19:00:55 +00:00
|
|
|
# Update the AUTHORS file.
|
|
|
|
|
|
|
|
update-authors:
|
2010-03-21 11:57:49 +00:00
|
|
|
$(emacs) -l authors -f batch-update-authors $(top_srcdir)/etc/AUTHORS $(top_srcdir)
|
2000-10-25 19:00:55 +00:00
|
|
|
|
Small Makefile cleanup mainly related to tags file generation
* src/Makefile.in (abs_srcdir): New, set by configure.
(maintainer-clean): Remove pointless echo. That should be in the
top-level Makefile, if anywhere. Delete TAGS-LISP.
(extraclean): No s/ and m/ directories for some time.
(TAGS): Remove no-longer-defined S_FILE.
Pass absolute filenames to etags once more.
(TAGS-LISP, $(lwlibdir)/TAGS): Correctly pass ETAGS to sub-makes.
($(lwlibdir)/TAGS): Remove useless subshell, check cd return value.
* lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3)
(lisptagsfiles4): Use absolute filenames again.
(TAGS, TAGS-LISP): Not everything needs to run in one line.
Remove all *loaddefs files, not just the first. Remove esh-groups.
(maintainer-clean): Delete TAGS, TAGS-LISP.
* lwlib/Makefile.in (abs_srcdir): New, set by configure.
(ETAGS, ctagsfiles): New variables.
(TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
2013-11-02 19:18:50 +00:00
|
|
|
|
|
|
|
ETAGS = ../lib-src/etags
|
|
|
|
|
2013-11-02 19:41:33 +00:00
|
|
|
lisptagsfiles1 = $(srcdir)/*.el
|
|
|
|
lisptagsfiles2 = $(srcdir)/*/*.el
|
|
|
|
lisptagsfiles3 = $(srcdir)/*/*/*.el
|
|
|
|
lisptagsfiles4 = $(srcdir)/*/*/*/*.el
|
Small Makefile cleanup mainly related to tags file generation
* src/Makefile.in (abs_srcdir): New, set by configure.
(maintainer-clean): Remove pointless echo. That should be in the
top-level Makefile, if anywhere. Delete TAGS-LISP.
(extraclean): No s/ and m/ directories for some time.
(TAGS): Remove no-longer-defined S_FILE.
Pass absolute filenames to etags once more.
(TAGS-LISP, $(lwlibdir)/TAGS): Correctly pass ETAGS to sub-makes.
($(lwlibdir)/TAGS): Remove useless subshell, check cd return value.
* lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3)
(lisptagsfiles4): Use absolute filenames again.
(TAGS, TAGS-LISP): Not everything needs to run in one line.
Remove all *loaddefs files, not just the first. Remove esh-groups.
(maintainer-clean): Delete TAGS, TAGS-LISP.
* lwlib/Makefile.in (abs_srcdir): New, set by configure.
(ETAGS, ctagsfiles): New variables.
(TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
2013-11-02 19:18:50 +00:00
|
|
|
|
2013-11-02 20:12:59 +00:00
|
|
|
## The echo | sed | xargs is to stop the command line getting too long
|
|
|
|
## on MS Windows, when the MSYS Bash passes it to a MinGW compiled
|
|
|
|
## etags. It might be better to use find in a similar way to
|
|
|
|
## compile-main. But maybe this is not even necessary any more now
|
|
|
|
## that this uses relative filenames.
|
2013-11-02 19:41:33 +00:00
|
|
|
TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4)
|
Small Makefile cleanup mainly related to tags file generation
* src/Makefile.in (abs_srcdir): New, set by configure.
(maintainer-clean): Remove pointless echo. That should be in the
top-level Makefile, if anywhere. Delete TAGS-LISP.
(extraclean): No s/ and m/ directories for some time.
(TAGS): Remove no-longer-defined S_FILE.
Pass absolute filenames to etags once more.
(TAGS-LISP, $(lwlibdir)/TAGS): Correctly pass ETAGS to sub-makes.
($(lwlibdir)/TAGS): Remove useless subshell, check cd return value.
* lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3)
(lisptagsfiles4): Use absolute filenames again.
(TAGS, TAGS-LISP): Not everything needs to run in one line.
Remove all *loaddefs files, not just the first. Remove esh-groups.
(maintainer-clean): Delete TAGS, TAGS-LISP.
* lwlib/Makefile.in (abs_srcdir): New, set by configure.
(ETAGS, ctagsfiles): New variables.
(TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
2013-11-02 19:18:50 +00:00
|
|
|
rm -f $@
|
|
|
|
touch $@
|
|
|
|
echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | \
|
2013-11-02 19:41:33 +00:00
|
|
|
sed -e 's,$(srcdir)/[^ ]*loaddefs[^ ]*,,g' \
|
|
|
|
-e 's,$(srcdir)/ldefs-boot[^ ]*,,' \
|
|
|
|
-e 's,$(srcdir)/[^ ]*esh-groups.el[^ ]*,,' | \
|
Small Makefile cleanup mainly related to tags file generation
* src/Makefile.in (abs_srcdir): New, set by configure.
(maintainer-clean): Remove pointless echo. That should be in the
top-level Makefile, if anywhere. Delete TAGS-LISP.
(extraclean): No s/ and m/ directories for some time.
(TAGS): Remove no-longer-defined S_FILE.
Pass absolute filenames to etags once more.
(TAGS-LISP, $(lwlibdir)/TAGS): Correctly pass ETAGS to sub-makes.
($(lwlibdir)/TAGS): Remove useless subshell, check cd return value.
* lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3)
(lisptagsfiles4): Use absolute filenames again.
(TAGS, TAGS-LISP): Not everything needs to run in one line.
Remove all *loaddefs files, not just the first. Remove esh-groups.
(maintainer-clean): Delete TAGS, TAGS-LISP.
* lwlib/Makefile.in (abs_srcdir): New, set by configure.
(ETAGS, ctagsfiles): New variables.
(TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
2013-11-02 19:18:50 +00:00
|
|
|
xargs $(XARGS_LIMIT) "$(ETAGS)" -a -o $@
|
|
|
|
|
1999-10-07 23:29:39 +00:00
|
|
|
|
2008-06-21 19:20:40 +00:00
|
|
|
# The src/Makefile.in has its own set of dependencies and when they decide
|
|
|
|
# that one Lisp file needs to be re-compiled, we had better recompile it as
|
|
|
|
# well, otherwise every subsequent make will again call us, until we finally
|
|
|
|
# end up deciding that yes, the file deserves recompilation.
|
|
|
|
# One option is to try and reproduce exactly the same dependencies here as
|
|
|
|
# we have in src/Makefile.in, but it turns out to be painful
|
|
|
|
# (e.g. src/Makefile.in may have a dependency for ../lisp/foo.elc where we
|
|
|
|
# only know of $(lisp)/foo.elc). So instead we provide a direct way for
|
|
|
|
# src/Makefile.in to rebuild a particular Lisp file, no questions asked.
|
2009-09-16 03:10:17 +00:00
|
|
|
# Use byte-compile-refresh-preloaded to try and work around some of
|
|
|
|
# the most common problems of not bootstrapping from a clean state.
|
2012-07-30 16:20:35 +00:00
|
|
|
.PHONY: compile-onefile
|
2008-06-21 19:20:40 +00:00
|
|
|
compile-onefile:
|
|
|
|
@echo Compiling $(THEFILE)
|
2009-10-14 15:13:44 +00:00
|
|
|
@# Use byte-compile-refresh-preloaded to try and work around some of
|
|
|
|
@# the most common bootstrapping problems.
|
2011-04-01 15:16:50 +00:00
|
|
|
@$(emacs) $(BYTE_COMPILE_FLAGS) \
|
|
|
|
-l bytecomp -f byte-compile-refresh-preloaded \
|
2010-06-14 03:27:16 +00:00
|
|
|
-f batch-byte-compile $(THEFILE)
|
2008-06-21 19:20:40 +00:00
|
|
|
|
2008-05-21 03:51:58 +00:00
|
|
|
# Files MUST be compiled one by one. If we compile several files in a
|
|
|
|
# row (i.e., in the same instance of Emacs) we can't make sure that
|
2005-04-13 09:41:46 +00:00
|
|
|
# the compilation environment is clean. We also set the load-path of
|
|
|
|
# the Emacs used for compilation to the current directory and its
|
|
|
|
# subdirectories, to make sure require's and load's in the files being
|
|
|
|
# compiled find the right files.
|
2002-03-22 23:36:15 +00:00
|
|
|
|
2008-05-21 03:51:58 +00:00
|
|
|
.SUFFIXES: .elc .el
|
|
|
|
|
|
|
|
# An old-fashioned suffix rule, which, according to the GNU Make manual,
|
|
|
|
# cannot have prerequisites.
|
|
|
|
.el.elc:
|
|
|
|
@echo Compiling $<
|
2011-03-01 05:03:24 +00:00
|
|
|
@# The BIG_STACK_OPTS are only needed to byte-compile the byte-compiler
|
|
|
|
@# files, which is normally done in compile-first, but may also be
|
|
|
|
@# recompiled via this rule.
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
@$(emacs) $(BYTE_COMPILE_FLAGS) \
|
2010-06-14 03:27:16 +00:00
|
|
|
-f batch-byte-compile $<
|
2008-05-21 03:51:58 +00:00
|
|
|
|
2010-03-22 04:24:25 +00:00
|
|
|
.PHONY: compile-first compile-main compile compile-always
|
2008-05-21 03:51:58 +00:00
|
|
|
|
2008-06-21 19:20:40 +00:00
|
|
|
compile-first: $(COMPILE_FIRST)
|
2002-02-01 04:13:14 +00:00
|
|
|
|
2010-03-22 04:24:25 +00:00
|
|
|
# In `compile-main' we could directly do
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
# ... | xargs $(MAKE) EMACS="$(EMACS)"
|
2010-03-22 04:24:25 +00:00
|
|
|
# and it works, but it generates a lot of messages like
|
2013-10-24 02:21:23 +00:00
|
|
|
# make[2]: gnus/gnus-mlspl.elc is up to date.
|
2010-03-22 04:24:25 +00:00
|
|
|
# so instead, we use "xargs echo" to split the list of file into manageable
|
|
|
|
# chunks and then use an intermediate `compile-targets' target so the
|
|
|
|
# actual targets (the .elc files) are not mentioned as targets on the
|
|
|
|
# make command line.
|
|
|
|
|
|
|
|
|
|
|
|
.PHONY: compile-targets
|
|
|
|
# TARGETS is set dynamically in the recursive call from `compile-main'.
|
|
|
|
compile-targets: $(TARGETS)
|
|
|
|
|
|
|
|
# Compile all the Elisp files that need it. Beware: it approximates
|
|
|
|
# `no-byte-compile', so watch out for false-positives!
|
Stop keeping (all but one) generated cedet grammar files in the repository
* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.
* admin/grammars/README: Remove.
* admin/grammars/Makefile.in: New file.
* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.
* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.
* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.
* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.
* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.
* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.
* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.
* .bzrignore: Update for this.
2013-11-30 02:06:34 +00:00
|
|
|
compile-main: leim semantic compile-clean
|
2013-10-30 06:21:46 +00:00
|
|
|
@(cd $(lisp) && $(setwins); \
|
2010-03-22 04:24:25 +00:00
|
|
|
els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \
|
|
|
|
for el in $$els; do \
|
|
|
|
test -f $$el || continue; \
|
|
|
|
test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \
|
|
|
|
echo "$${el}c"; \
|
2013-04-14 15:05:42 +00:00
|
|
|
done | xargs $(XARGS_LIMIT) echo) | \
|
2010-03-22 04:24:25 +00:00
|
|
|
while read chunk; do \
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
$(MAKE) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
|
2010-03-22 04:24:25 +00:00
|
|
|
done
|
2008-05-21 03:51:58 +00:00
|
|
|
|
2010-03-22 13:33:21 +00:00
|
|
|
.PHONY: compile-clean
|
|
|
|
# Erase left-over .elc files that do not have a corresponding .el file.
|
|
|
|
compile-clean:
|
2013-10-30 06:21:46 +00:00
|
|
|
@cd $(lisp) && $(setwins); \
|
2010-03-22 13:33:21 +00:00
|
|
|
elcs=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.elc |g'`; \
|
2010-10-13 03:23:47 +00:00
|
|
|
for el in `echo $$elcs | sed -e 's/\.elc/\.el/g'`; do \
|
2010-03-22 13:33:21 +00:00
|
|
|
if test -f "$$el" -o \! -f "$${el}c"; then :; else \
|
|
|
|
echo rm "$${el}c"; \
|
|
|
|
rm "$${el}c"; \
|
|
|
|
fi \
|
|
|
|
done
|
|
|
|
|
Stop keeping (all but one) generated cedet grammar files in the repository
* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.
* admin/grammars/README: Remove.
* admin/grammars/Makefile.in: New file.
* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.
* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.
* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.
* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.
* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.
* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.
* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.
* .bzrignore: Update for this.
2013-11-30 02:06:34 +00:00
|
|
|
.PHONY: leim semantic
|
Move runtime leim lisp files to lisp/leim directory
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.
* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* leim/README: Update for moved leim/ directory.
* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.
* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.
* lisp/startup.el (normal-top-level): No more leim directory.
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* lisp/leim/quail: Move here from ../leim.
* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.
* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* src/epaths.in (PATH_DUMPLOADSEARCH):
* src/lread.c (load_path_default):
* src/nsterm.m (ns_load_path): No more leim directory.
* .bzrignore: Update for relocated leim files.
2013-11-27 06:15:06 +00:00
|
|
|
leim:
|
2014-06-15 00:34:22 +00:00
|
|
|
$(MAKE) -C ../leim all EMACS="$(EMACS)"
|
Move runtime leim lisp files to lisp/leim directory
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.
* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* leim/README: Update for moved leim/ directory.
* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.
* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.
* lisp/startup.el (normal-top-level): No more leim directory.
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* lisp/leim/quail: Move here from ../leim.
* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.
* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* src/epaths.in (PATH_DUMPLOADSEARCH):
* src/lread.c (load_path_default):
* src/nsterm.m (ns_load_path): No more leim directory.
* .bzrignore: Update for relocated leim files.
2013-11-27 06:15:06 +00:00
|
|
|
|
Stop keeping (all but one) generated cedet grammar files in the repository
* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.
* admin/grammars/README: Remove.
* admin/grammars/Makefile.in: New file.
* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.
* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.
* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.
* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.
* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.
* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.
* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.
* .bzrignore: Update for this.
2013-11-30 02:06:34 +00:00
|
|
|
# FIXME. Yuck.
|
|
|
|
semantic:
|
|
|
|
case ${EMACS} in \
|
|
|
|
.*) EMACS="../${EMACS}" ;; \
|
|
|
|
*) EMACS="${EMACS}" ;; \
|
|
|
|
esac; \
|
2014-06-15 00:34:22 +00:00
|
|
|
$(MAKE) -C ../admin/grammars all EMACS="$${EMACS}"
|
Stop keeping (all but one) generated cedet grammar files in the repository
* configure.ac (SUBDIR_MAKEFILES, AC_CONFIG_FILES):
Add admin/grammars Makefile.
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Also clean admin/grammars, if present.
* admin/grammars/README: Remove.
* admin/grammars/Makefile.in: New file.
* admin/grammars/c.by, admin/grammars/java-tags.wy, admin/grammars/js.wy:
* admin/grammars/python.wy: Update declarations to match generated outputs.
* lisp/Makefile.in (semantic): New.
(compile-main): Depend on semantic.
* lisp/cedet/semantic/bovine/grammar.el (bovine--make-parser-1):
New function, split from bovine-make-parsers.
(bovine-make-parsers): Use bovine--make-parser-1.
(bovine-batch-make-parser): New function.
* lisp/cedet/semantic/wisent/grammar.el (wisent--make-parser-1):
New function, split from wisent-make-parsers.
(wisent-make-parsers): Use wisent--make-parser-1.
(wisent-batch-make-parser): New function.
* lisp/cedet/semantic/db.el (semanticdb-save-all-db):
Avoid prompting in batch mode.
* lisp/cedet/semantic/grammar.el (semantic-grammar-footer-template):
Disable version-control and autoloads in the output.
(semantic-grammar-create-package):
Add option to return nil if output is up-to-date.
* lisp/cedet/semantic/bovine/c-by.el, lisp/cedet/semantic/bovine/make-by.el:
* lisp/cedet/semantic/bovine/scm-by.el, lisp/cedet/semantic/wisent/javat-wy.el:
* lisp/cedet/semantic/wisent/js-wy.el, lisp/cedet/semantic/wisent/python-wy.el:
* lisp/cedet/srecode/srt-wy.el: Remove generated files from repository.
* .bzrignore: Update for this.
2013-11-30 02:06:34 +00:00
|
|
|
|
2008-05-21 03:51:58 +00:00
|
|
|
# Compile all Lisp files, but don't recompile those that are up to
|
|
|
|
# date. Some .el files don't get compiled because they set the
|
|
|
|
# local variable no-byte-compile.
|
|
|
|
# Calling make recursively because suffix rule cannot have prerequisites.
|
2008-06-08 01:23:11 +00:00
|
|
|
# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those
|
|
|
|
# sub-makes that run rules that use it, for the sake of some non-GNU makes.
|
2009-12-14 23:22:54 +00:00
|
|
|
compile: $(LOADDEFS) autoloads compile-first
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
$(MAKE) compile-main EMACS="$(EMACS)"
|
2008-06-05 02:36:11 +00:00
|
|
|
|
2005-04-13 09:41:46 +00:00
|
|
|
# Compile all Lisp files. This is like `compile' but compiles files
|
|
|
|
# unconditionally. Some files don't actually get compiled because they
|
|
|
|
# set the local variable no-byte-compile.
|
2008-05-21 03:51:58 +00:00
|
|
|
compile-always: doit
|
2013-10-30 06:21:46 +00:00
|
|
|
cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
|
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
Remove, no longer used.
(lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
(install-nt, install-strip, uninstall, uninstall-nt)
(mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
GNU make automatically passes command-line arguments to sub-makes.
* admin/unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
* lib-src/Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
* lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
(autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
(compile-always): GNU make automatically passes
command-line arguments to sub-makes.
* lwlib/Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
* src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
($(lispsource)/international/charprop.el)
($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
GNU make automatically passes command-line arguments to sub-makes.
* test/automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-13 23:05:00 +00:00
|
|
|
$(MAKE) compile EMACS="$(EMACS)"
|
2005-04-13 09:41:46 +00:00
|
|
|
|
2013-10-30 06:21:46 +00:00
|
|
|
.PHONY: backup-compiled-files compile-after-backup
|
2009-12-14 23:22:54 +00:00
|
|
|
|
1999-10-23 13:22:02 +00:00
|
|
|
# Backup compiled Lisp files in elc.tar.gz. If that file already
|
|
|
|
# exists, make a backup of it.
|
|
|
|
|
|
|
|
backup-compiled-files:
|
2000-06-14 20:26:14 +00:00
|
|
|
-mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~
|
2009-09-29 02:17:00 +00:00
|
|
|
-tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc $(lisp)/*/*/*/*.elc
|
1999-10-23 13:22:02 +00:00
|
|
|
|
|
|
|
# Compile Lisp files, but save old compiled files first.
|
|
|
|
|
2002-02-01 04:13:14 +00:00
|
|
|
compile-after-backup: backup-compiled-files compile-always
|
1999-10-23 13:22:02 +00:00
|
|
|
|
2012-07-06 07:08:10 +00:00
|
|
|
# This does the same job as the "compile" rule, but in a different way.
|
|
|
|
# Rather than spawning a separate Emacs instance to compile each file,
|
|
|
|
# it uses the same Emacs instance to compile everything.
|
|
|
|
# This is faster on a single core, since it avoids the overhead of
|
|
|
|
# starting Emacs many times (it was 33% faster on a test with a
|
|
|
|
# random 10% of the .el files needing recompilation).
|
|
|
|
# Unlike compile, this is not parallelizable; so if you have more than
|
2012-07-06 07:45:23 +00:00
|
|
|
# one core and use make -j#, compile will be (much) faster.
|
2012-07-06 07:08:10 +00:00
|
|
|
# This rule also produces less accurate compilation warnings.
|
|
|
|
# The environment of later files is affected by definitions in
|
|
|
|
# earlier ones, so it does not produce some warnings that it should.
|
|
|
|
# It can also produces spurious warnings about "invalid byte code" if
|
|
|
|
# files that use byte-compile-dynamic are updated.
|
|
|
|
# There is no reason to use this rule unless you only have a single
|
|
|
|
# core and CPU time is an issue.
|
2012-07-30 16:20:35 +00:00
|
|
|
.PHONY: compile-one-process
|
2012-07-06 07:08:10 +00:00
|
|
|
compile-one-process: doit $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc
|
Try and fix w32 build; misc cleanup.
* lisp/subr.el (apply-partially): Move from subr.el; don't use lexical-let.
(eval-after-load): Obey lexical-binding.
* lisp/simple.el (apply-partially): Move to subr.el.
* lisp/makefile.w32-in: Match changes in Makefile.in.
(BIG_STACK_DEPTH, BIG_STACK_OPTS, BYTE_COMPILE_FLAGS): New vars.
(.el.elc, compile-CMD, compile-SH, compile-always-CMD)
(compile-always-SH, compile-calc-CMD, compile-calc-SH): Use them.
(COMPILE_FIRST): Add pcase, macroexp, and cconv.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Silence warning about
calling CL's `compiler-macroexpand'.
* lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): New function.
(byte-compile-initial-macro-environment)
(byte-compile-toplevel-file-form, byte-compile, byte-compile-sexp): Use it.
(byte-compile-eval, byte-compile-eval-before-compile): Obey lexical-binding.
(byte-compile--for-effect): Rename from `for-effect'.
(display-call-tree): Use case.
* lisp/emacs-lisp/byte-opt.el (for-effect): Don't declare as dynamic.
(byte-optimize-form-code-walker, byte-optimize-form):
Revert to old arg name.
* lisp/Makefile.in (BYTE_COMPILE_FLAGS): New var.
(compile-onefile, .el.elc, compile-calc, recompile): Use it.
2011-03-12 03:32:43 +00:00
|
|
|
$(emacs) $(BYTE_COMPILE_FLAGS) \
|
|
|
|
--eval "(batch-byte-recompile-directory 0)" $(lisp)
|
1999-10-07 23:29:39 +00:00
|
|
|
|
2005-10-07 04:58:02 +00:00
|
|
|
# Update MH-E internal autoloads. These are not to be confused with
|
2008-03-13 06:05:25 +00:00
|
|
|
# the autoloads for the MH-E entry points, which are already in loaddefs.el.
|
2008-04-10 03:40:06 +00:00
|
|
|
MH_E_DIR = $(lisp)/mh-e
|
|
|
|
## MH_E_SRC avoids a circular dependency warning for mh-loaddefs.el.
|
|
|
|
MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el \
|
|
|
|
$(MH_E_DIR)/mh-buffers.el $(MH_E_DIR)/mh-compat.el \
|
|
|
|
$(MH_E_DIR)/mh-comp.el $(MH_E_DIR)/mh-e.el \
|
|
|
|
$(MH_E_DIR)/mh-folder.el $(MH_E_DIR)/mh-funcs.el \
|
|
|
|
$(MH_E_DIR)/mh-gnus.el $(MH_E_DIR)/mh-identity.el \
|
|
|
|
$(MH_E_DIR)/mh-inc.el $(MH_E_DIR)/mh-junk.el \
|
|
|
|
$(MH_E_DIR)/mh-letter.el $(MH_E_DIR)/mh-limit.el \
|
|
|
|
$(MH_E_DIR)/mh-mime.el $(MH_E_DIR)/mh-print.el \
|
|
|
|
$(MH_E_DIR)/mh-scan.el $(MH_E_DIR)/mh-search.el \
|
|
|
|
$(MH_E_DIR)/mh-seq.el $(MH_E_DIR)/mh-show.el \
|
|
|
|
$(MH_E_DIR)/mh-speed.el $(MH_E_DIR)/mh-thread.el \
|
|
|
|
$(MH_E_DIR)/mh-tool-bar.el $(MH_E_DIR)/mh-utils.el \
|
|
|
|
$(MH_E_DIR)/mh-xface.el
|
|
|
|
|
2012-07-30 16:20:35 +00:00
|
|
|
.PHONY: mh-autoloads
|
2008-04-10 03:40:06 +00:00
|
|
|
mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
|
2008-06-21 01:38:39 +00:00
|
|
|
$(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
|
2008-03-13 06:05:25 +00:00
|
|
|
$(emacs) -l autoload \
|
2006-07-17 21:22:50 +00:00
|
|
|
--eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
|
2013-10-24 16:28:05 +00:00
|
|
|
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
|
2008-04-10 03:40:06 +00:00
|
|
|
-f batch-update-autoloads $(MH_E_DIR)
|
|
|
|
|
2011-02-13 12:25:45 +00:00
|
|
|
# Update TRAMP internal autoloads. Maybe we could move tramp*.el into
|
Migrate to Tramp 2.2. Rearrange load dependencies.
(Bug#1529, Bug#5448, Bug#5705)
* Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
($(TRAMP_DIR)/tramp-loaddefs.el): New target.
(LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
* net/tramp.el (top): Remove all other tramp-* loads except
tramp-compat.el. Remove all changes to tramp-unload-hook for
other tramp-* packages. Rearrange defun order. Change calls of
`tramp-compat-call-process', `tramp-compat-decimal-to-octal',
`tramp-compat-octal-to-decimal' to new function names.
(tramp-terminal-type, tramp-initial-end-of-output)
(tramp-methods, tramp-foreign-file-name-handler-alist)
(tramp-tramp-file-p, tramp-completion-mode-p)
(tramp-send-command-and-check, tramp-get-remote-path)
(tramp-get-remote-tmpdir, tramp-get-remote-ln)
(tramp-shell-quote-argument): Set tramp-autoload cookie.
(with-file-property, with-connection-property): Move to
tramp-cache.el.
(tramp-local-call-process, tramp-decimal-to-octal)
(tramp-octal-to-decimal): Move to tramp-compat.el.
(tramp-handle-shell-command): Do not require 'shell.
(tramp-compute-multi-hops): No special handling for tramp-gw-*
symbols.
(tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
* net/tramp-cache.el (top): Require 'tramp. Add to
`tramp-unload-hook'.
(tramp-cache-data, tramp-get-file-property)
(tramp-set-file-property, tramp-flush-file-property)
(tramp-flush-directory-property, tramp-get-connection-property)
(tramp-set-connection-property, tramp-flush-connection-property)
(tramp-cache-print, tramp-list-connections): Set tramp-autoload
cookie.
(with-file-property, with-connection-property): New defuns, moved
from tramp.el.
(tramp-flush-file-function): Use `with-parsed-tramp-file-name'
macro.
* net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
(tramp-version): Set tramp-autoload cookie.
* net/tramp-compat.el (top): Require 'tramp-loaddefs. Remove all
changes to tramp-unload-hook for other tramp-* packages. Add to
`tramp-unload-hook'.
(tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
(tramp-compat-call-process): New defuns, moved from tramp.el.
* net/tramp-fish.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change call of
`tramp-compat-decimal-to-octal' to new function name.
(tramp-fish-method): Make it a defconst.
(tramp-fish-file-name-p): Make it a defsubst.
(tramp-fish-method, tramp-fish-file-name-handler)
(tramp-fish-file-name-p): Set tramp-autoload cookie.
* net/tramp-ftp.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-ftp-method): Make it a defconst.
(tramp-ftp-file-name-p): Make it a defsubst.
(tramp-ftp-method, tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p): Set tramp-autoload cookie.
* net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-gvfs-file-name-p): Make it a defsubst.
(tramp-gvfs-methods, tramp-gvfs-file-name-handler)
(tramp-gvfs-file-name-p): Set tramp-autoload cookie.
(tramp-gvfs-handle-file-directory-p): New defun.
(tramp-gvfs-file-name-handler-alist): Use it.
* net/tramp-gw.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
(tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
defconst.
(tramp-gw-tunnel-method, tramp-gw-socks-method)
(tramp-gw-open-connection): Set tramp-autoload cookie.
* net/tramp-imap.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-imap-file-name-p): Make it a defsubst.
(tramp-imap-method, tramp-imaps-method)
(tramp-imap-file-name-handler)
(tramp-imap-file-name-p): Set tramp-autoload cookie.
* net/tramp-smb.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded. Change call of `tramp-compat-decimal-to-octal' to new
function name.
(tramp-smb-tunnel-method): Make it a defconst.
(tramp-smb-file-name-p): Make it a defsubst.
(tramp-smb-method, tramp-smb-file-name-handler)
(tramp-smb-file-name-p): Set tramp-autoload cookie.
* net/tramp-uu.el (top) Add to `tramp-unload-hook'.
(tramp-uuencode-region): Set tramp-autoload cookie.
* net/trampver.el (top) Add to `tramp-unload-hook'.
(tramp-version, tramp-bug-report-address): Set tramp-autoload
cookie. Update release number.
2010-09-08 14:42:54 +00:00
|
|
|
# an own subdirectory. OTOH, it does not hurt to keep them in
|
|
|
|
# lisp/net.
|
|
|
|
TRAMP_DIR = $(lisp)/net
|
2012-12-04 16:56:04 +00:00
|
|
|
TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-adb.el \
|
|
|
|
$(TRAMP_DIR)/tramp-cache.el $(TRAMP_DIR)/tramp-cmds.el \
|
|
|
|
$(TRAMP_DIR)/tramp-compat.el $(TRAMP_DIR)/tramp-ftp.el \
|
|
|
|
$(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el \
|
|
|
|
$(TRAMP_DIR)/tramp-sh.el $(TRAMP_DIR)/tramp-smb.el \
|
|
|
|
$(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el
|
Migrate to Tramp 2.2. Rearrange load dependencies.
(Bug#1529, Bug#5448, Bug#5705)
* Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
($(TRAMP_DIR)/tramp-loaddefs.el): New target.
(LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
* net/tramp.el (top): Remove all other tramp-* loads except
tramp-compat.el. Remove all changes to tramp-unload-hook for
other tramp-* packages. Rearrange defun order. Change calls of
`tramp-compat-call-process', `tramp-compat-decimal-to-octal',
`tramp-compat-octal-to-decimal' to new function names.
(tramp-terminal-type, tramp-initial-end-of-output)
(tramp-methods, tramp-foreign-file-name-handler-alist)
(tramp-tramp-file-p, tramp-completion-mode-p)
(tramp-send-command-and-check, tramp-get-remote-path)
(tramp-get-remote-tmpdir, tramp-get-remote-ln)
(tramp-shell-quote-argument): Set tramp-autoload cookie.
(with-file-property, with-connection-property): Move to
tramp-cache.el.
(tramp-local-call-process, tramp-decimal-to-octal)
(tramp-octal-to-decimal): Move to tramp-compat.el.
(tramp-handle-shell-command): Do not require 'shell.
(tramp-compute-multi-hops): No special handling for tramp-gw-*
symbols.
(tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
* net/tramp-cache.el (top): Require 'tramp. Add to
`tramp-unload-hook'.
(tramp-cache-data, tramp-get-file-property)
(tramp-set-file-property, tramp-flush-file-property)
(tramp-flush-directory-property, tramp-get-connection-property)
(tramp-set-connection-property, tramp-flush-connection-property)
(tramp-cache-print, tramp-list-connections): Set tramp-autoload
cookie.
(with-file-property, with-connection-property): New defuns, moved
from tramp.el.
(tramp-flush-file-function): Use `with-parsed-tramp-file-name'
macro.
* net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
(tramp-version): Set tramp-autoload cookie.
* net/tramp-compat.el (top): Require 'tramp-loaddefs. Remove all
changes to tramp-unload-hook for other tramp-* packages. Add to
`tramp-unload-hook'.
(tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
(tramp-compat-call-process): New defuns, moved from tramp.el.
* net/tramp-fish.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change call of
`tramp-compat-decimal-to-octal' to new function name.
(tramp-fish-method): Make it a defconst.
(tramp-fish-file-name-p): Make it a defsubst.
(tramp-fish-method, tramp-fish-file-name-handler)
(tramp-fish-file-name-p): Set tramp-autoload cookie.
* net/tramp-ftp.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-ftp-method): Make it a defconst.
(tramp-ftp-file-name-p): Make it a defsubst.
(tramp-ftp-method, tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p): Set tramp-autoload cookie.
* net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-gvfs-file-name-p): Make it a defsubst.
(tramp-gvfs-methods, tramp-gvfs-file-name-handler)
(tramp-gvfs-file-name-p): Set tramp-autoload cookie.
(tramp-gvfs-handle-file-directory-p): New defun.
(tramp-gvfs-file-name-handler-alist): Use it.
* net/tramp-gw.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
(tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
defconst.
(tramp-gw-tunnel-method, tramp-gw-socks-method)
(tramp-gw-open-connection): Set tramp-autoload cookie.
* net/tramp-imap.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-imap-file-name-p): Make it a defsubst.
(tramp-imap-method, tramp-imaps-method)
(tramp-imap-file-name-handler)
(tramp-imap-file-name-p): Set tramp-autoload cookie.
* net/tramp-smb.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded. Change call of `tramp-compat-decimal-to-octal' to new
function name.
(tramp-smb-tunnel-method): Make it a defconst.
(tramp-smb-file-name-p): Make it a defsubst.
(tramp-smb-method, tramp-smb-file-name-handler)
(tramp-smb-file-name-p): Set tramp-autoload cookie.
* net/tramp-uu.el (top) Add to `tramp-unload-hook'.
(tramp-uuencode-region): Set tramp-autoload cookie.
* net/trampver.el (top) Add to `tramp-unload-hook'.
(tramp-version, tramp-bug-report-address): Set tramp-autoload
cookie. Update release number.
2010-09-08 14:42:54 +00:00
|
|
|
|
|
|
|
$(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
|
|
|
|
$(emacs) -l autoload \
|
|
|
|
--eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
|
2013-10-24 16:28:05 +00:00
|
|
|
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
|
Migrate to Tramp 2.2. Rearrange load dependencies.
(Bug#1529, Bug#5448, Bug#5705)
* Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
($(TRAMP_DIR)/tramp-loaddefs.el): New target.
(LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
* net/tramp.el (top): Remove all other tramp-* loads except
tramp-compat.el. Remove all changes to tramp-unload-hook for
other tramp-* packages. Rearrange defun order. Change calls of
`tramp-compat-call-process', `tramp-compat-decimal-to-octal',
`tramp-compat-octal-to-decimal' to new function names.
(tramp-terminal-type, tramp-initial-end-of-output)
(tramp-methods, tramp-foreign-file-name-handler-alist)
(tramp-tramp-file-p, tramp-completion-mode-p)
(tramp-send-command-and-check, tramp-get-remote-path)
(tramp-get-remote-tmpdir, tramp-get-remote-ln)
(tramp-shell-quote-argument): Set tramp-autoload cookie.
(with-file-property, with-connection-property): Move to
tramp-cache.el.
(tramp-local-call-process, tramp-decimal-to-octal)
(tramp-octal-to-decimal): Move to tramp-compat.el.
(tramp-handle-shell-command): Do not require 'shell.
(tramp-compute-multi-hops): No special handling for tramp-gw-*
symbols.
(tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
* net/tramp-cache.el (top): Require 'tramp. Add to
`tramp-unload-hook'.
(tramp-cache-data, tramp-get-file-property)
(tramp-set-file-property, tramp-flush-file-property)
(tramp-flush-directory-property, tramp-get-connection-property)
(tramp-set-connection-property, tramp-flush-connection-property)
(tramp-cache-print, tramp-list-connections): Set tramp-autoload
cookie.
(with-file-property, with-connection-property): New defuns, moved
from tramp.el.
(tramp-flush-file-function): Use `with-parsed-tramp-file-name'
macro.
* net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
(tramp-version): Set tramp-autoload cookie.
* net/tramp-compat.el (top): Require 'tramp-loaddefs. Remove all
changes to tramp-unload-hook for other tramp-* packages. Add to
`tramp-unload-hook'.
(tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
(tramp-compat-call-process): New defuns, moved from tramp.el.
* net/tramp-fish.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change call of
`tramp-compat-decimal-to-octal' to new function name.
(tramp-fish-method): Make it a defconst.
(tramp-fish-file-name-p): Make it a defsubst.
(tramp-fish-method, tramp-fish-file-name-handler)
(tramp-fish-file-name-p): Set tramp-autoload cookie.
* net/tramp-ftp.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-ftp-method): Make it a defconst.
(tramp-ftp-file-name-p): Make it a defsubst.
(tramp-ftp-method, tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p): Set tramp-autoload cookie.
* net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-gvfs-file-name-p): Make it a defsubst.
(tramp-gvfs-methods, tramp-gvfs-file-name-handler)
(tramp-gvfs-file-name-p): Set tramp-autoload cookie.
(tramp-gvfs-handle-file-directory-p): New defun.
(tramp-gvfs-file-name-handler-alist): Use it.
* net/tramp-gw.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
(tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
defconst.
(tramp-gw-tunnel-method, tramp-gw-socks-method)
(tramp-gw-open-connection): Set tramp-autoload cookie.
* net/tramp-imap.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-imap-file-name-p): Make it a defsubst.
(tramp-imap-method, tramp-imaps-method)
(tramp-imap-file-name-handler)
(tramp-imap-file-name-p): Set tramp-autoload cookie.
* net/tramp-smb.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded. Change call of `tramp-compat-decimal-to-octal' to new
function name.
(tramp-smb-tunnel-method): Make it a defconst.
(tramp-smb-file-name-p): Make it a defsubst.
(tramp-smb-method, tramp-smb-file-name-handler)
(tramp-smb-file-name-p): Set tramp-autoload cookie.
* net/tramp-uu.el (top) Add to `tramp-unload-hook'.
(tramp-uuencode-region): Set tramp-autoload cookie.
* net/trampver.el (top) Add to `tramp-unload-hook'.
(tramp-version, tramp-bug-report-address): Set tramp-autoload
cookie. Update release number.
2010-09-08 14:42:54 +00:00
|
|
|
-f batch-update-autoloads $(TRAMP_DIR)
|
|
|
|
|
2008-04-10 03:40:06 +00:00
|
|
|
CAL_DIR = $(lisp)/calendar
|
|
|
|
## Those files that may contain internal calendar autoload cookies.
|
|
|
|
## Avoids circular dependency warning for *-loaddefs.el.
|
|
|
|
CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \
|
|
|
|
$(CAL_DIR)/cal-coptic.el $(CAL_DIR)/cal-dst.el \
|
|
|
|
$(CAL_DIR)/cal-french.el $(CAL_DIR)/cal-hebrew.el \
|
|
|
|
$(CAL_DIR)/cal-html.el $(CAL_DIR)/cal-islam.el \
|
|
|
|
$(CAL_DIR)/cal-iso.el $(CAL_DIR)/cal-julian.el \
|
|
|
|
$(CAL_DIR)/cal-mayan.el $(CAL_DIR)/cal-menu.el \
|
|
|
|
$(CAL_DIR)/cal-move.el $(CAL_DIR)/cal-persia.el \
|
|
|
|
$(CAL_DIR)/cal-tex.el $(CAL_DIR)/cal-x.el \
|
|
|
|
$(CAL_DIR)/calendar.el $(CAL_DIR)/diary-lib.el \
|
|
|
|
$(CAL_DIR)/holidays.el $(CAL_DIR)/lunar.el \
|
|
|
|
$(CAL_DIR)/solar.el
|
|
|
|
|
2008-06-21 01:38:39 +00:00
|
|
|
$(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
|
2008-03-13 06:05:25 +00:00
|
|
|
$(emacs) -l autoload \
|
|
|
|
--eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
|
2013-10-24 16:28:05 +00:00
|
|
|
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
|
2008-04-10 03:40:06 +00:00
|
|
|
-f batch-update-autoloads $(CAL_DIR)
|
2008-03-13 06:05:25 +00:00
|
|
|
|
2008-06-21 01:38:39 +00:00
|
|
|
$(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC)
|
2008-03-13 06:05:25 +00:00
|
|
|
$(emacs) -l autoload \
|
|
|
|
--eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
|
2013-10-24 16:28:05 +00:00
|
|
|
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
|
2008-04-10 03:40:06 +00:00
|
|
|
-f batch-update-autoloads $(CAL_DIR)
|
2008-03-13 06:05:25 +00:00
|
|
|
|
2008-06-21 01:38:39 +00:00
|
|
|
$(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
|
2008-03-13 06:05:25 +00:00
|
|
|
$(emacs) -l autoload \
|
|
|
|
--eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
|
2013-10-24 16:28:05 +00:00
|
|
|
--eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \
|
2008-04-10 03:40:06 +00:00
|
|
|
-f batch-update-autoloads $(CAL_DIR)
|
2008-03-13 06:05:25 +00:00
|
|
|
|
2012-07-30 16:20:35 +00:00
|
|
|
.PHONY: bootstrap-clean distclean maintainer-clean
|
|
|
|
|
2008-06-21 01:38:39 +00:00
|
|
|
bootstrap-clean:
|
2013-10-30 06:21:46 +00:00
|
|
|
-cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL)
|
1999-10-23 13:22:02 +00:00
|
|
|
|
2008-06-23 03:11:56 +00:00
|
|
|
distclean:
|
2013-04-25 21:20:17 +00:00
|
|
|
-rm -f ./Makefile $(lisp)/loaddefs.el~
|
2008-06-23 03:11:56 +00:00
|
|
|
|
|
|
|
maintainer-clean: distclean bootstrap-clean
|
2013-11-02 19:41:33 +00:00
|
|
|
rm -f TAGS
|
2000-06-16 18:55:45 +00:00
|
|
|
|
2007-11-17 03:49:02 +00:00
|
|
|
.PHONY: check-declare
|
|
|
|
|
|
|
|
check-declare:
|
2013-10-24 02:21:23 +00:00
|
|
|
$(emacs) -l check-declare --eval '(check-declare-directory "$(lisp)")'
|
2007-11-17 03:49:02 +00:00
|
|
|
|
2008-09-26 10:11:39 +00:00
|
|
|
# Dependencies
|
|
|
|
|
2013-11-01 17:26:29 +00:00
|
|
|
## None of the following matters for bootstrap, which is the only way
|
|
|
|
## to ensure a correct compilation of all lisp files.
|
|
|
|
## Manually specifying dependencies of a handful of lisp files, (and
|
|
|
|
## ones that don't change very often at that) seems pretty pointless
|
|
|
|
## to me.
|
|
|
|
|
|
|
|
# http://debbugs.gnu.org/1004
|
2008-09-26 10:11:39 +00:00
|
|
|
# CC Mode uses a compile time macro system which causes a compile time
|
|
|
|
# dependency in cc-*.elc files on the macros in other cc-*.el and the
|
|
|
|
# version string in cc-defs.el.
|
|
|
|
$(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-awk.elc\
|
|
|
|
$(lisp)/progmodes/cc-cmds.elc $(lisp)/progmodes/cc-compat.elc\
|
|
|
|
$(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-fonts.elc\
|
|
|
|
$(lisp)/progmodes/cc-langs.elc $(lisp)/progmodes/cc-menus.elc\
|
|
|
|
$(lisp)/progmodes/cc-mode.elc $(lisp)/progmodes/cc-styles.elc\
|
2009-11-20 14:05:18 +00:00
|
|
|
$(lisp)/progmodes/cc-vars.elc: \
|
2008-09-26 10:11:39 +00:00
|
|
|
$(lisp)/progmodes/cc-bytecomp.elc $(lisp)/progmodes/cc-defs.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-align.elc: \
|
|
|
|
$(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-cmds.elc: \
|
|
|
|
$(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-compat.elc: \
|
|
|
|
$(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-styles.elc \
|
|
|
|
$(lisp)/progmodes/cc-engine.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-defs.elc: $(lisp)/progmodes/cc-bytecomp.elc \
|
|
|
|
$(lisp)/emacs-lisp/cl.elc $(lisp)/emacs-lisp/regexp-opt.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-engine.elc: $(lisp)/progmodes/cc-langs.elc \
|
|
|
|
$(lisp)/progmodes/cc-vars.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-fonts.elc: $(lisp)/progmodes/cc-langs.elc \
|
|
|
|
$(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \
|
|
|
|
$(lisp)/font-lock.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-langs.elc: $(lisp)/progmodes/cc-vars.elc \
|
|
|
|
$(lisp)/emacs-lisp/cl.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \
|
|
|
|
$(lisp)/progmodes/cc-vars.elc $(lisp)/progmodes/cc-engine.elc \
|
|
|
|
$(lisp)/progmodes/cc-styles.elc $(lisp)/progmodes/cc-cmds.elc \
|
|
|
|
$(lisp)/progmodes/cc-align.elc $(lisp)/progmodes/cc-menus.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
|
|
|
|
$(lisp)/progmodes/cc-align.elc
|
|
|
|
|
|
|
|
$(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc
|
2008-12-27 11:19:41 +00:00
|
|
|
|
1999-10-07 23:29:39 +00:00
|
|
|
# Makefile ends here.
|