Mercurial > hg > xemacs-beta

diff src/Makefile.in.in @ 157:6b37e6ddd302 r20-3b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b5
author cvs
date Mon, 13 Aug 2007 09:40:41 +0200
parents 43dd3413c7c7
children 3bb7ccffb0c0
line wrap: on
line diff
--- a/src/Makefile.in.in	Mon Aug 13 09:39:46 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 09:40:41 2007 +0200
@@ -97,11 +97,10 @@
 /* On some machines #define register is done in config;
    do not let it interfere with this file.  */
 #undef register
-#undef inline
 
 /* Unless inhibited or changed, use -lg to link for debugging.  */
 #ifndef LIBS_DEBUG
-#define LIBS_DEBUG -lg
+#define LIBS_DEBUG "-lg"
 #endif
 
 #ifndef LD_SWITCH_CALL_SHARED
@@ -109,24 +108,24 @@
 #endif /* define a call_shared switch */
 
 #ifndef LD_SWITCH_SHARED
-#define LD_SWITCH_SHARED -c
+#define LD_SWITCH_SHARED "-c"
 #endif /* define a shared switch */
 
 #ifndef ORDINARY_LINK
 
 #ifndef CRT0_COMPILE
-#define CRT0_COMPILE $(CC) -c $(cflags) C_SWITCH_ASM
+#define CRT0_COMPILE $(CC) "-c" $(cflags) C_SWITCH_ASM
 #endif
 
 #ifndef START_FILES
 #ifdef NO_REMAP
 #ifdef COFF_ENCAPSULATE
-#define START_FILES pre-crt0.o /usr/local/lib/gcc-crt0.o
+#define START_FILES "pre-crt0.o" "/usr/local/lib/gcc-crt0.o"
 #else /* ! defined (COFF_ENCAPSULATE) */
-#define START_FILES pre-crt0.o /lib/crt0.o
+#define START_FILES "pre-crt0.o" "/lib/crt0.o"
 #endif /* ! defined (COFF_ENCAPSULATE) */
 #else /* ! defined (NO_REMAP) */
-#define START_FILES ecrt0.o
+#define START_FILES "ecrt0.o"
 #endif /* ! defined (NO_REMAP) */
 #endif /* START_FILES */
 STARTFILES = START_FILES
@@ -142,16 +141,6 @@
 
 #endif /* not ORDINARY_LINK */
 
-/* Unless inhibited or changed, use -g to compile for debugging. */
-#ifndef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH -g
-#endif
-
-/* If user wants to optimize, this is how.  */
-#ifndef C_OPTIMIZE_SWITCH
-#define C_OPTIMIZE_SWITCH -O
-#endif
-
 /* cc switches needed to make the "asm" keyword work.
    Nothing special needed on most machines.  */
 #ifndef C_SWITCH_ASM
@@ -185,11 +174,11 @@
 
 LWLIB_LDFLAGS  = -L$(LWLIB_BUILDDIR)
 LWLIB_LIBS     =  -llw
-LWLIB_CPPFLAGS = -I$(LWLIB_SRCDIR)
+/* LWLIB_CPPFLAGS = -I$(LWLIB_SRCDIR) */
 LWLIB_DEPS = $(LWLIB_BUILDDIR)/liblw.a
 
-x_objs = balloon_help.o balloon-x.o console-x.o device-x.o event-Xt.o frame-x.o \
-	 glyphs-x.o objects-x.o redisplay-x.o xgccache.o xselect.o
+x_objs=balloon_help.o balloon-x.o console-x.o device-x.o event-Xt.o frame-x.o\
+ glyphs-x.o objects-x.o redisplay-x.o xgccache.o xselect.o
 
 #ifdef AIX4
 LIBI18N = -li18n
@@ -201,7 +190,7 @@
 /* -Demacs is needed to make some files produce the correct version
    for use in Emacs. */
 
-cppflags = $(CPPFLAGS) -Demacs -I. -I${srcdir} $(LWLIB_CPPFLAGS) $(c_switch_all)
+cppflags = $(CPPFLAGS) -Demacs -I. $(c_switch_all)
 
 cflags= $(CFLAGS) $(cppflags)
 
@@ -230,7 +219,7 @@
    have to ask GCC explicitly where to find libgcc.a.  */
 
 #ifndef LINKER
-#define LINKER $(CC) -nostdlib
+#define LINKER $(CC) "-nostdlib"
 /* GCC passes any argument prefixed with -Xlinker directly to the
    linker.  See prefix-args.c for an explanation of why we do not do
    this with the shell "for" construct.
@@ -249,7 +238,7 @@
 #else /* __GNUC__ < 2 */
 
 #ifndef LIB_GCC
-#define LIB_GCC /usr/local/lib/gcc-gnulib
+#define LIB_GCC "/usr/local/lib/gcc-gnulib"
 #endif /* LIB_GCC */
 GNULIB_VAR = `if [ -f LIB_GCC ] ; then echo LIB_GCC; else echo; fi`
 #endif /* __GNUC__ < 2 */
@@ -268,10 +257,9 @@
 #define YMF_PASS_LDFLAGS(flags) flags
 #endif
 
-/* Specify address for ld to start loading at,
-   if requested by configuration.  */
+/* Specify address for ld to start loading at, if requested by configuration. */
 #ifdef LD_TEXT_START_ADDR
-STARTFLAGS = -T LD_TEXT_START_ADDR -e __start
+STARTFLAGS = "-T" LD_TEXT_START_ADDR "-e" "__start"
 #else
 STARTFLAGS =
 #endif
@@ -311,23 +299,24 @@
 /* NOTE: The last line cannot be all macros, because make will barf
    if they all come out null. */
 
-objs =	abbrev.o alloc.o blocktype.o buffer.o bytecode.o \
-	callint.o callproc.o casefiddle.o casetab.o chartab.o \
-	cmdloop.o cmds.o console.o console-stream.o \
-	data.o device.o dired.o doc.o doprnt.o dynarr.o \
-	editfns.o elhash.o emacs.o \
-	$(energize_objs) eval.o events.o $(extra_objs) \
-	event-stream.o $(event_unixoid_objs) extents.o faces.o \
-	fileio.o filelock.o filemode.o floatfns.o fns.o font-lock.o \
-	frame.o general.o getloadavg.o glyphs.o \
-	$(gui_objs) hash.o indent.o insdel.o intl.o \
-	keymap.o $(RTC_patch_objs) lread.o lstream.o \
-	macros.o marker.o md5.o minibuf.o objects.o opaque.o \
-	print.o process.o profile.o pure.o \
-	rangetab.o redisplay.o redisplay-output.o regex.o \
-	search.o signal.o sound.o \
-	specifier.o strftime.o symbols.o syntax.o sysdep.o \
-	undo.o $(x_objs) window.o
+objs=\
+ abbrev.o alloc.o blocktype.o buffer.o bytecode.o\
+ callint.o callproc.o casefiddle.o casetab.o chartab.o\
+ cmdloop.o cmds.o console.o console-stream.o\
+ data.o device.o dired.o doc.o doprnt.o dynarr.o\
+ editfns.o elhash.o emacs.o\
+ $(energize_objs) eval.o events.o $(extra_objs)\
+ event-stream.o $(event_unixoid_objs) extents.o faces.o\
+ fileio.o filelock.o filemode.o floatfns.o fns.o font-lock.o\
+ frame.o general.o getloadavg.o glyphs.o\
+ $(gui_objs) hash.o indent.o insdel.o intl.o\
+ keymap.o $(RTC_patch_objs) lread.o lstream.o\
+ macros.o marker.o md5.o minibuf.o objects.o opaque.o\
+ print.o process.o profile.o pure.o\
+ rangetab.o redisplay.o redisplay-output.o regex.o\
+ search.o signal.o sound.o\
+ specifier.o strftime.o symbols.o syntax.o sysdep.o\
+ undo.o $(x_objs) window.o
 
 #ifdef REL_ALLOC
 rallocdocsrc = ralloc.c
@@ -384,22 +373,19 @@
 
 #  ifdef LWLIB_USES_MOTIF
 #    ifdef EXTW_LINK
-#      define MOTIF_OTHER_FILES libextcli_Xm.a libextcli_Xm.so.1
+motif_other_files = libextcli_Xm.a libextcli_Xm.so.1
 #    else
-#      define MOTIF_OTHER_FILES libextcli_Xm.a
+motif_other_files = libextcli_Xm.a
 #    endif
-#  else
-#    define MOTIF_OTHER_FILES
 #endif
 
 #  ifdef EXTW_LINK
-#    define OTHER_FILES MOTIF_OTHER_FILES \
-		        libextcli_Xt.a libextcli_Xt.so.1 \
-		        libextcli_Xlib.a libextcli_Xlib.so.1
-#  else
-#    define OTHER_FILES MOTIF_OTHER_FILES \
-		        libextcli_Xt.a libextcli_Xlib.a
+shared_other_files = libextcli_Xt.so.1 libextcli_Xlib.so.1
 #  endif
+other_files=\
+ ${motif_other_files}\
+ libextcli_Xt.a libextcli_Xlib.a\
+ ${shared_other_files}
 # endif /* EXTERNAL_WIDGET */
 
 X11_objs = EmacsFrame.o EmacsShell.o TopLevelEmacsShell.o TransientEmacsShell.o EmacsManager.o $(external_widget_objs)
@@ -410,171 +396,137 @@
 otherobjs = $(BTL_objs) lastfile.o $(mallocobjs) $(rallocobjs) $(X11_objs)
 
 #ifdef LISP_FLOAT_TYPE
-#define FLOAT_LISP ${lispdir}prim/float-sup.elc
-#else
-#define FLOAT_LISP
+float_lisp = ${lispdir}prim/float-sup.elc
 #endif
 
 #ifdef HAVE_X_WINDOWS
 /* lisp files preloaded if compiled with support for X Windows */
 # ifdef HAVE_TOOLBARS
-#  define X11_TOOLBAR_LISP ${lispdir}x11/x-toolbar.elc
-# else
-#  define X11_TOOLBAR_LISP
+x11_toolbar_lisp = ${lispdir}x11/x-toolbar.elc
 # endif
 # ifdef HAVE_MENUBARS
-#  define X11_MENUBAR_LISP ${lispdir}x11/x-menubar.elc
-# else
-#  define X11_MENUBAR_LISP
+x11_menubar_lisp = ${lispdir}x11/x-menubar.elc
 # endif
 # ifdef HAVE_SCROLLBARS
-#  define X11_SCROLLBAR_LISP ${lispdir}x11/x-scrollbar.elc
-# else
-#  define X11_SCROLLBAR_LISP
+x11_scrollbar_lisp = ${lispdir}x11/x-scrollbar.elc
 # endif
-#define X11_LISP X11_MENUBAR_LISP \
-	${lispdir}x11/x-faces.elc \
-	${lispdir}x11/x-iso8859-1.elc ${lispdir}x11/x-mouse.elc \
-	${lispdir}x11/x-select.elc X11_SCROLLBAR_LISP \
-	X11_TOOLBAR_LISP ${lispdir}x11/x-misc.elc \
-	${lispdir}x11/x-init.elc
-#else
-#define X11_LISP
+x11_lisp=\
+ ${x11_menubar_lisp}\
+ ${lispdir}x11/x-faces.elc\
+ ${lispdir}x11/x-iso8859-1${null}.elc ${lispdir}x11/x-mouse.elc\
+ ${lispdir}x11/x-select.elc ${x11_scrollbar_lisp}\
+ ${x11_toolbar_lisp} ${lispdir}x11/x-misc.elc\
+ ${lispdir}x11/x-init.elc
 #endif
 
 #ifdef HAVE_TTY
 /* lisp files preloaded if compiled with support for tty */
-#define TTY_LISP ${lispdir}term/tty-init.elc
-#else
-#define TTY_LISP
+tty_lisp = ${lispdir}term/tty-init.elc
 #endif
 
 #ifdef MULE
 #ifdef HAVE_X_WINDOWS
-# define MULE_X11_LISP ${lispdir}mule/mule-x-init.elc
-#else
-# define MULE_X11_LISP
+mule_x11_lisp = ${lispdir}mule/mule-x-init.elc
 #endif
-#define MULE_LISP \
-	${lispdir}mule/mule-load.elc ${lispdir}mule/mule-coding.elc \
-	${lispdir}mule/mule-charset.elc ${lispdir}mule/mule-files.elc \
-	${lispdir}mule/mule-category.elc ${lispdir}mule/mule-misc.elc \
-	${lispdir}mule/mule-ccl.elc \
-	${lispdir}mule/mule-init.elc ${lispdir}mule/mule-cmds.elc \
-	${lispdir}mule/kinsoku.elc \
-	MULE_X11_LISP \
-	${lispdir}mule/arabic-hooks.elc \
-	${lispdir}mule/chinese-hooks.elc \
-	${lispdir}mule/cyrillic-hooks.elc \
-	${lispdir}mule/ethiopic-hooks.elc \
-	${lispdir}mule/european-hooks.elc \
-	${lispdir}mule/greek-hooks.elc \
-	${lispdir}mule/hebrew-hooks.elc	\
-	${lispdir}mule/ipa-hooks.elc \
-	${lispdir}mule/japanese-hooks.elc \
-	${lispdir}mule/korean-hooks.elc \
-	${lispdir}mule/thai-hooks.elc \
-	${lispdir}mule/vietnamese-hooks-1.elc \
-	${lispdir}mule/vietnamese-hooks-2.elc
-
-#define NOMULE_LISP
+mule_lisp=\
+ ${lispdir}mule/mule-load.elc ${lispdir}mule/mule-coding.elc\
+ ${lispdir}mule/mule-charset.elc ${lispdir}mule/mule-files.elc\
+ ${lispdir}mule/mule-category.elc ${lispdir}mule/mule-misc.elc\
+ ${lispdir}mule/mule-ccl.elc\
+ ${lispdir}mule/mule-init.elc ${lispdir}mule/mule-cmds.elc\
+ ${lispdir}mule/kinsoku.elc\
+ ${mule_x11_lisp}\
+ ${lispdir}mule/arabic-hooks.elc\
+ ${lispdir}mule/chinese-hooks.elc\
+ ${lispdir}mule/cyrillic-hooks.elc\
+ ${lispdir}mule/ethiopic-hooks.elc\
+ ${lispdir}mule/european-hooks.elc\
+ ${lispdir}mule/greek-hooks.elc\
+ ${lispdir}mule/hebrew-hooks.elc\
+ ${lispdir}mule/ipa-hooks.elc\
+ ${lispdir}mule/japanese-hooks.elc\
+ ${lispdir}mule/korean-hooks.elc\
+ ${lispdir}mule/thai-hooks.elc\
+ ${lispdir}mule/vietnamese-hooks-1${null}.elc\
+ ${lispdir}mule/vietnamese-hooks-2${null}.elc
 #else
-#define MULE_LISP
-#define NOMULE_LISP ${lispdir}prim/files-nomule.elc
+nomule_lisp = ${lispdir}prim/files-nomule.elc
 #endif
 
 #ifdef ENERGIZE
 /* Lisp files preloaded if compiled with support for Energize */
-#define ENERGIZE_LISP \
-	${lispdir}comint/gdb.elc \
-	${lispdir}comint/comint.elc ${lispdir}comint/shell.elc \
-	${lispdir}utils/ring.elc ${lispdir}packages/compile.elc \
-	${lispdir}modes/view-less.elc ${lispdir}emulators/evi.elc \
-	${lispdir}packages/font-lock.elc ${lispdir}packages/fast-lock.elc \
-	${lispdir}dired/dired.elc ${lispdir}dired/dired-x.elc \
-	${lispdir}dired/dired-lucid.elc ${lispdir}prim/userlock.elc \
-	${lispdir}energize/energize-init.elc \
-	${lispdir}energize/energize-mode.elc \
-	${lispdir}energize/energize-windows.elc \
-	${lispdir}energize/energize-menus.elc \
-	${lispdir}energize/energize-shell.elc \
-	${lispdir}energize/energize-visit-use.elc \
-	${lispdir}energize/energize-vi.elc \
-	${lispdir}energize/energize-font-lock.elc \
-	${lispdir}energize/energize-advice.elc
-#else
-#define ENERGIZE_LISP
+energize_lisp=\
+ ${lispdir}comint/gdb.elc\
+ ${lispdir}comint/comint.elc ${lispdir}comint/shell.elc\
+ ${lispdir}utils/ring.elc ${lispdir}packages/compile.elc\
+ ${lispdir}modes/view-less.elc ${lispdir}emulators/evi.elc\
+ ${lispdir}packages/font-lock.elc ${lispdir}packages/fast-lock.elc\
+ ${lispdir}dired/dired.elc ${lispdir}dired/dired-x.elc\
+ ${lispdir}dired/dired-lucid.elc ${lispdir}prim/userlock.elc\
+ ${lispdir}energize/energize-init.elc\
+ ${lispdir}energize/energize-mode.elc\
+ ${lispdir}energize/energize-windows.elc\
+ ${lispdir}energize/energize-menus.elc\
+ ${lispdir}energize/energize-shell.elc\
+ ${lispdir}energize/energize-visit-use.elc\
+ ${lispdir}energize/energize-vi.elc\
+ ${lispdir}energize/energize-font-lock.elc\
+ ${lispdir}energize/energize-advice.elc
 #endif
 
 #ifdef SUNPRO
 /* Lisp files preloaded if compiled with support for SunPro products */
-#define SUNPRO_LISP \
-	${lispdir}sunpro/sunpro-init.elc \
-	${lispdir}sunpro/sunpro-menubar.elc \
-	${lispdir}sunpro/sunpro-keys.elc \
-	${lispdir}eos/sun-eos-init.elc \
-	${lispdir}eos/sun-eos-load.elc \
-	${lispdir}eos/sun-eos-common.elc \
-	${lispdir}eos/sun-eos-editor.elc \
-	${lispdir}eos/sun-eos-browser.elc \
-	${lispdir}eos/sun-eos-debugger.elc \
-	${lispdir}eos/sun-eos-debugger-extra.elc \
-	${lispdir}eos/sun-eos-toolbar.elc \
-	${lispdir}eos/sun-eos-menubar.elc \
-	${lispdir}comint/comint.elc \
-	${lispdir}utils/ring.elc \
-	${lispdir}utils/annotations.elc \
-	${lispdir}modes/cc-mode.elc \
-	${lispdir}modes/imenu.elc \
-	${lispdir}utils/reporter.elc
-#else
-#define SUNPRO_LISP
+sunpro_lisp=\
+ ${lispdir}sunpro/sunpro-init.elc\
+ ${lispdir}sunpro/sunpro-menubar.elc\
+ ${lispdir}sunpro/sunpro-keys.elc\
+ ${lispdir}eos/sun-eos-init.elc\
+ ${lispdir}eos/sun-eos-load.elc\
+ ${lispdir}eos/sun-eos-common.elc\
+ ${lispdir}eos/sun-eos-editor.elc\
+ ${lispdir}eos/sun-eos-browser.elc\
+ ${lispdir}eos/sun-eos-debugger.elc\
+ ${lispdir}eos/sun-eos-debugger-extra.elc\
+ ${lispdir}eos/sun-eos-toolbar.elc\
+ ${lispdir}eos/sun-eos-menubar.elc\
+ ${lispdir}comint/comint.elc\
+ ${lispdir}utils/ring.elc\
+ ${lispdir}utils/annotations.elc\
+ ${lispdir}modes/cc-mode.elc\
+ ${lispdir}modes/imenu.elc\
+ ${lispdir}utils/reporter.elc
 #endif
 
 #ifdef TOOLTALK
 /* Lisp files preloaded if compiled with support for Tooltalk */
-#define TOOLTALK_LISP \
-	${lispdir}tooltalk/tooltalk-load.elc \
-	${lispdir}tooltalk/tooltalk-macros.elc \
-	${lispdir}tooltalk/tooltalk-util.elc \
-	${lispdir}tooltalk/tooltalk-init.elc
-#else
-#define TOOLTALK_LISP
+tooltalk_lisp=\
+ ${lispdir}tooltalk/tooltalk-load.elc\
+ ${lispdir}tooltalk/tooltalk-macros.elc\
+ ${lispdir}tooltalk/tooltalk-util.elc\
+ ${lispdir}tooltalk/tooltalk-init.elc
 #endif
 
 #ifdef LISP_COMMAND_LOOP
-#define CMDLOOP_LISP ${lispdir}prim/cmdloop1.elc
-#else
-#define CMDLOOP_LISP
+cmdloop_lisp = ${lispdir}prim/cmdloop1.elc
 #endif
 
 #ifdef HAVE_TOOLBARS
-#define TOOLBAR_LISP ${lispdir}prim/toolbar.elc
-#else
-#define TOOLBAR_LISP
+toolbar_lisp = ${lispdir}prim/toolbar.elc
 #endif
 #ifdef HAVE_MENUBARS
-#define MENUBAR_LISP ${lispdir}prim/menubar.elc
-#else
-#define MENUBAR_LISP
+menubar_lisp = ${lispdir}prim/menubar.elc
 #endif
 #ifdef HAVE_SCROLLBARS
-#define SCROLLBAR_LISP ${lispdir}prim/scrollbar.elc
-#else
-#define SCROLLBAR_LISP
+scrollbar_lisp = ${lispdir}prim/scrollbar.elc
 #endif
 #ifdef HAVE_DIALOGS
-#define DIALOG_LISP ${lispdir}prim/dialog.elc
-#else
-#define DIALOG_LISP
+dialog_lisp = ${lispdir}prim/dialog.elc
 #endif
 #ifdef HAVE_WINDOW_SYSTEM
-#define MOUSE_LISP \
-	${lispdir}prim/gui.elc \
-	${lispdir}prim/mouse.elc \
-	${lispdir}prim/mode-motion.elc
-#else
-#define MOUSE_LISP
+mouse_lisp=\
+ ${lispdir}prim/gui.elc\
+ ${lispdir}prim/mouse.elc\
+ ${lispdir}prim/mode-motion.elc
 #endif
 
 /* List of Lisp files loaded into the dumped Emacs.
@@ -585,62 +537,60 @@
     here because we do not want things to appear to be out-of-date just
     because the version number has been incremented. -- D.N.G. 8/28/93]
  */
-lisp=   ${lispdir}paths.el ${lispdir}prim/featurep.elc \
-	${lispdir}prim/loaddefs.elc ${lispdir}prim/auto-autoloads.elc \
-        ${lispdir}prim/loadup.el ${lispdir}prim/subr.elc \
-        ${lispdir}prim/cmdloop.elc CMDLOOP_LISP \
-	${lispdir}utils/text-props.elc MOUSE_LISP \
-        ${lispdir}prim/keymap.elc ${lispdir}prim/syntax.elc \
-        ${lispdir}prim/minibuf.elc ${lispdir}prim/faces.elc \
-	${lispdir}prim/objects.elc ${lispdir}prim/process.elc \
-        ${lispdir}prim/keydefs.elc ${lispdir}prim/device.elc \
-	${lispdir}prim/obsolete.elc ${lispdir}prim/glyphs.elc \
-	${lispdir}prim/extents.elc ${lispdir}prim/backquote.elc \
-	${lispdir}prim/events.elc ${lispdir}prim/console.elc \
-        ${lispdir}utils/map-ynp.elc ${lispdir}prim/modeline.elc \
-        ${lispdir}modes/list-mode.elc \
-	${lispdir}utils/derived.elc ${lispdir}cl/cl.elc \
-	${lispdir}cl/cl-defs.elc ${lispdir}prim/undo-stack.elc \
-        ${lispdir}prim/simple.elc ${lispdir}prim/help.elc \
-        ${lispdir}prim/files.elc ${lispdir}utils/lib-complete.elc \
-	${lispdir}prim/indent.elc ${lispdir}prim/frame.elc \
-	TOOLBAR_LISP ${lispdir}prim/format.elc \
-	${lispdir}prim/window.elc ${lispdir}prim/window-xemacs.elc \
-	${lispdir}prim/startup.elc \
-        ${lispdir}prim/lisp.elc ${lispdir}prim/page.elc \
-        ${lispdir}prim/register.elc ${lispdir}iso/iso8859-1.elc \
-        ${lispdir}prim/paragraphs.elc ${lispdir}modes/lisp-mode.elc \
-        ${lispdir}modes/text-mode.elc ${lispdir}prim/fill.elc \
-        ${lispdir}prim/isearch-mode.elc ${lispdir}prim/misc.elc \
-	${lispdir}packages/vc-hooks.elc \
-        ${lispdir}prim/replace.elc ${lispdir}prim/specifier.elc \
-        ${lispdir}modes/auto-show.elc SUNPRO_LISP TTY_LISP \
-        ${lispdir}bytecomp/bytecomp-runtime.elc FLOAT_LISP \
-        ${lispdir}prim/itimer.elc ${lispdir}prim/itimer-autosave.elc \
-	${lispdir}ediff/ediff-hook.elc \
-	${lispdir}custom/widget.elc ${lispdir}custom/custom.elc \
-	${lispdir}prim/cus-start.elc \
-	${lispdir}packages/fontl-hooks.elc SCROLLBAR_LISP \
-	${lispdir}prim/buffer.elc MENUBAR_LISP \
-	${lispdir}packages/buff-menu.elc DIALOG_LISP MULE_LISP NOMULE_LISP \
-	${lispdir}modes/abbrev.elc X11_LISP ENERGIZE_LISP TOOLTALK_LISP
+lisp=\
+ ${lispdir}paths.el ${lispdir}prim/featurep.elc\
+ ${lispdir}prim/loaddefs.elc ${lispdir}prim/auto-autoloads.elc\
+ ${lispdir}prim/loadup.el ${lispdir}prim/subr.elc\
+ ${lispdir}prim/cmdloop.elc ${cmdloop_lisp}\
+ ${lispdir}utils/text-props.elc ${mouse_lisp}\
+ ${lispdir}prim/keymap.elc ${lispdir}prim/syntax.elc\
+ ${lispdir}prim/minibuf.elc ${lispdir}prim/faces.elc\
+ ${lispdir}prim/objects.elc ${lispdir}prim/process.elc\
+ ${lispdir}prim/keydefs.elc ${lispdir}prim/device.elc\
+ ${lispdir}prim/obsolete.elc ${lispdir}prim/glyphs.elc\
+ ${lispdir}prim/extents.elc ${lispdir}prim/backquote.elc\
+ ${lispdir}prim/events.elc ${lispdir}prim/console.elc\
+ ${lispdir}utils/map-ynp.elc ${lispdir}prim/modeline.elc\
+ ${lispdir}modes/list-mode.elc\
+ ${lispdir}utils/derived.elc ${lispdir}cl/cl.elc\
+ ${lispdir}cl/cl-defs.elc ${lispdir}prim/undo-stack.elc\
+ ${lispdir}prim/simple.elc ${lispdir}prim/help.elc\
+ ${lispdir}prim/files.elc ${lispdir}utils/lib-complete.elc\
+ ${lispdir}prim/indent.elc ${lispdir}prim/frame.elc\
+ ${toolbar_lisp} ${lispdir}prim/format.elc\
+ ${lispdir}prim/window.elc ${lispdir}prim/window-xemacs.elc\
+ ${lispdir}prim/startup.elc\
+ ${lispdir}prim/lisp.elc ${lispdir}prim/page.elc\
+ ${lispdir}prim/register.elc ${lispdir}iso/iso8859-1${null}.elc\
+ ${lispdir}prim/paragraphs.elc ${lispdir}modes/lisp-mode.elc\
+ ${lispdir}modes/text-mode.elc ${lispdir}prim/fill.elc\
+ ${lispdir}prim/isearch-mode.elc ${lispdir}prim/misc.elc\
+ ${lispdir}packages/vc-hooks.elc\
+ ${lispdir}prim/replace.elc ${lispdir}prim/specifier.elc\
+ ${lispdir}modes/auto-show.elc ${sunpro_lisp} ${tty_lisp}\
+ ${lispdir}bytecomp/bytecomp-runtime.elc ${float_lisp}\
+ ${lispdir}prim/itimer.elc ${lispdir}prim/itimer-autosave.elc\
+ ${lispdir}ediff/ediff-hook.elc\
+ ${lispdir}custom/widget.elc ${lispdir}custom/custom.elc\
+ ${lispdir}prim/cus-start.elc\
+ ${lispdir}packages/fontl-hooks.elc ${scrollbar_lisp}\
+ ${lispdir}prim/buffer.elc ${menubar_lisp}\
+ ${lispdir}packages/buff-menu.elc ${dialog_lisp} ${mule_lisp} ${nomule_lisp}\
+ ${lispdir}modes/abbrev.elc ${x11_lisp} ${energize_lisp} ${tooltalk_lisp}
 
 /* Other Lisp files that are not dumped out but where it is convenient
    (or required?) for them to be byte-compiled early, before xemacs is
    dumped out.  Avoid listing them in ${lisp} because then the
    doc-snarfing routines get confused. */
-otherlisp= ${lispdir}bytecomp/bytecomp.elc \
-	   ${lispdir}bytecomp/byte-optimize.elc \
-	   ${lispdir}utils/advice.elc
+otherlisp=\
+ ${lispdir}bytecomp/bytecomp.elc\
+ ${lispdir}bytecomp/byte-optimize.elc\
+ ${lispdir}utils/advice.elc
 
 LIBES = $(LWLIB_LIBS) $(quantify_libs) $(ld_libs_all) LIBS_DEBUG $(GNULIB_VAR)
 
 /* Enable recompilation of certain other files depending on system type.  */
 
-#ifndef OTHER_FILES
-#define OTHER_FILES
-#endif
-
 /* Enable inclusion of object files in temacs depending on system type.  */
 #ifndef OBJECTS_SYSTEM
 #define OBJECTS_SYSTEM
@@ -650,7 +600,7 @@
 #define OBJECTS_MACHINE
 #endif
 
-all: xemacs OTHER_FILES
+all: xemacs ${other_files}
 
 #ifdef I18N3
 mo_dir = ${etcdir}
@@ -660,7 +610,7 @@
 LOADPATH =  EMACSLOADPATH="${lispdir}prim"
 DUMPENV = $(LOADPATH)
 
-release: temacs ${lisp} ${libsrc}DOC $(mo_file) OTHER_FILES
+release: temacs ${lisp} ${libsrc}DOC $(mo_file) ${other_files}
 #ifdef CANNOT_DUMP
 	ln temacs xemacs
 #else
@@ -688,7 +638,7 @@
 	touch release
 #endif /* ! defined (CANNOT_DUMP) */
 
-xemacs: temacs ${libsrc}DOC ${lisp} $(mo_file) OTHER_FILES
+xemacs: temacs ${libsrc}DOC ${lisp} $(mo_file) ${other_files}
 	@touch SATISFIED
 	-$(DUMPENV) ./temacs -batch -l loadup.el dump
 	@if [ ! -f SATISFIED ]; then \
@@ -696,7 +646,7 @@
 	fi
 	@/bin/rm -f SATISFIED
 
-xemacs-no-site-file: temacs ${libsrc}DOC ${lisp} $(mo_file) OTHER_FILES
+xemacs-no-site-file: temacs ${libsrc}DOC ${lisp} $(mo_file) ${other_files}
 	@touch SATISFIED
 	-$(DUMPENV) ./temacs -batch -l loadup.el dump no-site-file
 	@test ! -f SATISFIED && $(MAKE) xemacs-no-site-file
@@ -785,15 +735,15 @@
 #define MAKE_PARALLEL
 #endif
 
-temacs_deps = \
-	MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) \
-	${objs} ${otherobjs} OBJECTS_SYSTEM OBJECTS_MACHINE \
-	$(LWLIB_DEPS) $(dynodump_deps) prefix-args
+temacs_deps=\
+ MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES)\
+ ${objs} ${otherobjs} OBJECTS_SYSTEM OBJECTS_MACHINE\
+ $(LWLIB_DEPS) $(dynodump_deps) prefix-args
 
-temacs_link_args = \
-	YMF_PASS_LDFLAGS(${STARTFLAGS} ${ldflags} LD_SWITCH_CALL_SHARED) \
-	-o $@ ${STARTFILES} ${objs} ${otherobjs} \
-	OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
+temacs_link_args=\
+ ${STARTFLAGS} ${ldflags} LD_SWITCH_CALL_SHARED\
+ -o $@ ${STARTFILES} ${objs} ${otherobjs}\
+ OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
 
 temacs_deps: $(temacs_deps)
 
@@ -845,12 +795,12 @@
 
 #ifdef EXTERNAL_WIDGET
 
-# define EXTERNAL_CLIENT_MOTIF_OBJS_SHARED ExternalClient-Xm-shared.o extw-Xt-shared.o extw-Xlib-shared.o
-# define EXTERNAL_CLIENT_XT_OBJS_SHARED    ExternalClient-Xt-shared.o extw-Xt-shared.o extw-Xlib-shared.o
-# define EXTERNAL_CLIENT_XLIB_OBJS_SHARED  ExternalClient-Xlib-shared.o extw-Xlib-shared.o
-# define EXTERNAL_CLIENT_MOTIF_OBJS_NONSHARED ExternalClient-Xm-nonshared.o extw-Xt-nonshared.o extw-Xlib-nonshared.o
-# define EXTERNAL_CLIENT_XT_OBJS_NONSHARED    ExternalClient-Xt-nonshared.o extw-Xt-nonshared.o extw-Xlib-nonshared.o
-# define EXTERNAL_CLIENT_XLIB_OBJS_NONSHARED  ExternalClient-Xlib-nonshared.o extw-Xlib-nonshared.o
+external_client_motif_objs_shared    = ExternalClient-Xm-shared.o extw-Xt-shared.o extw-Xlib-shared.o
+external_client_xt_objs_shared       = ExternalClient-Xt-shared.o extw-Xt-shared.o extw-Xlib-shared.o
+external_client_xlib_objs_shared     = ExternalClient-Xlib-shared.o extw-Xlib-shared.o
+external_client_motif_objs_nonshared = ExternalClient-Xm-nonshared.o extw-Xt-nonshared.o extw-Xlib-nonshared.o
+external_client_xt_objs_nonshared    = ExternalClient-Xt-nonshared.o extw-Xt-nonshared.o extw-Xlib-nonshared.o
+external_client_xlib_objs_nonshared  = ExternalClient-Xlib-nonshared.o extw-Xlib-nonshared.o
 
 /* Add dependencies so things work right with a parallel make */
 ExternalClient-Xm-shared.o: ${srcdir}/ExternalClient.c ExternalClient-Xt-shared.o ExternalClient-Xm-nonshared.o
@@ -896,25 +846,25 @@
 	$(CC) -c $(cflags) ${srcdir}/extw-Xlib.c
 	mv extw-Xlib.o extw-Xlib-nonshared.o
 
-libextcli_Xm.a: EXTERNAL_CLIENT_MOTIF_OBJS_NONSHARED
-	ar r libextcli_Xm.a EXTERNAL_CLIENT_MOTIF_OBJS_NONSHARED
+libextcli_Xm.a: ${external_client_motif_objs_nonshared}
+	ar r libextcli_Xm.a ${external_client_motif_objs_nonshared}
 
-libextcli_Xt.a: EXTERNAL_CLIENT_XT_OBJS_NONSHARED
-	ar r libextcli_Xt.a EXTERNAL_CLIENT_XT_OBJS_NONSHARED
+libextcli_Xt.a: ${external_client_xt_objs_nonshared}
+	ar r libextcli_Xt.a ${external_client_xt_objs_nonshared}
 
-libextcli_Xlib.a: EXTERNAL_CLIENT_XLIB_OBJS_NONSHARED
-	ar r libextcli_Xlib.a EXTERNAL_CLIENT_XLIB_OBJS_NONSHARED
+libextcli_Xlib.a: ${external_client_xlib_objs_nonshared}
+	ar r libextcli_Xlib.a ${external_client_xlib_objs_nonshared}
 
 #ifdef EXTW_LINK
 
-libextcli_Xm.so.1: EXTERNAL_CLIENT_MOTIF_OBJS_SHARED
-	EXTW_LINK(EXTERNAL_CLIENT_MOTIF_OBJS_SHARED, libextcli_Xm.so.1)
+libextcli_Xm.so.1: ${external_client_motif_objs_shared}
+	EXTW_LINK(${external_client_motif_objs_shared}, libextcli_Xm.so.1)
 
-libextcli_Xt.so.1: EXTERNAL_CLIENT_XT_OBJS_SHARED
-	EXTW_LINK(EXTERNAL_CLIENT_XT_OBJS_SHARED, libextcli_Xt.so.1)
+libextcli_Xt.so.1: ${external_client_xt_objs_shared}
+	EXTW_LINK(${external_client_xt_objs_shared}, libextcli_Xt.so.1)
 
-libextcli_Xlib.so.1: EXTERNAL_CLIENT_XLIB_OBJS_SHARED
-	EXTW_LINK(EXTERNAL_CLIENT_XLIB_OBJS_SHARED, libextcli_Xlib.so.1)
+libextcli_Xlib.so.1: ${external_client_xlib_objs_shared}
+	EXTW_LINK(${external_client_xlib_objs_shared}, libextcli_Xlib.so.1)
 
 #endif /* EXTW_LINK */
 
@@ -923,47 +873,28 @@
 prefix-args: ${srcdir}/prefix-args.c config.h
 	$(CC) $(cflags) ${srcdir}/prefix-args.c -o prefix-args
 
-/* These are needed for C compilation, on the systems that need them */
-#ifdef NEED_CPP
-CPP = ./localcpp
-localcpp:
-	cd ${cppdir} && ${MAKE} ${MFLAGS} EMACS=-DEMACS
-	ln ${cppdir}cpp localcpp  /* Name where cflags will refer to it */
-/* cc appears to be cretinous and require all of these to exist
-   if -B is specified -- we cannot use one local pass and let the
-   others be the standard ones.  What a loser.
-   We cannot even use ln, since they are probably
-   on different disks.  */
-	cp /lib/ccom localccom
-	-cp /lib/optim localoptim
-	-cp /lib/c2 localc2
-	cp /bin/as localas
-#else /* ! defined (NEED_CPP) */
-CPP = $(CC) -E
-#endif /* ! defined (NEED_CPP) */
-
 #ifdef SHORTNAMES
 shortnames:
 	cd ${shortnamesdir} && ${MAKE} ${MFLAGS}
 #endif
 
 config.h: ${srcdir}/config.h.in
-	@echo "The file config.h needs to be set up from config.h.in."
+	@echo "The file $@ needs to be set up from config.h.in."
 	@echo "Consult the file \`INSTALL' for instructions for building Emacs."
 	exit 1
 
 puresize_adjust.h: ${srcdir}/puresize.h
-	@echo "The file puresize_adjust still needs to be generated."
+	@echo "The file $@ still needs to be generated."
 	@echo "Please run 'make' from the top-level."
 	exit 1
 
 paths.h: ${srcdir}/paths.h.in
-	@echo "The file paths.h needs to be set up from paths.h.in."
+	@echo "The file $@ needs to be set up from paths.h.in."
 	@echo "Consult the file \`INSTALL' for instructions for building Emacs."
 	exit 1
 
 Emacs.ad.h: ${srcdir}/${etcdir}Emacs.ad
-	@echo "The file Emacs.ad.h needs to be set up from ${srcdir}/${etcdir}Emacs.ad"
+	@echo "The file $@ needs to be set up from ${srcdir}/${etcdir}Emacs.ad"
 	@echo "Consult the file \`INSTALL' for instructions for building Emacs."
 	exit 1
 
@@ -1024,7 +955,7 @@
 #endif /* HAVE_NATIVE_SOUND */
 
 /* System-specific programs to be made.
-   OTHER_FILES, OBJECTS_SYSTEM and OBJECTS_MACHINE
+   ${other_files}, OBJECTS_SYSTEM and OBJECTS_MACHINE
    select which of these should be compiled.  */
 
 mostlyclean: