From a908f3e2243a7ac8bad75204a5be2b93bbbc749e Mon Sep 17 00:00:00 2001
From: Robin Templeton <robin@terpri.org>
Date: Tue, 12 Aug 2014 07:42:11 -0400
Subject: [PATCH] disable byte-compilation

---
 admin/unidata/Makefile.in |  15 +-
 lisp/Makefile.in          |   2 +-
 src/Makefile.in           |   7 +-
 src/lisp.mk               | 344 +++++++++++++++++++-------------------
 4 files changed, 178 insertions(+), 190 deletions(-)
 rewrite src/lisp.mk (62%)

diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 6b253ea565..ceb89ccf5e 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -27,7 +27,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
-EMACS = ${top_builddir}/src/emacs
+EMACS = ${top_builddir}/src/temacs
 DSTDIR = ${top_srcdir}/lisp/international
 emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 
@@ -35,23 +35,16 @@ emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 
 all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el
 
-## Specify .elc as an order-only prereq so as to not needlessly rebuild
-## target just because the .elc is missing.
-## Same with charprop.el below.
-${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
-  ${srcdir}/uvs.elc
+${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt
 	${emacs} -L ${srcdir} -l uvs \
 	  --eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \
 	  > $@
 
-%.elc: %.el
-	${emacs} -f batch-byte-compile $<
-
 unidata.txt: ${srcdir}/UnicodeData.txt
 	sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < $< > $@
 
 ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \
-  ${srcdir}/unidata-gen.elc unidata.txt
+  unidata.txt
 	-if [ -f "$@" ]; then \
 	  cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
 	fi
@@ -59,7 +52,7 @@ ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \
 	  ${srcdir} "${DSTDIR}"
 
 ## Like the above, but generate in PWD rather than lisp/international.
-charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
+charprop.el: ${srcdir}/unidata-gen.el unidata.txt
 	${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
 	  ${srcdir}
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index fefbd5cda5..8df050ce07 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -147,7 +147,7 @@ setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \
 
 # cus-load and finder-inf are not explicitly requested by anything, so
 # we add them here to make sure they get built.
-all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
+all: leim semantic $(lisp)/cus-load.el $(lisp)/finder-inf.el
 
 .PHONY: all custom-deps finder-data autoloads update-subdirs
 
diff --git a/src/Makefile.in b/src/Makefile.in
index a572bbd346..ef3c725c33 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -441,7 +441,7 @@ $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \
 ## since not all pieces are used on all platforms.  But DOC depends
 ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
 emacs$(EXEEXT): temacs$(EXEEXT) \
-                $(etc)/DOC $(lisp) $(leimdir)/leim-list.el \
+                $(lisp) $(leimdir)/leim-list.el \
                 $(lispsource)/international/charprop.el
 	if test "$(CANNOT_DUMP)" = "yes"; then \
 	  rm -f emacs$(EXEEXT); \
@@ -625,9 +625,6 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
 ## but now that we require GNU make, we can simply specify
 ## bootstrap-emacs$(EXEEXT) as an order-only prerequisite.
 
-%.elc: %.el | bootstrap-emacs$(EXEEXT)
-	@$(MAKE) -C ../lisp compile-onefile THEFILE=$< EMACS="$(bootstrap_exe)"
-
 ## VCSWITNESS points to the file that holds info about the current checkout.
 ## We use it as a heuristic to decide when to rebuild loaddefs.el.
 ## If empty it is ignored; the parent makefile can set it to some other value.
@@ -648,8 +645,6 @@ bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
 	  test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
 	  mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
 	fi
-	@: Compile some files earlier to speed up further compilation.
-	$(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)"
 
 alloc.o: alloc.x
 buffer.o: buffer.x
diff --git a/src/lisp.mk b/src/lisp.mk
dissimilarity index 62%
index 59d5b86c33..c40d94ebfe 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -1,172 +1,172 @@
-### lisp.mk --- src/Makefile fragment for GNU Emacs
-
-## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 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 can generally just add a ".elc" extension to every file
-## that does not have an explicit .el extension, but beware of any
-## no-byte-compile ones.
-
-## Confusingly, international/cp51932 and international/eucjp-ms are
-## unconditionally loaded from language/japanese, instead of being
-## loaded directly from loadup.el; FIXME.
-
-## 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.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/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)/language/japanese.elc \
-	$(lispsource)/international/cp51932.el \
-	$(lispsource)/international/eucjp-ms.el \
-	$(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)/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)/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)/w32-common-fns.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)/uniquify.elc \
-	$(lispsource)/tooltip.elc
-
-
-### lisp.mk ends here
+### lisp.mk --- src/Makefile fragment for GNU Emacs
+
+## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2014 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 can generally just add a ".elc" extension to every file
+## that does not have an explicit .el extension, but beware of any
+## no-byte-compile ones.
+
+## Confusingly, international/cp51932 and international/eucjp-ms are
+## unconditionally loaded from language/japanese, instead of being
+## loaded directly from loadup.el; FIXME.
+
+## 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.el \
+	$(lispsource)/emacs-lisp/backquote.el \
+	$(lispsource)/subr.el \
+	$(lispsource)/version.el \
+	$(lispsource)/widget.el \
+	$(lispsource)/custom.el \
+	$(lispsource)/emacs-lisp/map-ynp.el \
+	$(lispsource)/cus-start.el \
+	$(lispsource)/international/mule.el \
+	$(lispsource)/international/mule-conf.el \
+	$(lispsource)/env.el \
+	$(lispsource)/format.el \
+	$(lispsource)/bindings.el \
+	$(lispsource)/files.el \
+	$(lispsource)/emacs-lisp/macroexp.el \
+	$(lispsource)/cus-face.el \
+	$(lispsource)/faces.el \
+	$(lispsource)/button.el \
+	$(lispsource)/startup.el \
+	$(lispsource)/emacs-lisp/nadvice.el \
+	$(lispsource)/minibuffer.el \
+	$(lispsource)/abbrev.el \
+	$(lispsource)/simple.el \
+	$(lispsource)/help.el \
+	$(lispsource)/jka-cmpr-hook.el \
+	$(lispsource)/epa-hook.el \
+	$(lispsource)/international/mule-cmds.el \
+	$(lispsource)/case-table.el \
+	$(lispsource)/international/characters.el \
+	$(lispsource)/composite.el \
+	$(lispsource)/international/charprop.el \
+	$(lispsource)/language/chinese.el \
+	$(lispsource)/language/cyrillic.el \
+	$(lispsource)/language/indian.el \
+	$(lispsource)/language/sinhala.el \
+	$(lispsource)/language/english.el \
+	$(lispsource)/language/ethiopic.el \
+	$(lispsource)/language/european.el \
+	$(lispsource)/language/czech.el \
+	$(lispsource)/language/slovak.el \
+	$(lispsource)/language/romanian.el \
+	$(lispsource)/language/greek.el \
+	$(lispsource)/language/hebrew.el \
+	$(lispsource)/language/japanese.el \
+	$(lispsource)/international/cp51932.el \
+	$(lispsource)/international/eucjp-ms.el \
+	$(lispsource)/language/korean.el \
+	$(lispsource)/language/lao.el \
+	$(lispsource)/language/tai-viet.el \
+	$(lispsource)/language/thai.el \
+	$(lispsource)/language/tibetan.el \
+	$(lispsource)/language/vietnamese.el \
+	$(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.el \
+	$(lispsource)/window.el \
+	$(lispsource)/frame.el \
+	$(lispsource)/term/tty-colors.el \
+	$(lispsource)/font-core.el \
+	$(lispsource)/facemenu.el \
+	$(lispsource)/emacs-lisp/syntax.el \
+	$(lispsource)/font-lock.el \
+	$(lispsource)/jit-lock.el \
+	$(lispsource)/mouse.el \
+	$(lispsource)/scroll-bar.el \
+	$(lispsource)/select.el \
+	$(lispsource)/emacs-lisp/timer.el \
+	$(lispsource)/isearch.el \
+	$(lispsource)/rfn-eshadow.el \
+	$(lispsource)/menu-bar.el \
+	$(lispsource)/emacs-lisp/lisp.el \
+	$(lispsource)/textmodes/page.el \
+	$(lispsource)/register.el \
+	$(lispsource)/textmodes/paragraphs.el \
+	$(lispsource)/progmodes/prog-mode.el \
+	$(lispsource)/emacs-lisp/lisp-mode.el \
+	$(lispsource)/textmodes/text-mode.el \
+	$(lispsource)/textmodes/fill.el \
+	$(lispsource)/newcomment.el \
+	$(lispsource)/replace.el \
+	$(lispsource)/emacs-lisp/tabulated-list.el \
+	$(lispsource)/buff-menu.el \
+	$(lispsource)/fringe.el \
+	$(lispsource)/emacs-lisp/regexp-opt.el \
+	$(lispsource)/image.el \
+	$(lispsource)/international/fontset.el \
+	$(lispsource)/dnd.el \
+	$(lispsource)/tool-bar.el \
+	$(lispsource)/dynamic-setting.el \
+	$(lispsource)/x-dnd.el \
+	$(lispsource)/term/common-win.el \
+	$(lispsource)/term/x-win.el \
+	$(lispsource)/w32-vars.el \
+	$(lispsource)/term/w32-win.el \
+	$(lispsource)/ls-lisp.el \
+	$(lispsource)/disp-table.el \
+	$(lispsource)/w32-common-fns.el \
+	$(lispsource)/dos-w32.el \
+	$(lispsource)/w32-fns.el \
+	$(lispsource)/dos-fns.el \
+	$(lispsource)/dos-vars.el \
+	$(lispsource)/term/pc-win.el \
+	$(lispsource)/term/internal.el \
+	$(lispsource)/term/ns-win.el \
+	$(lispsource)/mwheel.el \
+	$(lispsource)/emacs-lisp/float-sup.el \
+	$(lispsource)/vc/vc-hooks.el \
+	$(lispsource)/vc/ediff-hook.el \
+	$(lispsource)/electric.el \
+	$(lispsource)/uniquify.el \
+	$(lispsource)/tooltip.el
+
+
+### lisp.mk ends here
-- 
2.20.1