Small src/Makefile simplification.

* src/lisp.mk (shortlisp): Rename from lisp, remove $lispsource prefix.
* src/Makefile.in (lisp): Derive from shortlisp.
($(etc)/DOC): Use $shortlisp rather than parsing lisp.mk.

3 files changed, 127 insertions, 132 deletions

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 525cbad9db7..b69005f0c01 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -29,7 +29,7 @@
 ;; If you add/remove Lisp files to be loaded here, consider the
 ;; following issues:
 
-;; i) Any file loaded on any platform should appear in $lisp in src/lisp.mk.
+;; i) Any file loaded on any platform should appear in src/lisp.mk.
 ;; Use the .el or .elc version as appropriate.
 
 ;; This ensures both that the Lisp files are compiled (if necessary)
diff --git a/src/Makefile.in b/src/Makefile.in
index 51a5b982474..f6fa03a8dfd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -420,6 +420,8 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
 
 include $(srcdir)/lisp.mk
 
+lisp = $(addprefix ${lispsource}/,${shortlisp})
+
 ## Construct full set of libraries to be linked.
 LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
@@ -463,12 +465,9 @@ else
 endif
 
 ## We run make-docfile twice because the command line may get too long
-## on some systems.  The sed command operating on lisp.mk also reduces
-## the length of the command line.  Unfortunately, no-one has any idea
+## on some systems.  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.
+## various systems that Emacs supports.
 ##
 ## $(SOME_MACHINE_OBJECTS) comes before $(obj) because some files may
 ## or may not be included in $(obj), but they are always included in
@@ -482,8 +481,7 @@ $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
 	$(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \
 	  $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC
 	$(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \
-	  `sed -n -e 's| \\\\||' -e 's|^[ 	]*$$(lispsource)/||p' \
-	     $(srcdir)/lisp.mk`
+	  $(shortlisp)
 
 $(libsrc)/make-docfile$(EXEEXT):
 	$(MAKE) -C $(libsrc) make-docfile$(EXEEXT)
diff --git a/src/lisp.mk b/src/lisp.mk
index 0a431a59d7d..32882d1ed3d 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -43,129 +43,126 @@
 
 ### 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.elc \
-	$(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)/emacs-lisp/macroexp.elc \
-	$(lispsource)/cus-face.elc \
-	$(lispsource)/faces.elc \
-	$(lispsource)/button.elc \
-	$(lispsource)/startup.elc \
-	$(lispsource)/emacs-lisp/cl-preloaded.elc \
-	$(lispsource)/emacs-lisp/nadvice.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.elc \
-	$(lispsource)/language/english.elc \
-	$(lispsource)/language/ethiopic.elc \
-	$(lispsource)/language/european.elc \
-	$(lispsource)/language/czech.elc \
-	$(lispsource)/language/slovak.elc \
-	$(lispsource)/language/romanian.elc \
-	$(lispsource)/language/greek.elc \
-	$(lispsource)/language/hebrew.elc \
-	$(lispsource)/international/cp51932.el \
-	$(lispsource)/international/eucjp-ms.el \
-	$(lispsource)/language/japanese.elc \
-	$(lispsource)/language/korean.elc \
-	$(lispsource)/language/lao.elc \
-	$(lispsource)/language/tai-viet.elc \
-	$(lispsource)/language/thai.elc \
-	$(lispsource)/language/tibetan.elc \
-	$(lispsource)/language/vietnamese.elc \
-	$(lispsource)/language/misc-lang.elc \
-	$(lispsource)/language/utf-8-lang.elc \
-	$(lispsource)/language/georgian.elc \
-	$(lispsource)/language/khmer.elc \
-	$(lispsource)/language/burmese.elc \
-	$(lispsource)/language/cham.elc \
-	$(lispsource)/indent.elc \
-	$(lispsource)/window.elc \
-	$(lispsource)/emacs-lisp/cl-generic.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)/emacs-lisp/lisp.elc \
-	$(lispsource)/textmodes/page.elc \
-	$(lispsource)/register.elc \
-	$(lispsource)/textmodes/paragraphs.elc \
-	$(lispsource)/progmodes/prog-mode.elc \
-	$(lispsource)/emacs-lisp/lisp-mode.elc \
-	$(lispsource)/progmodes/elisp-mode.elc \
-	$(lispsource)/textmodes/text-mode.elc \
-	$(lispsource)/textmodes/fill.elc \
-	$(lispsource)/newcomment.elc \
-	$(lispsource)/replace.elc \
-	$(lispsource)/emacs-lisp/tabulated-list.elc \
-	$(lispsource)/buff-menu.elc \
-	$(lispsource)/fringe.elc \
-	$(lispsource)/emacs-lisp/regexp-opt.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)/electric.elc \
-	$(lispsource)/emacs-lisp/eldoc.elc \
-	$(lispsource)/uniquify.elc \
-	$(lispsource)/tooltip.elc
-
+shortlisp = \
+	loaddefs.el \
+	loadup.el \
+	emacs-lisp/byte-run.elc \
+	emacs-lisp/backquote.elc \
+	subr.elc \
+	version.elc \
+	widget.elc \
+	custom.elc \
+	emacs-lisp/map-ynp.elc \
+	cus-start.elc \
+	international/mule.elc \
+	international/mule-conf.elc \
+	env.elc \
+	format.elc \
+	bindings.elc \
+	files.elc \
+	emacs-lisp/macroexp.elc \
+	cus-face.elc \
+	faces.elc \
+	button.elc \
+	startup.elc \
+	emacs-lisp/cl-preloaded.elc \
+	emacs-lisp/nadvice.elc \
+	minibuffer.elc \
+	abbrev.elc \
+	simple.elc \
+	help.elc \
+	jka-cmpr-hook.elc \
+	epa-hook.elc \
+	international/mule-cmds.elc \
+	case-table.elc \
+	international/characters.elc \
+	composite.elc \
+	international/charprop.el \
+	language/chinese.elc \
+	language/cyrillic.elc \
+	language/indian.elc \
+	language/sinhala.elc \
+	language/english.elc \
+	language/ethiopic.elc \
+	language/european.elc \
+	language/czech.elc \
+	language/slovak.elc \
+	language/romanian.elc \
+	language/greek.elc \
+	language/hebrew.elc \
+	international/cp51932.el \
+	international/eucjp-ms.el \
+	language/japanese.elc \
+	language/korean.elc \
+	language/lao.elc \
+	language/tai-viet.elc \
+	language/thai.elc \
+	language/tibetan.elc \
+	language/vietnamese.elc \
+	language/misc-lang.elc \
+	language/utf-8-lang.elc \
+	language/georgian.elc \
+	language/khmer.elc \
+	language/burmese.elc \
+	language/cham.elc \
+	indent.elc \
+	window.elc \
+	emacs-lisp/cl-generic.elc \
+	frame.elc \
+	term/tty-colors.elc \
+	font-core.elc \
+	facemenu.elc \
+	emacs-lisp/syntax.elc \
+	font-lock.elc \
+	jit-lock.elc \
+	mouse.elc \
+	scroll-bar.elc \
+	select.elc \
+	emacs-lisp/timer.elc \
+	isearch.elc \
+	rfn-eshadow.elc \
+	menu-bar.elc \
+	emacs-lisp/lisp.elc \
+	textmodes/page.elc \
+	register.elc \
+	textmodes/paragraphs.elc \
+	progmodes/prog-mode.elc \
+	emacs-lisp/lisp-mode.elc \
+	progmodes/elisp-mode.elc \
+	textmodes/text-mode.elc \
+	textmodes/fill.elc \
+	newcomment.elc \
+	replace.elc \
+	emacs-lisp/tabulated-list.elc \
+	buff-menu.elc \
+	fringe.elc \
+	emacs-lisp/regexp-opt.elc \
+	image.elc \
+	international/fontset.elc \
+	dnd.elc \
+	tool-bar.elc \
+	dynamic-setting.elc \
+	x-dnd.elc \
+	term/common-win.elc \
+	term/x-win.elc \
+	w32-vars.elc \
+	term/w32-win.elc \
+	ls-lisp.elc \
+	disp-table.elc \
+	dos-w32.elc \
+	w32-fns.elc \
+	dos-fns.elc \
+	dos-vars.elc \
+	term/pc-win.elc \
+	term/internal.elc \
+	term/ns-win.elc \
+	mwheel.elc \
+	emacs-lisp/float-sup.elc \
+	vc/vc-hooks.elc \
+	vc/ediff-hook.elc \
+	electric.elc \
+	emacs-lisp/eldoc.elc \
+	uniquify.elc \
+	tooltip.elc
 
 ### lisp.mk ends here