X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2f1b0bbdb0a80ecbe2ab4d04253513f0c65979a2..e39322d99f0b85a4325d7004e37d4d0723684c55:/src/Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 46e29e432a..c7fe299dd9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,37 +1,34 @@
-/* Makefile for GNU Emacs.
-   Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
+# Makefile for GNU Emacs.
+# Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GNU Emacs.
+# 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 2, or (at your option)
-any later version.
+# 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 2, 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.
+# 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; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* BSD doesn't have it as a default. */
-MAKE = make
-
-/* Here are the things that we expect ../configure to edit. */
+# Here are the things that we expect ../configure to edit.
 srcdir=@srcdir@
 VPATH=@srcdir@
 CC=@CC@
 CPP=@CPP@
 CFLAGS=@CFLAGS@
 LN_S=@LN_S@
-/* These escaped doublequotes become part of the macro definition in emacs.c.
-   Thus, the definition is a C string constant. */
-configuration=\"@configuration@\"
+# Substitute an assignment for the MAKE variable, because
+# BSD doesn't have it as a default.
+@SET_MAKE@
 
-/* On Xenix and the IBM RS6000, double-dot gets screwed up.  */
+# On Xenix and the IBM RS6000, double-dot gets screwed up.
 dot = .
 lispdir = ${srcdir}/$(dot)$(dot)/lisp/
 libsrc = $(dot)$(dot)/lib-src/
@@ -40,7 +37,14 @@ shortnamesdir = $(dot)$(dot)/shortnames/
 cppdir = $(dot)$(dot)/cpp/
 oldXMenudir = $(dot)$(dot)/oldXMenu/
 lwlibdir = $(dot)$(dot)/lwlib/
-config_h = config.h
+
+# Configuration files for .o files to depend on.
+M_FILE = ${srcdir}/@machfile@
+S_FILE = ${srcdir}/@opsysfile@
+config_h = config.h $(M_FILE) $(S_FILE)
+
+# ========================== start of cpp stuff ======================= */
+/* From here on, comments must be done in C syntax.  */
 
 CPPFLAGS=
 LDFLAGS=
@@ -54,6 +58,12 @@ SHELL=/bin/sh
 #define NOT_C_CODE
 #include "config.h"
 
+/* We won't really call alloca;
+   don't let the file name alloca.c get messed up.  */
+#ifdef alloca
+#undef alloca
+#endif
+
 /* Use HAVE_X11 as an alias for X11 in this file
    to avoid problems with X11 as a subdirectory name
    in -I and other such options which pass through this file. */
@@ -70,14 +80,20 @@ SHELL=/bin/sh
 /* On some systems we may not be able to use the system make command. */
 #ifdef MAKE_COMMAND
 MAKE = MAKE_COMMAND
-#else
-MAKE=make
 #endif
 
 #ifdef C_COMPILER
 CC = C_COMPILER
 #endif
 
+/* GNU libc requires ORDINARY_LINK so that its own crt0 is used.
+   Linux is an exception because it uses a funny variant of GNU libc.  */
+#ifdef __GNU_LIBRARY__
+#ifndef LINUX
+#define ORDINARY_LINK
+#endif
+#endif
+
 /* Some machines don't find the standard C libraries in the usual place.  */
 #ifndef ORDINARY_LINK
 #ifndef LIB_STANDARD
@@ -153,6 +169,10 @@ CC = C_COMPILER
 #define LD_SWITCH_X_SITE
 #endif
 
+#ifndef LD_SWITCH_X_DEFAULT
+#define LD_SWITCH_X_DEFAULT
+#endif
+
 /* These can be passed in from config.h to define special load and
    compile switches needed by individual sites */
 #ifndef LD_SWITCH_SITE
@@ -224,9 +244,6 @@ SHORT= shortnames
    at initial startup, then labeled as part of the text area when
    Emacs is dumped for the first time, and never changed again. */
 
-/* If you want to debug, you can add C_DEBUG_SWITCH to this list.
-   If you want to optimize, you can add C_OPTIMIZE_SWITCH to the list.  */
-
 /* -Demacs is needed to make some files produce the correct version
    for use in Emacs.
 
@@ -270,10 +287,10 @@ XOBJ= xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o
    otherwise, use our own copy.  */
 #ifdef HAVE_X11
 #ifdef USE_X_TOOLKIT
-OLDXMENU=liblw.a
+OLDXMENU=${lwlibdir}liblw.a
 LIBXMENU= $(OLDXMENU)
 #else /* not USE_X_TOOLKIT */
-OLDXMENU= libXMenu11.a
+OLDXMENU= ${oldXMenudir}libXMenu11.a
 LIBXMENU= $(OLDXMENU)
 #endif /* not USE_X_TOOLKIT */
 #else /* not HAVE_X11 */
@@ -289,13 +306,34 @@ LIBXMENU=
 #endif /* not HAVE_X_MENU */
 
 #ifdef USE_X_TOOLKIT
-LIBXT= -lXaw -lXt -lXmu
+#define @X_TOOLKIT_TYPE@
+#if defined (LUCID) || defined (ATHENA)
+LIBW= -lXaw
+#endif
+#ifdef MOTIF
+#ifdef LIB_MOTIF
+LIBW= LIB_MOTIF
+#else
+LIBW= -lXm
+#endif
+#endif
+#ifdef OPEN_LOOK
+LIBW= -lXol
+#endif
+
+#ifdef HAVE_X11XTR6
+LIBXTR6 = -lSM -lICE
+#endif
+
+LIBXT= $(LIBW) -lXmu -lXt $(LIBXTR6) -lXext
 #else
 LIBXT=
 #endif
 
 #ifdef HAVE_X11
-LIBX= $(LIBXMENU) $(LIBXT) LD_SWITCH_X_SITE LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
+/* LD_SWITCH_X_DEFAULT comes after everything else that specifies
+   options for where to find X libraries, but before those libraries.  */
+LIBX= $(LIBXMENU) LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
@@ -375,7 +413,7 @@ LD=ld
 #endif /* not COFF_ENCAPSULATE */
 #endif /* not ORDINARY_LINK */
 
-ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE
+ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
 
 /* A macro which other sections of ymakefile can redefine to munge the
    flags before they're passed to LD.  This is helpful if you have
@@ -409,7 +447,7 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE
 /* lastfile must follow all files
    whose initialized data areas should be dumped as pure by dump-emacs. */
 obj=    dispnew.o frame.o scroll.o xdisp.o window.o \
-	term.o cm.o $(XOBJ) \
+	cm.o term.o $(XOBJ) \
 	emacs.o keyboard.o macros.o keymap.o sysdep.o \
 	buffer.o filelock.o insdel.o marker.o INTERVAL_OBJ \
 	minibuf.o fileio.o dired.o filemode.o \
@@ -481,13 +519,15 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 #endif
 
 #ifdef MULTI_FRAME
-#define FRAME_SUPPORT ${lispdir}frame.elc ${lispdir}mouse.elc ${lispdir}select.elc ${lispdir}scroll-bar.elc
+#define FRAME_SUPPORT ${lispdir}frame.elc ${lispdir}menu-bar.elc \
+  ${lispdir}mouse.elc ${lispdir}select.elc ${lispdir}scroll-bar.elc \
+  ${lispdir}faces.elc
 #else
 #define FRAME_SUPPORT
 #endif
 
 #ifdef HAVE_X_WINDOWS
-#define X_WINDOWS_SUPPORT ${lispdir}term/x-win.elc
+#define X_WINDOWS_SUPPORT
 #else
 #define X_WINDOWS_SUPPORT
 #endif
@@ -498,6 +538,12 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 #define VMS_SUPPORT
 #endif
 
+#ifdef MSDOS
+#define MSDOS_SUPPORT ${lispdir}ls-lisp.elc ${lispdir}disp-tab.elc ${lispdir}dos-fns.elc ${lispdir}mouse.elc
+#else
+#define MSDOS_SUPPORT
+#endif
+
 /* List of Lisp files loaded into the dumped Emacs.  It's arranged
    like this because it's easier to generate it semi-mechanically from
    loadup.el this way.
@@ -533,8 +579,9 @@ lisp= \
 	${lispdir}text-mode.elc \
 	${lispdir}vc-hooks.elc \
 	VMS_SUPPORT \
+	MSDOS_SUPPORT \
 	${lispdir}window.elc \
-	${lispdir}version.elc
+	${lispdir}version.el
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get
@@ -562,6 +609,7 @@ all: emacs OTHER_FILES
 
 emacs: temacs ${etc}DOC ${lisp}
 #ifdef CANNOT_DUMP
+	rm -f emacs
 	ln temacs emacs
 #else
 #ifdef HAVE_SHM
@@ -572,9 +620,9 @@ emacs: temacs ${etc}DOC ${lisp}
 #endif /* ! defined (CANNOT_DUMP) */
 
 ${etc}DOC: ${libsrc}make-docfile ${obj} ${lisp}
-	rm -f ${etc}DOC
+	-rm -f ${etc}DOC
 	${libsrc}make-docfile -d ${srcdir} ${obj} ${SOME_MACHINE_OBJECTS} \
-	  ${lisp} ${lispdir}version.el > ${etc}DOC
+	  ${lisp} > ${etc}DOC
 
 ${libsrc}make-docfile:
 	cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile
@@ -585,7 +633,7 @@ ${libsrc}make-docfile:
 #endif
 
 temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) $(OLDXMENU) ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args
-	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS}) ${ALL_LDFLAGS} \
+	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
 
@@ -630,8 +678,6 @@ shortnames:
 #ifdef HAVE_X11
 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib
-	-rm -f $(OLDXMENU) /* We might have a link to an old version.  */
-	${LN_S} ${lwlibdir}liblw.a $(OLDXMENU)
 
 /* Encode the values of these two macros in Make variables,
    so we can use $(...) to substitute their values within "...".  */
@@ -654,8 +700,6 @@ really-lwlib:
 #else /* not USE_X_TOOLKIT */
 #ifdef HAVE_X_MENU
 $(OLDXMENU): really-oldXMenu
-	-rm -f $(OLDXMENU) /* We might have a link to an old version.  */
-	${LN_S} ${oldXMenudir}libXMenu11.a $(OLDXMENU)
 
 /* Encode the values of these two macros in Make variables,
    so we can use $(...) to substitute their values within "...".  */
@@ -706,9 +750,10 @@ alloca.o : alloca.c
 	$(ALL_CFLAGS) ${srcdir}/alloca.c
 #else
 #ifndef HAVE_ALLOCA
-alloca.o : alloca.s config.h
+alloca.o : alloca.s $(config_h)
 /* $(CPP) is cc -E, which may get confused by filenames
    that do not end in .c.  So copy file to a safe name.  */
+	-rm -f allocatem.c
 	cp ${srcdir}/alloca.s allocatem.c
 /* Remove any ^L, blank lines, and preprocessor comments,
    since some assemblers barf on them.  Use a different basename for the
@@ -721,7 +766,7 @@ alloca.o : alloca.s config.h
 /* Xenix, in particular, needs to run assembler via cc.  */
 	$(CC) -c allocax.s
 	mv allocax.o alloca.o
-	rm allocax.s allocatem.c
+	-rm -f allocax.s allocatem.c
 #endif /* HAVE_ALLOCA */
 #endif /* ! defined (C_ALLOCA) */
 
@@ -730,111 +775,114 @@ alloca.o : alloca.s config.h
    it is so often changed in ways that do not require any recompilation
    and so rarely changed in ways that do require any.  */
 
-abbrev.o : abbrev.c buffer.h commands.h $(config_h) 
-buffer.o : buffer.c buffer.h commands.h window.h \
+abbrev.o: abbrev.c buffer.h commands.h $(config_h) 
+buffer.o: buffer.c buffer.h commands.h window.h \
    INTERVAL_SRC blockinput.h $(config_h) 
-callint.o : callint.c window.h commands.h buffer.h mocklisp.h \
+callint.o: callint.c window.h commands.h buffer.h mocklisp.h \
    keyboard.h $(config_h)
-callproc.o : callproc.c paths.h buffer.h commands.h $(config_h) \
+callproc.o: callproc.c paths.h buffer.h commands.h $(config_h) \
 	process.h systty.h syssignal.h
-casefiddle.o : casefiddle.c syntax.h commands.h buffer.h $(config_h) 
-casetab.o : casetab.c buffer.h $(config_h)
-cm.o : cm.c cm.h termhooks.h $(config_h)
-cmds.o : cmds.c syntax.h buffer.h commands.h $(config_h) 
-pre-crt0.o : pre-crt0.c
-crt0.o : crt0.c $(config_h)
+casefiddle.o: casefiddle.c syntax.h commands.h buffer.h $(config_h) 
+casetab.o: casetab.c buffer.h $(config_h)
+cm.o: cm.c cm.h termhooks.h $(config_h)
+cmds.o: cmds.c syntax.h buffer.h commands.h window.h $(config_h) 
+pre-crt0.o: pre-crt0.c
+crt0.o: crt0.c $(config_h)
 	CRT0_COMPILE ${srcdir}/crt0.c
-dired.o : dired.c commands.h buffer.h $(config_h) regex.h
-dispnew.o : dispnew.c commands.h frame.h window.h buffer.h dispextern.h \
+dired.o: dired.c commands.h buffer.h $(config_h) regex.h
+dispnew.o: dispnew.c commands.h frame.h window.h buffer.h dispextern.h \
    termchar.h termopts.h termhooks.h cm.h disptab.h systty.h systime.h $(config_h)
-doc.o : doc.c $(config_h) paths.h buffer.h keyboard.h
-doprnt.o : doprnt.c
-editfns.o : editfns.c window.h buffer.h systime.h INTERVAL_SRC $(config_h) 
-emacs.o : emacs.c commands.h systty.h syssignal.h process.h INTERVAL_SRC $(config_h) 
-	$(CC) -c -DCONFIGURATION="$(configuration)" $(CPPFLAGS) $(ALL_CFLAGS) $<
-fileio.o : fileio.c window.h buffer.h systime.h INTERVAL_SRC $(config_h) 
-filelock.o : filelock.c buffer.h paths.h $(config_h)
-filemode.o : filemode.c  $(config_h)
-getloadavg.o : getloadavg.c $(config_h)
-indent.o : indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
+doc.o: doc.c $(config_h) paths.h buffer.h keyboard.h
+doprnt.o: doprnt.c $(config_h)
+editfns.o: editfns.c window.h buffer.h systime.h INTERVAL_SRC $(config_h) 
+emacs.o: emacs.c commands.h systty.h syssignal.h process.h INTERVAL_SRC $(config_h) 
+fileio.o: fileio.c window.h buffer.h systime.h INTERVAL_SRC $(config_h) 
+filelock.o: filelock.c buffer.h paths.h $(config_h)
+filemode.o: filemode.c  $(config_h)
+getloadavg.o: getloadavg.c $(config_h)
+indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
    termopts.h disptab.h
-insdel.o : insdel.c window.h buffer.h INTERVAL_SRC blockinput.h $(config_h)
-keyboard.o : keyboard.c termchar.h termhooks.h termopts.h buffer.h \
+insdel.o: insdel.c window.h buffer.h INTERVAL_SRC blockinput.h $(config_h)
+keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h \
    commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
    systty.h systime.h dispextern.h intervals.h blockinput.h $(config_h) 
-keymap.o : keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
+keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
    $(config_h) 
-lastfile.o : lastfile.c  $(config_h)
-macros.o : macros.c window.h buffer.h commands.h macros.h $(config_h)
-malloc.o : malloc.c $(config_h)
-gmalloc.o : gmalloc.c $(config_h)
-ralloc.o : ralloc.c $(config_h)
-vm-limit.o : vm-limit.c mem-limits.h $(config_h) 
-marker.o : marker.c buffer.h $(config_h) 
-minibuf.o : minibuf.c syntax.h dispextern.h frame.h window.h \
+lastfile.o: lastfile.c  $(config_h)
+macros.o: macros.c window.h buffer.h commands.h macros.h $(config_h)
+malloc.o: malloc.c $(config_h)
+gmalloc.o: gmalloc.c $(config_h)
+ralloc.o: ralloc.c $(config_h)
+vm-limit.o: vm-limit.c mem-limits.h $(config_h) 
+marker.o: marker.c buffer.h $(config_h) 
+minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h \
    buffer.h commands.h $(config_h) 
-mocklisp.o : mocklisp.c buffer.h $(config_h)
-process.o : process.c process.h buffer.h window.h termhooks.h termopts.h \
+mocklisp.o: mocklisp.c buffer.h $(config_h)
+process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
    commands.h syssignal.h systime.h systty.h syswait.h frame.h $(config_h) 
-regex.o : regex.c syntax.h buffer.h $(config_h) regex.h 
-frame.o : frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
+regex.o: regex.c syntax.h buffer.h $(config_h) regex.h 
+frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
    buffer.h $(config_h)
-scroll.o : scroll.c termchar.h $(config_h) dispextern.h frame.h
-search.o : search.c regex.h commands.h buffer.h syntax.h blockinput.h $(config_h) 
-syntax.o : syntax.c syntax.h buffer.h commands.h $(config_h) 
-sysdep.o : sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.h \
+scroll.o: scroll.c termchar.h $(config_h) dispextern.h frame.h
+search.o: search.c regex.h commands.h buffer.h syntax.h blockinput.h $(config_h) 
+syntax.o: syntax.c syntax.h buffer.h commands.h $(config_h) 
+sysdep.o: sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.h \
    frame.h syssignal.h systty.h systime.h syswait.h blockinput.h window.h
-term.o : term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
+term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
    disptab.h
-termcap.o : termcap.c $(config_h)
-terminfo.o : terminfo.c $(config_h)
-tparam.o : tparam.c $(config_h)
-undo.o : undo.c buffer.h commands.h $(config_h) 
-UNEXEC : UNEXEC_SRC $(config_h)
-widget.o : widget.c xterm.h frame.h dispextern.h widgetprv.h $(config_h)
-window.o : window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
+termcap.o: termcap.c $(config_h)
+terminfo.o: terminfo.c $(config_h)
+tparam.o: tparam.c $(config_h)
+undo.o: undo.c buffer.h commands.h $(config_h) 
+/* This hack is to discard any space that cpp might put at the beginning
+   of UNEXEC when substituting it in.  */
+UNEXEC_ALIAS=UNEXEC
+$(UNEXEC_ALIAS): UNEXEC_SRC $(config_h)
+widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h $(config_h)
+window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
    termhooks.h disptab.h keyboard.h $(config_h)
-xdisp.o : xdisp.c macros.h commands.h indent.h buffer.h dispextern.h \
+xdisp.o: xdisp.c macros.h commands.h indent.h buffer.h dispextern.h \
    termchar.h frame.h window.h disptab.h termhooks.h $(config_h) 
-xfaces.o : xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
+xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
    window.h $(config_h) 
-xfns.o : xfns.c buffer.h frame.h window.h keyboard.h xterm.h \
+xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h \
    blockinput.h $(config_h)
-xmenu.o : xmenu.c xterm.h window.h frame.h keyboard.h blockinput.h $(config_h)
-xterm.o : xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
+xmenu.o: xmenu.c xterm.h window.h dispextern.h frame.h keyboard.h \
+   blockinput.h puresize.h $(config_h)
+xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
   dispextern.h frame.h disptab.h blockinput.h systime.h syssignal.h \
-  gnu.h sink.h sinkmask.h $(config_h)
-xselect.o : xselect.c dispextern.h frame.h xterm.h blockinput.h $(config_h) 
-xrdb.o : xrdb.c $(config_h)
-hftctl.o : hftctl.c $(config_h)
+  keyboard.h gnu.h sink.h sinkmask.h $(config_h)
+xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h $(config_h) 
+xrdb.o: xrdb.c $(config_h)
+hftctl.o: hftctl.c $(config_h)
 
 /* The files of Lisp proper */
 
-alloc.o : alloc.c frame.h window.h buffer.h  puresize.h syssignal.h
-alloc.o : blockinput.h $(config_h) INTERVAL_SRC
-bytecode.o : bytecode.c buffer.h $(config_h)
-data.o : data.c buffer.h puresize.h syssignal.h $(config_h)
-eval.o : eval.c commands.h keyboard.h blockinput.h $(config_h)
-floatfns.o : floatfns.c $(config_h)
-fns.o : fns.c commands.h $(config_h) frame.h buffer.h keyboard.h INTERVAL_SRC
-print.o : print.c process.h frame.h window.h buffer.h $(config_h)
-lread.o : lread.c commands.h keyboard.h buffer.h paths.h $(config_h) \
+alloc.o: alloc.c frame.h window.h buffer.h  puresize.h syssignal.h
+alloc.o: blockinput.h $(config_h) INTERVAL_SRC
+bytecode.o: bytecode.c buffer.h $(config_h)
+data.o: data.c buffer.h puresize.h syssignal.h $(config_h)
+eval.o: eval.c commands.h keyboard.h blockinput.h $(config_h)
+floatfns.o: floatfns.c $(config_h)
+fns.o: fns.c commands.h $(config_h) frame.h buffer.h keyboard.h INTERVAL_SRC
+print.o: print.c process.h frame.h window.h buffer.h $(config_h)
+lread.o: lread.c commands.h keyboard.h buffer.h paths.h $(config_h) \
  termhooks.h
 
 /* Text properties support */
-textprop.o : textprop.c buffer.h intervals.h $(config_h)
-intervals.o : intervals.c buffer.h intervals.h puresize.h $(config_h)
+textprop.o: textprop.c buffer.h intervals.h $(config_h)
+intervals.o: intervals.c buffer.h intervals.h puresize.h $(config_h)
 
 /* System-specific programs to be made.
    OTHER_FILES, OBJECTS_SYSTEM and OBJECTS_MACHINE
    select which of these should be compiled.  */
 
-sunfns.o  : sunfns.c buffer.h $(config_h)
+sunfns.o: sunfns.c buffer.h $(config_h)
 
 ${libsrc}emacstool: ${libsrc}emacstool.c
 	cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
 mostlyclean:
-	rm -f temacs prefix-args xmakefile* core \#* *.o libXMenu11.a
+	rm -f temacs prefix-args core \#* *.o libXMenu11.a liblw.a
 	rm -f ../etc/DOC
 clean: mostlyclean
 	rm -f emacs-* emacs
@@ -859,8 +907,14 @@ unlock:
 relock:
 	chmod -w $(SOURCES)
 	chmod +w paths.h
-tagsfiles = [a-z]*.h [a-z]*.c ../lisp/[a-z]*.el ../lisp/term/[a-z]*.el
-TAGS: $(tagsfiles)
-	etags $(tagsfiles)
-tags: TAGS
+
+/* Arrange to make a tags table in ../lisp, and another in this dir
+   which includes ../lisp/TAGS by reference.  */
+ctagsfiles = [a-zA-Z]*.[hc]
+lisptagsfiles = ../lisp/[a-zA-Z]*.el ../lisp/term/[a-zA-Z]*.el
+TAGS: $(ctagsfiles)
+	../lib-src/etags --include=../lisp/TAGS $(ctagsfiles)
+../lisp/TAGS: $(lisptagsfiles)
+	cd ../lisp; $(MAKE) TAGS
+tags: TAGS ../lisp/TAGS
 .PHONY: tags