Remove $shortlisp from src/Makefile.in.

* configure.in (lisp_frag): New output file. * src/lisp.mk: New file, split from Makefile.in, and inheriting its copyright years. * src/Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@. (shortlisp): Remove. ($(etc)/DOC): Edit lisp.mk rather than using $shortlisp. * lisp/loadup.el, doc/misc/Makefile.in: Comment changes.
author: Glenn Morris 2011-05-19 17:41:03 -0700
committer: Glenn Morris 2011-05-19 17:41:03 -0700
commit: b9704ad9939ec1f6b5753c883bc023a55918023f (patch)
tree: d28745480bd02b4af9fdceccdad0247df879db53 /src
parent: cfe397c6d2123c82a12bbed1f26a45d0ddfc781f (diff)
download: emacs-b9704ad9939ec1f6b5753c883bc023a55918023f.tar.gz
emacs-b9704ad9939ec1f6b5753c883bc023a55918023f.zip
3 files changed, 180 insertions, 250 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1b54ae05c59..ba84d2d2700 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-20  Glenn Morris  <rgm@gnu.org>
+        * lisp.mk: New file, split from Makefile.in.
+        * Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
+        (shortlisp): Remove.
+        ($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.
 2011-05-19  Glenn Morris  <rgm@gnu.org>
        * Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
diff --git a/src/Makefile.in b/src/Makefile.in
index 6476880a0fd..557a6f54748 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -358,249 +358,10 @@ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
  $(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
-## This is the list of all Lisp files that might be loaded into the
-## dumped Emacs.  Some of them are not loaded on all platforms, but
+## Configure inserts the file lisp.mk at this point, defining $lisp.
-## the DOC file on every platform uses them (because the DOC file is
+@lisp_frag@
-## supposed to be platform-independent).
-## It is arranged like this because it is easier to generate it
-## semi-mechanically from loadup.el this way.
-## Eg something like:
-##   sed -e 's/"[ )].*//' -n -e '/(load "/ s/.*load "//p' loadup.el | \
-##   grep -vE 'site-|ldefs-boot'
-## minus any duplicates.
-## Note that you cannot just add a ".elc" extension to every file,
-## since some of them are no-byte-compile (eg some language/ ones).
-##
-## Confusingly, term/internal is not in loadup, but is unconditionally
-## loaded by pc-win, which is.
-##
-## Note that this list should not include lisp files which might not
-## be present, like site-load.el and site-init.el; this makefile
-## expects them all to be either present or buildable.
-##
-## Place loaddefs.el first, so it gets generated first, since it is on
-## the critical path (relevant in parallel compilations).
-lisp= \
-        $(lispsource)/loaddefs.el \
-        $(lispsource)/loadup.el \
-        $(lispsource)/emacs-lisp/byte-run.elc \
-        $(lispsource)/emacs-lisp/backquote.elc \
-        $(lispsource)/subr.elc \
-        $(lispsource)/version.el \
-        $(lispsource)/widget.elc \
-        $(lispsource)/custom.elc \
-        $(lispsource)/emacs-lisp/map-ynp.elc \
-        $(lispsource)/cus-start.elc \
-        $(lispsource)/international/mule.elc \
-        $(lispsource)/international/mule-conf.elc \
-        $(lispsource)/env.elc \
-        $(lispsource)/format.elc \
-        $(lispsource)/bindings.elc \
-        $(lispsource)/files.elc \
-        $(lispsource)/cus-face.elc \
-        $(lispsource)/faces.elc \
-        $(lispsource)/button.elc \
-        $(lispsource)/startup.elc \
-        $(lispsource)/minibuffer.elc \
-        $(lispsource)/abbrev.elc \
-        $(lispsource)/simple.elc \
-        $(lispsource)/help.elc \
-        $(lispsource)/jka-cmpr-hook.elc \
-        $(lispsource)/epa-hook.elc \
-        $(lispsource)/international/mule-cmds.elc \
-        $(lispsource)/case-table.elc \
-        $(lispsource)/international/characters.elc \
-        $(lispsource)/composite.elc \
-        $(lispsource)/international/charprop.el \
-        $(lispsource)/language/chinese.elc \
-        $(lispsource)/language/cyrillic.elc \
-        $(lispsource)/language/indian.elc \
-        $(lispsource)/language/sinhala.el \
-        $(lispsource)/language/english.el \
-        $(lispsource)/language/ethiopic.elc \
-        $(lispsource)/language/european.elc \
-        $(lispsource)/language/czech.el \
-        $(lispsource)/language/slovak.el \
-        $(lispsource)/language/romanian.el \
-        $(lispsource)/language/greek.el \
-        $(lispsource)/language/hebrew.elc \
-        $(lispsource)/language/japanese.el \
-        $(lispsource)/language/korean.el \
-        $(lispsource)/language/lao.el \
-        $(lispsource)/language/tai-viet.el \
-        $(lispsource)/language/thai.el \
-        $(lispsource)/language/tibetan.elc \
-        $(lispsource)/language/vietnamese.elc \
-        $(lispsource)/language/misc-lang.el \
-        $(lispsource)/language/utf-8-lang.el \
-        $(lispsource)/language/georgian.el \
-        $(lispsource)/language/khmer.el \
-        $(lispsource)/language/burmese.el \
-        $(lispsource)/language/cham.el \
-        $(lispsource)/indent.elc \
-        $(lispsource)/window.elc \
-        $(lispsource)/frame.elc \
-        $(lispsource)/term/tty-colors.elc \
-        $(lispsource)/font-core.elc \
-        $(lispsource)/facemenu.elc \
-        $(lispsource)/emacs-lisp/syntax.elc \
-        $(lispsource)/font-lock.elc \
-        $(lispsource)/jit-lock.elc \
-        $(lispsource)/mouse.elc \
-        $(lispsource)/scroll-bar.elc \
-        $(lispsource)/select.elc \
-        $(lispsource)/emacs-lisp/timer.elc \
-        $(lispsource)/isearch.elc \
-        $(lispsource)/rfn-eshadow.elc \
-        $(lispsource)/menu-bar.elc \
-        $(lispsource)/paths.el \
-        $(lispsource)/emacs-lisp/lisp.elc \
-        $(lispsource)/textmodes/page.elc \
-        $(lispsource)/register.elc \
-        $(lispsource)/textmodes/paragraphs.elc \
-        $(lispsource)/emacs-lisp/lisp-mode.elc \
-        $(lispsource)/textmodes/text-mode.elc \
-        $(lispsource)/textmodes/fill.elc \
-        $(lispsource)/replace.elc \
-        $(lispsource)/buff-menu.elc \
-        $(lispsource)/fringe.elc \
-        $(lispsource)/image.elc \
-        $(lispsource)/international/fontset.elc \
-        $(lispsource)/dnd.elc \
-        $(lispsource)/tool-bar.elc \
-        $(lispsource)/dynamic-setting.elc \
-        $(lispsource)/x-dnd.elc \
-        $(lispsource)/term/common-win.elc \
-        $(lispsource)/term/x-win.elc \
-        $(lispsource)/w32-vars.elc \
-        $(lispsource)/term/w32-win.elc \
-        $(lispsource)/ls-lisp.elc \
-        $(lispsource)/disp-table.elc \
-        $(lispsource)/dos-w32.elc \
-        $(lispsource)/w32-fns.elc \
-        $(lispsource)/dos-fns.elc \
-        $(lispsource)/dos-vars.elc \
-        $(lispsource)/term/pc-win.elc \
-        $(lispsource)/term/internal.elc \
-        $(lispsource)/term/ns-win.elc \
-        $(lispsource)/mwheel.elc \
-        $(lispsource)/emacs-lisp/float-sup.elc \
-        $(lispsource)/vc/vc-hooks.elc \
-        $(lispsource)/vc/ediff-hook.elc \
-        $(lispsource)/tooltip.elc
-## The same as $lisp, but using relative file names.  The only reason
-## this variable exists is to prevent the make-docfile command-line
-## getting too long for some systems.  Unfortunately, no-one has any
-## idea how long "too long" is.
-shortlisp= \
-        ../lisp/loaddefs.el \
-        ../lisp/loadup.el \
-        ../lisp/emacs-lisp/byte-run.elc \
-        ../lisp/emacs-lisp/backquote.elc \
-        ../lisp/subr.elc \
-        ../lisp/version.el \
-        ../lisp/widget.elc \
-        ../lisp/custom.elc \
-        ../lisp/emacs-lisp/map-ynp.elc \
-        ../lisp/cus-start.elc \
-        ../lisp/international/mule.elc \
-        ../lisp/international/mule-conf.elc \
-        ../lisp/env.elc \
-        ../lisp/format.elc \
-        ../lisp/bindings.elc \
-        ../lisp/files.elc \
-        ../lisp/cus-face.elc \
-        ../lisp/faces.elc \
-        ../lisp/button.elc \
-        ../lisp/startup.elc \
-        ../lisp/minibuffer.elc \
-        ../lisp/abbrev.elc \
-        ../lisp/simple.elc \
-        ../lisp/help.elc \
-        ../lisp/jka-cmpr-hook.elc \
-        ../lisp/epa-hook.elc \
-        ../lisp/international/mule-cmds.elc \
-        ../lisp/case-table.elc \
-        ../lisp/international/characters.elc \
-        ../lisp/composite.elc \
-        ../lisp/international/charprop.el \
-        ../lisp/language/chinese.elc \
-        ../lisp/language/cyrillic.elc \
-        ../lisp/language/indian.elc \
-        ../lisp/language/sinhala.el \
-        ../lisp/language/english.el \
-        ../lisp/language/ethiopic.elc \
-        ../lisp/language/european.elc \
-        ../lisp/language/czech.el \
-        ../lisp/language/slovak.el \
-        ../lisp/language/romanian.el \
-        ../lisp/language/greek.el \
-        ../lisp/language/hebrew.elc \
-        ../lisp/language/japanese.el \
-        ../lisp/language/korean.el \
-        ../lisp/language/lao.el \
-        ../lisp/language/tai-viet.el \
-        ../lisp/language/thai.el \
-        ../lisp/language/tibetan.elc \
-        ../lisp/language/vietnamese.elc \
-        ../lisp/language/misc-lang.el \
-        ../lisp/language/utf-8-lang.el \
-        ../lisp/language/georgian.el \
-        ../lisp/language/khmer.el \
-        ../lisp/language/burmese.el \
-        ../lisp/language/cham.el \
-        ../lisp/indent.elc \
-        ../lisp/window.elc \
-        ../lisp/frame.elc \
-        ../lisp/term/tty-colors.elc \
-        ../lisp/font-core.elc \
-        ../lisp/facemenu.elc \
-        ../lisp/emacs-lisp/syntax.elc \
-        ../lisp/font-lock.elc \
-        ../lisp/jit-lock.elc \
-        ../lisp/mouse.elc \
-        ../lisp/scroll-bar.elc \
-        ../lisp/select.elc \
-        ../lisp/emacs-lisp/timer.elc \
-        ../lisp/isearch.elc \
-        ../lisp/rfn-eshadow.elc \
-        ../lisp/menu-bar.elc \
-        ../lisp/paths.el \
-        ../lisp/emacs-lisp/lisp.elc \
-        ../lisp/textmodes/page.elc \
-        ../lisp/register.elc \
-        ../lisp/textmodes/paragraphs.elc \
-        ../lisp/emacs-lisp/lisp-mode.elc \
-        ../lisp/textmodes/text-mode.elc \
-        ../lisp/textmodes/fill.elc \
-        ../lisp/replace.elc \
-        ../lisp/buff-menu.elc \
-        ../lisp/fringe.elc \
-        ../lisp/image.elc \
-        ../lisp/international/fontset.elc \
-        ../lisp/dnd.elc \
-        ../lisp/tool-bar.elc \
-        ../lisp/dynamic-setting.elc \
-        ../lisp/x-dnd.elc \
-        ../lisp/term/common-win.elc \
-        ../lisp/term/x-win.elc \
-        ../lisp/w32-vars.elc \
-        ../lisp/term/w32-win.elc \
-        ../lisp/ls-lisp.elc \
-        ../lisp/disp-table.elc \
-        ../lisp/dos-w32.elc \
-        ../lisp/w32-fns.elc \
-        ../lisp/dos-fns.elc \
-        ../lisp/dos-vars.elc \
-        ../lisp/term/pc-win.elc \
-        ../lisp/term/internal.elc \
-        ../lisp/term/ns-win.elc \
-        ../lisp/mwheel.elc \
-        ../lisp/emacs-lisp/float-sup.elc \
-        ../lisp/vc/vc-hooks.elc \
-        ../lisp/vc/ediff-hook.elc \
-        ../lisp/tooltip.elc
 ## Construct full set of libraries to be linked.
 ## Note that SunOS needs -lm to come before -lc; otherwise, you get
@@ -634,21 +395,23 @@ emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp)
        fi
 ## We run make-docfile twice because the command line may get too long
-## on some systems.
+## on some systems.  The sed command operating on lisp.mk also reduces
+## the length of the command line.  Unfortunately, no-one has any idea
+## exactly how long the maximum safe command line length is on all the
+## various systems that Emacs supports.  Obviously, the length depends
+## on what your value of $srcdir is.  If the length restriction goes
+## away, lisp.mk can be merged back into this file.
+##
 ## $(SOME_MACHINE_OBJECTS) comes before $(obj) because some files may
 ## or may not be included in $(obj), but they are always included in
 ## $(SOME_MACHINE_OBJECTS).  Since a file is processed when it is mentioned
 ## for the first time, this prevents any variation between configurations
 ## in the contents of the DOC file.
-## Most of this Makefile refers to Lisp files via $(lispsource), so
+##
-## we also use $(lisp) rather than $(shortlisp) for the dependency since
-## the Makefile uses string equality to decide when we talk about identical
-## files.  Apparently we pass $(shortlisp) rather than $(lisp) to make-docfile
-## only in order to reduce the command line length.  --Stef
 $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
        -rm -f $(etc)/DOC
        $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC
-        $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) $(shortlisp)
+        $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) `sed -n -e 's| \\\\||' -e 's|^[       ]*$$(lispsource)|../lisp|p' $(srcdir)/lisp.mk`
 $(libsrc)/make-docfile$(EXEEXT):
        cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT)
diff --git a/src/lisp.mk b/src/lisp.mk
new file mode 100644
index 00000000000..68748b27f28
--- /dev/null
+++ b/src/lisp.mk
@@ -0,0 +1,160 @@
+### lisp.mk --- src/Makefile fragment for GNU Emacs
+## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2011
+##   Free Software Foundation, Inc.
+## This file is part of GNU Emacs.
+## GNU Emacs is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+## 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
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+### Commentary:
+## This is the list of all Lisp files that might be loaded into the
+## dumped Emacs.  Some of them are not loaded on all platforms, but
+## the DOC file on every platform uses them (because the DOC file is
+## supposed to be platform-independent).
+## It is arranged like this because it is easier to generate it
+## semi-mechanically from loadup.el this way.
+## Eg something like:
+##   sed -e 's/"[ )].*//' -n -e '/(load "/ s/.*load "//p' loadup.el | \
+##   grep -vE 'site-|ldefs-boot'
+## minus any duplicates.
+## Note that you cannot just add a ".elc" extension to every file,
+## since some of them are no-byte-compile (eg some language/ ones).
+## Confusingly, term/internal is not in loadup, but is unconditionally
+## loaded by pc-win, which is.
+## Note that this list should not include lisp files which might not
+## be present, like site-load.el and site-init.el; this makefile
+## expects them all to be either present or buildable.
+## Place loaddefs.el first, so it gets generated first, since it is on
+## the critical path (relevant in parallel compilations).
+### Code:
+## NB: This list is parsed by sed in the main src/Makefile.
+## Do not change the formatting.
+lisp = \
+        $(lispsource)/loaddefs.el \
+        $(lispsource)/loadup.el \
+        $(lispsource)/emacs-lisp/byte-run.elc \
+        $(lispsource)/emacs-lisp/backquote.elc \
+        $(lispsource)/subr.elc \
+        $(lispsource)/version.el \
+        $(lispsource)/widget.elc \
+        $(lispsource)/custom.elc \
+        $(lispsource)/emacs-lisp/map-ynp.elc \
+        $(lispsource)/cus-start.elc \
+        $(lispsource)/international/mule.elc \
+        $(lispsource)/international/mule-conf.elc \
+        $(lispsource)/env.elc \
+        $(lispsource)/format.elc \
+        $(lispsource)/bindings.elc \
+        $(lispsource)/files.elc \
+        $(lispsource)/cus-face.elc \
+        $(lispsource)/faces.elc \
+        $(lispsource)/button.elc \
+        $(lispsource)/startup.elc \
+        $(lispsource)/minibuffer.elc \
+        $(lispsource)/abbrev.elc \
+        $(lispsource)/simple.elc \
+        $(lispsource)/help.elc \
+        $(lispsource)/jka-cmpr-hook.elc \
+        $(lispsource)/epa-hook.elc \
+        $(lispsource)/international/mule-cmds.elc \
+        $(lispsource)/case-table.elc \
+        $(lispsource)/international/characters.elc \
+        $(lispsource)/composite.elc \
+        $(lispsource)/international/charprop.el \
+        $(lispsource)/language/chinese.elc \
+        $(lispsource)/language/cyrillic.elc \
+        $(lispsource)/language/indian.elc \
+        $(lispsource)/language/sinhala.el \
+        $(lispsource)/language/english.el \
+        $(lispsource)/language/ethiopic.elc \
+        $(lispsource)/language/european.elc \
+        $(lispsource)/language/czech.el \
+        $(lispsource)/language/slovak.el \
+        $(lispsource)/language/romanian.el \
+        $(lispsource)/language/greek.el \
+        $(lispsource)/language/hebrew.elc \
+        $(lispsource)/language/japanese.el \
+        $(lispsource)/language/korean.el \
+        $(lispsource)/language/lao.el \
+        $(lispsource)/language/tai-viet.el \
+        $(lispsource)/language/thai.el \
+        $(lispsource)/language/tibetan.elc \
+        $(lispsource)/language/vietnamese.elc \
+        $(lispsource)/language/misc-lang.el \
+        $(lispsource)/language/utf-8-lang.el \
+        $(lispsource)/language/georgian.el \
+        $(lispsource)/language/khmer.el \
+        $(lispsource)/language/burmese.el \
+        $(lispsource)/language/cham.el \
+        $(lispsource)/indent.elc \
+        $(lispsource)/window.elc \
+        $(lispsource)/frame.elc \
+        $(lispsource)/term/tty-colors.elc \
+        $(lispsource)/font-core.elc \
+        $(lispsource)/facemenu.elc \
+        $(lispsource)/emacs-lisp/syntax.elc \
+        $(lispsource)/font-lock.elc \
+        $(lispsource)/jit-lock.elc \
+        $(lispsource)/mouse.elc \
+        $(lispsource)/scroll-bar.elc \
+        $(lispsource)/select.elc \
+        $(lispsource)/emacs-lisp/timer.elc \
+        $(lispsource)/isearch.elc \
+        $(lispsource)/rfn-eshadow.elc \
+        $(lispsource)/menu-bar.elc \
+        $(lispsource)/paths.el \
+        $(lispsource)/emacs-lisp/lisp.elc \
+        $(lispsource)/textmodes/page.elc \
+        $(lispsource)/register.elc \
+        $(lispsource)/textmodes/paragraphs.elc \
+        $(lispsource)/emacs-lisp/lisp-mode.elc \
+        $(lispsource)/textmodes/text-mode.elc \
+        $(lispsource)/textmodes/fill.elc \
+        $(lispsource)/replace.elc \
+        $(lispsource)/buff-menu.elc \
+        $(lispsource)/fringe.elc \
+        $(lispsource)/image.elc \
+        $(lispsource)/international/fontset.elc \
+        $(lispsource)/dnd.elc \
+        $(lispsource)/tool-bar.elc \
+        $(lispsource)/dynamic-setting.elc \
+        $(lispsource)/x-dnd.elc \
+        $(lispsource)/term/common-win.elc \
+        $(lispsource)/term/x-win.elc \
+        $(lispsource)/w32-vars.elc \
+        $(lispsource)/term/w32-win.elc \
+        $(lispsource)/ls-lisp.elc \
+        $(lispsource)/disp-table.elc \
+        $(lispsource)/dos-w32.elc \
+        $(lispsource)/w32-fns.elc \
+        $(lispsource)/dos-fns.elc \
+        $(lispsource)/dos-vars.elc \
+        $(lispsource)/term/pc-win.elc \
+        $(lispsource)/term/internal.elc \
+        $(lispsource)/term/ns-win.elc \
+        $(lispsource)/mwheel.elc \
+        $(lispsource)/emacs-lisp/float-sup.elc \
+        $(lispsource)/vc/vc-hooks.elc \
+        $(lispsource)/vc/ediff-hook.elc \
+        $(lispsource)/tooltip.elc
+### lisp.mk ends here
author	Glenn Morris	2011-05-19 17:41:03 -0700
committer	Glenn Morris	2011-05-19 17:41:03 -0700
commit	b9704ad9939ec1f6b5753c883bc023a55918023f (patch)
tree	d28745480bd02b4af9fdceccdad0247df879db53 /src
parent	cfe397c6d2123c82a12bbed1f26a45d0ddfc781f (diff)
download	emacs-b9704ad9939ec1f6b5753c883bc023a55918023f.tar.gz emacs-b9704ad9939ec1f6b5753c883bc023a55918023f.zip

diff --git a/src/ChangeLog b/src/ChangeLog index 1b54ae05c59..ba84d2d2700 100644 --- a/src/ChangeLog +++ b/src/ChangeLog
@@ -1,3 +1,10 @@
		1	2011-05-20 Glenn Morris <rgm@gnu.org>
		2
		3	* lisp.mk: New file, split from Makefile.in.
		4	* Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
		5	(shortlisp): Remove.
		6	($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.
		7
1	2011-05-19 Glenn Morris <rgm@gnu.org>	8	2011-05-19 Glenn Morris <rgm@gnu.org>
2		9
3	* Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)	10	* Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)


diff --git a/src/Makefile.in b/src/Makefile.in index 6476880a0fd..557a6f54748 100644 --- a/src/Makefile.in +++ b/src/Makefile.in
@@ -358,249 +358,10 @@ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
358	otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \	358	otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
359	$(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS)	359	$(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
360		360
361	## This is the list of all Lisp files that might be loaded into the	361
362	## dumped Emacs. Some of them are not loaded on all platforms, but	362	## Configure inserts the file lisp.mk at this point, defining $lisp.
363	## the DOC file on every platform uses them (because the DOC file is	363	@lisp_frag@
364	## supposed to be platform-independent).	364
365	## It is arranged like this because it is easier to generate it
366	## semi-mechanically from loadup.el this way.
367	## Eg something like:
368	## sed -e 's/"[ )].//' -n -e '/(load "/ s/.load "//p' loadup.el \| \
369	## grep -vE 'site-\|ldefs-boot'
370	## minus any duplicates.
371	## Note that you cannot just add a ".elc" extension to every file,
372	## since some of them are no-byte-compile (eg some language/ ones).
373	##
374	## Confusingly, term/internal is not in loadup, but is unconditionally
375	## loaded by pc-win, which is.
376	##
377	## Note that this list should not include lisp files which might not
378	## be present, like site-load.el and site-init.el; this makefile
379	## expects them all to be either present or buildable.
380	##
381	## Place loaddefs.el first, so it gets generated first, since it is on
382	## the critical path (relevant in parallel compilations).
383	lisp= \
384	$(lispsource)/loaddefs.el \
385	$(lispsource)/loadup.el \
386	$(lispsource)/emacs-lisp/byte-run.elc \
387	$(lispsource)/emacs-lisp/backquote.elc \
388	$(lispsource)/subr.elc \
389	$(lispsource)/version.el \
390	$(lispsource)/widget.elc \
391	$(lispsource)/custom.elc \
392	$(lispsource)/emacs-lisp/map-ynp.elc \
393	$(lispsource)/cus-start.elc \
394	$(lispsource)/international/mule.elc \
395	$(lispsource)/international/mule-conf.elc \
396	$(lispsource)/env.elc \
397	$(lispsource)/format.elc \
398	$(lispsource)/bindings.elc \
399	$(lispsource)/files.elc \
400	$(lispsource)/cus-face.elc \
401	$(lispsource)/faces.elc \
402	$(lispsource)/button.elc \
403	$(lispsource)/startup.elc \
404	$(lispsource)/minibuffer.elc \
405	$(lispsource)/abbrev.elc \
406	$(lispsource)/simple.elc \
407	$(lispsource)/help.elc \
408	$(lispsource)/jka-cmpr-hook.elc \
409	$(lispsource)/epa-hook.elc \
410	$(lispsource)/international/mule-cmds.elc \
411	$(lispsource)/case-table.elc \
412	$(lispsource)/international/characters.elc \
413	$(lispsource)/composite.elc \
414	$(lispsource)/international/charprop.el \
415	$(lispsource)/language/chinese.elc \
416	$(lispsource)/language/cyrillic.elc \
417	$(lispsource)/language/indian.elc \
418	$(lispsource)/language/sinhala.el \
419	$(lispsource)/language/english.el \
420	$(lispsource)/language/ethiopic.elc \
421	$(lispsource)/language/european.elc \
422	$(lispsource)/language/czech.el \
423	$(lispsource)/language/slovak.el \
424	$(lispsource)/language/romanian.el \
425	$(lispsource)/language/greek.el \
426	$(lispsource)/language/hebrew.elc \
427	$(lispsource)/language/japanese.el \
428	$(lispsource)/language/korean.el \
429	$(lispsource)/language/lao.el \
430	$(lispsource)/language/tai-viet.el \
431	$(lispsource)/language/thai.el \
432	$(lispsource)/language/tibetan.elc \
433	$(lispsource)/language/vietnamese.elc \
434	$(lispsource)/language/misc-lang.el \
435	$(lispsource)/language/utf-8-lang.el \
436	$(lispsource)/language/georgian.el \
437	$(lispsource)/language/khmer.el \
438	$(lispsource)/language/burmese.el \
439	$(lispsource)/language/cham.el \
440	$(lispsource)/indent.elc \
441	$(lispsource)/window.elc \
442	$(lispsource)/frame.elc \
443	$(lispsource)/term/tty-colors.elc \
444	$(lispsource)/font-core.elc \
445	$(lispsource)/facemenu.elc \
446	$(lispsource)/emacs-lisp/syntax.elc \
447	$(lispsource)/font-lock.elc \
448	$(lispsource)/jit-lock.elc \
449	$(lispsource)/mouse.elc \
450	$(lispsource)/scroll-bar.elc \
451	$(lispsource)/select.elc \
452	$(lispsource)/emacs-lisp/timer.elc \
453	$(lispsource)/isearch.elc \
454	$(lispsource)/rfn-eshadow.elc \
455	$(lispsource)/menu-bar.elc \
456	$(lispsource)/paths.el \
457	$(lispsource)/emacs-lisp/lisp.elc \
458	$(lispsource)/textmodes/page.elc \
459	$(lispsource)/register.elc \
460	$(lispsource)/textmodes/paragraphs.elc \
461	$(lispsource)/emacs-lisp/lisp-mode.elc \
462	$(lispsource)/textmodes/text-mode.elc \
463	$(lispsource)/textmodes/fill.elc \
464	$(lispsource)/replace.elc \
465	$(lispsource)/buff-menu.elc \
466	$(lispsource)/fringe.elc \
467	$(lispsource)/image.elc \
468	$(lispsource)/international/fontset.elc \
469	$(lispsource)/dnd.elc \
470	$(lispsource)/tool-bar.elc \
471	$(lispsource)/dynamic-setting.elc \
472	$(lispsource)/x-dnd.elc \
473	$(lispsource)/term/common-win.elc \
474	$(lispsource)/term/x-win.elc \
475	$(lispsource)/w32-vars.elc \
476	$(lispsource)/term/w32-win.elc \
477	$(lispsource)/ls-lisp.elc \
478	$(lispsource)/disp-table.elc \
479	$(lispsource)/dos-w32.elc \
480	$(lispsource)/w32-fns.elc \
481	$(lispsource)/dos-fns.elc \
482	$(lispsource)/dos-vars.elc \
483	$(lispsource)/term/pc-win.elc \
484	$(lispsource)/term/internal.elc \
485	$(lispsource)/term/ns-win.elc \
486	$(lispsource)/mwheel.elc \
487	$(lispsource)/emacs-lisp/float-sup.elc \
488	$(lispsource)/vc/vc-hooks.elc \
489	$(lispsource)/vc/ediff-hook.elc \
490	$(lispsource)/tooltip.elc
491
492	## The same as $lisp, but using relative file names. The only reason
493	## this variable exists is to prevent the make-docfile command-line
494	## getting too long for some systems. Unfortunately, no-one has any
495	## idea how long "too long" is.
496	shortlisp= \
497	../lisp/loaddefs.el \
498	../lisp/loadup.el \
499	../lisp/emacs-lisp/byte-run.elc \
500	../lisp/emacs-lisp/backquote.elc \
501	../lisp/subr.elc \
502	../lisp/version.el \
503	../lisp/widget.elc \
504	../lisp/custom.elc \
505	../lisp/emacs-lisp/map-ynp.elc \
506	../lisp/cus-start.elc \
507	../lisp/international/mule.elc \
508	../lisp/international/mule-conf.elc \
509	../lisp/env.elc \
510	../lisp/format.elc \
511	../lisp/bindings.elc \
512	../lisp/files.elc \
513	../lisp/cus-face.elc \
514	../lisp/faces.elc \
515	../lisp/button.elc \
516	../lisp/startup.elc \
517	../lisp/minibuffer.elc \
518	../lisp/abbrev.elc \
519	../lisp/simple.elc \
520	../lisp/help.elc \
521	../lisp/jka-cmpr-hook.elc \
522	../lisp/epa-hook.elc \
523	../lisp/international/mule-cmds.elc \
524	../lisp/case-table.elc \
525	../lisp/international/characters.elc \
526	../lisp/composite.elc \
527	../lisp/international/charprop.el \
528	../lisp/language/chinese.elc \
529	../lisp/language/cyrillic.elc \
530	../lisp/language/indian.elc \
531	../lisp/language/sinhala.el \
532	../lisp/language/english.el \
533	../lisp/language/ethiopic.elc \
534	../lisp/language/european.elc \
535	../lisp/language/czech.el \
536	../lisp/language/slovak.el \
537	../lisp/language/romanian.el \
538	../lisp/language/greek.el \
539	../lisp/language/hebrew.elc \
540	../lisp/language/japanese.el \
541	../lisp/language/korean.el \
542	../lisp/language/lao.el \
543	../lisp/language/tai-viet.el \
544	../lisp/language/thai.el \
545	../lisp/language/tibetan.elc \
546	../lisp/language/vietnamese.elc \
547	../lisp/language/misc-lang.el \
548	../lisp/language/utf-8-lang.el \
549	../lisp/language/georgian.el \
550	../lisp/language/khmer.el \
551	../lisp/language/burmese.el \
552	../lisp/language/cham.el \
553	../lisp/indent.elc \
554	../lisp/window.elc \
555	../lisp/frame.elc \
556	../lisp/term/tty-colors.elc \
557	../lisp/font-core.elc \
558	../lisp/facemenu.elc \
559	../lisp/emacs-lisp/syntax.elc \
560	../lisp/font-lock.elc \
561	../lisp/jit-lock.elc \
562	../lisp/mouse.elc \
563	../lisp/scroll-bar.elc \
564	../lisp/select.elc \
565	../lisp/emacs-lisp/timer.elc \
566	../lisp/isearch.elc \
567	../lisp/rfn-eshadow.elc \
568	../lisp/menu-bar.elc \
569	../lisp/paths.el \
570	../lisp/emacs-lisp/lisp.elc \
571	../lisp/textmodes/page.elc \
572	../lisp/register.elc \
573	../lisp/textmodes/paragraphs.elc \
574	../lisp/emacs-lisp/lisp-mode.elc \
575	../lisp/textmodes/text-mode.elc \
576	../lisp/textmodes/fill.elc \
577	../lisp/replace.elc \
578	../lisp/buff-menu.elc \
579	../lisp/fringe.elc \
580	../lisp/image.elc \
581	../lisp/international/fontset.elc \
582	../lisp/dnd.elc \
583	../lisp/tool-bar.elc \
584	../lisp/dynamic-setting.elc \
585	../lisp/x-dnd.elc \
586	../lisp/term/common-win.elc \
587	../lisp/term/x-win.elc \
588	../lisp/w32-vars.elc \
589	../lisp/term/w32-win.elc \
590	../lisp/ls-lisp.elc \
591	../lisp/disp-table.elc \
592	../lisp/dos-w32.elc \
593	../lisp/w32-fns.elc \
594	../lisp/dos-fns.elc \
595	../lisp/dos-vars.elc \
596	../lisp/term/pc-win.elc \
597	../lisp/term/internal.elc \
598	../lisp/term/ns-win.elc \
599	../lisp/mwheel.elc \
600	../lisp/emacs-lisp/float-sup.elc \
601	../lisp/vc/vc-hooks.elc \
602	../lisp/vc/ediff-hook.elc \
603	../lisp/tooltip.elc
604		365
605	## Construct full set of libraries to be linked.	366	## Construct full set of libraries to be linked.
606	## Note that SunOS needs -lm to come before -lc; otherwise, you get	367	## Note that SunOS needs -lm to come before -lc; otherwise, you get
@@ -634,21 +395,23 @@ emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp)
634	fi	395	fi
635		396
636	## We run make-docfile twice because the command line may get too long	397	## We run make-docfile twice because the command line may get too long
637	## on some systems.	398	## on some systems. The sed command operating on lisp.mk also reduces
		399	## the length of the command line. Unfortunately, no-one has any idea
		400	## exactly how long the maximum safe command line length is on all the
		401	## various systems that Emacs supports. Obviously, the length depends
		402	## on what your value of $srcdir is. If the length restriction goes
		403	## away, lisp.mk can be merged back into this file.
		404	##
638	## $(SOME_MACHINE_OBJECTS) comes before $(obj) because some files may	405	## $(SOME_MACHINE_OBJECTS) comes before $(obj) because some files may
639	## or may not be included in $(obj), but they are always included in	406	## or may not be included in $(obj), but they are always included in
640	## $(SOME_MACHINE_OBJECTS). Since a file is processed when it is mentioned	407	## $(SOME_MACHINE_OBJECTS). Since a file is processed when it is mentioned
641	## for the first time, this prevents any variation between configurations	408	## for the first time, this prevents any variation between configurations
642	## in the contents of the DOC file.	409	## in the contents of the DOC file.
643	## Most of this Makefile refers to Lisp files via $(lispsource), so	410	##
644	## we also use $(lisp) rather than $(shortlisp) for the dependency since
645	## the Makefile uses string equality to decide when we talk about identical
646	## files. Apparently we pass $(shortlisp) rather than $(lisp) to make-docfile
647	## only in order to reduce the command line length. --Stef
648	$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)	411	$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
649	-rm -f $(etc)/DOC	412	-rm -f $(etc)/DOC
650	$(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC	413	$(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC
651	$(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) $(shortlisp)	414	$(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) `sed -n -e 's\| \\\\\|\|' -e 's\|^[ ]*$$(lispsource)\|../lisp\|p' $(srcdir)/lisp.mk`
652		415
653	$(libsrc)/make-docfile$(EXEEXT):	416	$(libsrc)/make-docfile$(EXEEXT):
654	cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT)	417	cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT)


diff --git a/src/lisp.mk b/src/lisp.mk new file mode 100644 index 00000000000..68748b27f28 --- /dev/null +++ b/src/lisp.mk
@@ -0,0 +1,160 @@
		1	### lisp.mk --- src/Makefile fragment for GNU Emacs
		2
		3	## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2011
		4	## Free Software Foundation, Inc.
		5
		6	## This file is part of GNU Emacs.
		7
		8	## GNU Emacs is free software: you can redistribute it and/or modify
		9	## it under the terms of the GNU General Public License as published by
		10	## the Free Software Foundation, either version 3 of the License, or
		11	## (at your option) any later version.
		12
		13	## GNU Emacs is distributed in the hope that it will be useful,
		14	## but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	## GNU General Public License for more details.
		17
		18	## You should have received a copy of the GNU General Public License
		19	## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
		20
		21	### Commentary:
		22
		23	## This is the list of all Lisp files that might be loaded into the
		24	## dumped Emacs. Some of them are not loaded on all platforms, but
		25	## the DOC file on every platform uses them (because the DOC file is
		26	## supposed to be platform-independent).
		27	## It is arranged like this because it is easier to generate it
		28	## semi-mechanically from loadup.el this way.
		29	## Eg something like:
		30	## sed -e 's/"[ )].//' -n -e '/(load "/ s/.load "//p' loadup.el \| \
		31	## grep -vE 'site-\|ldefs-boot'
		32	## minus any duplicates.
		33	## Note that you cannot just add a ".elc" extension to every file,
		34	## since some of them are no-byte-compile (eg some language/ ones).
		35
		36	## Confusingly, term/internal is not in loadup, but is unconditionally
		37	## loaded by pc-win, which is.
		38
		39	## Note that this list should not include lisp files which might not
		40	## be present, like site-load.el and site-init.el; this makefile
		41	## expects them all to be either present or buildable.
		42
		43	## Place loaddefs.el first, so it gets generated first, since it is on
		44	## the critical path (relevant in parallel compilations).
		45
		46	### Code:
		47
		48	## NB: This list is parsed by sed in the main src/Makefile.
		49	## Do not change the formatting.
		50	lisp = \
		51	$(lispsource)/loaddefs.el \
		52	$(lispsource)/loadup.el \
		53	$(lispsource)/emacs-lisp/byte-run.elc \
		54	$(lispsource)/emacs-lisp/backquote.elc \
		55	$(lispsource)/subr.elc \
		56	$(lispsource)/version.el \
		57	$(lispsource)/widget.elc \
		58	$(lispsource)/custom.elc \
		59	$(lispsource)/emacs-lisp/map-ynp.elc \
		60	$(lispsource)/cus-start.elc \
		61	$(lispsource)/international/mule.elc \
		62	$(lispsource)/international/mule-conf.elc \
		63	$(lispsource)/env.elc \
		64	$(lispsource)/format.elc \
		65	$(lispsource)/bindings.elc \
		66	$(lispsource)/files.elc \
		67	$(lispsource)/cus-face.elc \
		68	$(lispsource)/faces.elc \
		69	$(lispsource)/button.elc \
		70	$(lispsource)/startup.elc \
		71	$(lispsource)/minibuffer.elc \
		72	$(lispsource)/abbrev.elc \
		73	$(lispsource)/simple.elc \
		74	$(lispsource)/help.elc \
		75	$(lispsource)/jka-cmpr-hook.elc \
		76	$(lispsource)/epa-hook.elc \
		77	$(lispsource)/international/mule-cmds.elc \
		78	$(lispsource)/case-table.elc \
		79	$(lispsource)/international/characters.elc \
		80	$(lispsource)/composite.elc \
		81	$(lispsource)/international/charprop.el \
		82	$(lispsource)/language/chinese.elc \
		83	$(lispsource)/language/cyrillic.elc \
		84	$(lispsource)/language/indian.elc \
		85	$(lispsource)/language/sinhala.el \
		86	$(lispsource)/language/english.el \
		87	$(lispsource)/language/ethiopic.elc \
		88	$(lispsource)/language/european.elc \
		89	$(lispsource)/language/czech.el \
		90	$(lispsource)/language/slovak.el \
		91	$(lispsource)/language/romanian.el \
		92	$(lispsource)/language/greek.el \
		93	$(lispsource)/language/hebrew.elc \
		94	$(lispsource)/language/japanese.el \
		95	$(lispsource)/language/korean.el \
		96	$(lispsource)/language/lao.el \
		97	$(lispsource)/language/tai-viet.el \
		98	$(lispsource)/language/thai.el \
		99	$(lispsource)/language/tibetan.elc \
		100	$(lispsource)/language/vietnamese.elc \
		101	$(lispsource)/language/misc-lang.el \
		102	$(lispsource)/language/utf-8-lang.el \
		103	$(lispsource)/language/georgian.el \
		104	$(lispsource)/language/khmer.el \
		105	$(lispsource)/language/burmese.el \
		106	$(lispsource)/language/cham.el \
		107	$(lispsource)/indent.elc \
		108	$(lispsource)/window.elc \
		109	$(lispsource)/frame.elc \
		110	$(lispsource)/term/tty-colors.elc \
		111	$(lispsource)/font-core.elc \
		112	$(lispsource)/facemenu.elc \
		113	$(lispsource)/emacs-lisp/syntax.elc \
		114	$(lispsource)/font-lock.elc \
		115	$(lispsource)/jit-lock.elc \
		116	$(lispsource)/mouse.elc \
		117	$(lispsource)/scroll-bar.elc \
		118	$(lispsource)/select.elc \
		119	$(lispsource)/emacs-lisp/timer.elc \
		120	$(lispsource)/isearch.elc \
		121	$(lispsource)/rfn-eshadow.elc \
		122	$(lispsource)/menu-bar.elc \
		123	$(lispsource)/paths.el \
		124	$(lispsource)/emacs-lisp/lisp.elc \
		125	$(lispsource)/textmodes/page.elc \
		126	$(lispsource)/register.elc \
		127	$(lispsource)/textmodes/paragraphs.elc \
		128	$(lispsource)/emacs-lisp/lisp-mode.elc \
		129	$(lispsource)/textmodes/text-mode.elc \
		130	$(lispsource)/textmodes/fill.elc \
		131	$(lispsource)/replace.elc \
		132	$(lispsource)/buff-menu.elc \
		133	$(lispsource)/fringe.elc \
		134	$(lispsource)/image.elc \
		135	$(lispsource)/international/fontset.elc \
		136	$(lispsource)/dnd.elc \
		137	$(lispsource)/tool-bar.elc \
		138	$(lispsource)/dynamic-setting.elc \
		139	$(lispsource)/x-dnd.elc \
		140	$(lispsource)/term/common-win.elc \
		141	$(lispsource)/term/x-win.elc \
		142	$(lispsource)/w32-vars.elc \
		143	$(lispsource)/term/w32-win.elc \
		144	$(lispsource)/ls-lisp.elc \
		145	$(lispsource)/disp-table.elc \
		146	$(lispsource)/dos-w32.elc \
		147	$(lispsource)/w32-fns.elc \
		148	$(lispsource)/dos-fns.elc \
		149	$(lispsource)/dos-vars.elc \
		150	$(lispsource)/term/pc-win.elc \
		151	$(lispsource)/term/internal.elc \
		152	$(lispsource)/term/ns-win.elc \
		153	$(lispsource)/mwheel.elc \
		154	$(lispsource)/emacs-lisp/float-sup.elc \
		155	$(lispsource)/vc/vc-hooks.elc \
		156	$(lispsource)/vc/ediff-hook.elc \
		157	$(lispsource)/tooltip.elc
		158
		159
		160	### lisp.mk ends here