(Fnext_property_change): Properly offset interval

[gnu-emacs] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 03cd8fd92e2ee2dd6273eacca0771e1d443e56ed..583d57917eaa0ffaea5358413ef8e2c93f5d623d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,7 +15,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
 
 # 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.  */
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.

 
 # Here are the things that we expect ../configure to edit.
 srcdir=@srcdir@
 
 # Here are the things that we expect ../configure to edit.
 srcdir=@srcdir@


@@ -23,6 +24,8 @@ VPATH=@srcdir@
 CC=@CC@
 CPP=@CPP@
 CFLAGS=@CFLAGS@
 CC=@CC@
 CPP=@CPP@
 CFLAGS=@CFLAGS@

+CPPFLAGS=@CPPFLAGS@
+LDFLAGS=@LDFLAGS@

 LN_S=@LN_S@
 # Substitute an assignment for the MAKE variable, because
 # BSD doesn't have it as a default.
 LN_S=@LN_S@
 # Substitute an assignment for the MAKE variable, because
 # BSD doesn't have it as a default.


@@ -30,11 +33,10 @@ LN_S=@LN_S@
 
 # On Xenix and the IBM RS6000, double-dot gets screwed up.
 dot = .
 
 # On Xenix and the IBM RS6000, double-dot gets screwed up.
 dot = .

-lispdir = ${srcdir}/$(dot)$(dot)/lisp/
+dotdot = ${dot}${dot}
+lispsource = ${srcdir}/$(dot)$(dot)/lisp/

 libsrc = $(dot)$(dot)/lib-src/
 etc = $(dot)$(dot)/etc/
 libsrc = $(dot)$(dot)/lib-src/
 etc = $(dot)$(dot)/etc/

-shortnamesdir = $(dot)$(dot)/shortnames/
-cppdir = $(dot)$(dot)/cpp/

 oldXMenudir = $(dot)$(dot)/oldXMenu/
 lwlibdir = $(dot)$(dot)/lwlib/
 
 oldXMenudir = $(dot)$(dot)/oldXMenu/
 lwlibdir = $(dot)$(dot)/lwlib/
 


@@ -43,18 +45,16 @@ M_FILE = ${srcdir}/@machfile@
 S_FILE = ${srcdir}/@opsysfile@
 config_h = config.h $(M_FILE) $(S_FILE)
 
 S_FILE = ${srcdir}/@opsysfile@
 config_h = config.h $(M_FILE) $(S_FILE)
 

-# ========================== start of cpp stuff ======================= */
+# ========================== start of cpp stuff =======================

 /* From here on, comments must be done in C syntax.  */
 
 /* From here on, comments must be done in C syntax.  */
 

-CPPFLAGS=
-LDFLAGS=

 C_SWITCH_SYSTEM=
 
 /* just to be sure the sh is used */
 SHELL=/bin/sh
 
 C_SWITCH_SYSTEM=
 
 /* just to be sure the sh is used */
 SHELL=/bin/sh
 

+#define THIS_IS_MAKEFILE

 #define NO_SHORTNAMES
 #define NO_SHORTNAMES

-#define THIS_IS_YMAKEFILE

 #define NOT_C_CODE
 #include "config.h"
 
 #define NOT_C_CODE
 #include "config.h"
 


@@ -64,6 +64,11 @@ SHELL=/bin/sh
 #undef alloca
 #endif
 
 #undef alloca
 #endif
 

+/* Don't let the file name mktime.c get messed up.  */
+#ifdef mktime
+#undef mktime
+#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. */
 /* 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. */


@@ -110,12 +115,12 @@ CC = C_COMPILER
 #define LIBS_DEBUG -lg
 #endif
 
 #define LIBS_DEBUG -lg
 #endif
 

-/* Some s/*.h files define this to request special libraries.  */
+/* Some s/SYSTEM.h files define this to request special libraries.  */

 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
 #endif
 
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
 #endif
 

-/* Some m/*.h files define this to request special libraries.  */
+/* Some m/MACHINE.h files define this to request special libraries.  */

 #ifndef LIBS_MACHINE
 #define LIBS_MACHINE
 #endif
 #ifndef LIBS_MACHINE
 #define LIBS_MACHINE
 #endif


@@ -128,26 +133,38 @@ CC = C_COMPILER
 # endif /* ! defined (LISP_FLOAT_TYPE) */
 #endif /* LIB_MATH */
 
 # endif /* ! defined (LISP_FLOAT_TYPE) */
 #endif /* LIB_MATH */
 

-/* Some s/*.h files define this to request special switches in ld.  */
+/* Some s/SYSTEM.h files define this to request special switches in ld.  */

 #ifndef LD_SWITCH_SYSTEM
 #ifndef LD_SWITCH_SYSTEM

-#if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)))
+#if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)))

 #define LD_SWITCH_SYSTEM -X
 #define LD_SWITCH_SYSTEM -X

-#else /* ! defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)) */
+#else /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */

 #define LD_SWITCH_SYSTEM
 #define LD_SWITCH_SYSTEM

-#endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)) */
+#endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */

 #endif /* LD_SWITCH_SYSTEM */
 
 #endif /* LD_SWITCH_SYSTEM */
 

-/* Some m/*.h files define this to request special switches in ld.  */
+/* This holds special options for linking temacs
+   that should be used for linking anything else.  */
+#ifndef LD_SWITCH_SYSTEM_TEMACS
+#define LD_SWITCH_SYSTEM_TEMACS
+#endif
+
+/* Some m/MACHINE.h files define this to request special switches in ld.  */

 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
 #endif
 
 #ifndef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE
 #endif
 

-/* Some m/*.h files define this to request special switches in cc.  */
+/* This holds special options for linking temacs
+   that should be used for linking anything else.  */
+#ifndef LD_SWITCH_MACHINE_TEMACS
+#define LD_SWITCH_MACHINE_TEMACS
+#endif
+
+/* Some m/MACHINE.h files define this to request special switches in cc.  */

 #ifndef C_SWITCH_MACHINE
 #define C_SWITCH_MACHINE
 #endif
 
 #ifndef C_SWITCH_MACHINE
 #define C_SWITCH_MACHINE
 #endif
 

-/* Some s/*.h files define this to request special switches in cc.  */
+/* Some s/SYSTEM.h files define this to request special switches in cc.  */

 #ifndef C_SWITCH_SYSTEM
 #define C_SWITCH_SYSTEM
 #endif
 #ifndef C_SWITCH_SYSTEM
 #define C_SWITCH_SYSTEM
 #endif


@@ -186,7 +203,7 @@ CC = C_COMPILER
 #ifndef ORDINARY_LINK
 
 #ifndef CRT0_COMPILE
 #ifndef ORDINARY_LINK
 
 #ifndef CRT0_COMPILE

-#define CRT0_COMPILE $(CC) -c $(ALL_CFLAGS) C_SWITCH_ASM 
+#define CRT0_COMPILE $(CC) -c $(ALL_CFLAGS) C_SWITCH_ASM

 #endif
 
 #ifndef START_FILES
 #endif
 
 #ifndef START_FILES


@@ -231,12 +248,15 @@ STARTFILES = START_FILES
    which will be in a file named localcpp.  */
 MYCPPFLAG= -Blocal
 /* LOCALCPP is the local one or nothing.
    which will be in a file named localcpp.  */
 MYCPPFLAG= -Blocal
 /* LOCALCPP is the local one or nothing.

-   CPP is the local one or the standardone.  */
+   CPP is the local one or the standard one.  */

 LOCALCPP= localcpp
 #endif /* ! defined (LONGNAMEBBBARFOOX) */
 
 LOCALCPP= localcpp
 #endif /* ! defined (LONGNAMEBBBARFOOX) */
 

-#ifdef SHORTNAMES
-SHORT= shortnames
+#ifdef USE_X_TOOLKIT
+#define USE_@X_TOOLKIT_TYPE@
+TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@
+#else
+TOOLKIT_DEFINES =

 #endif
 
 /* DO NOT use -R.  There is a special hack described in lastfile.c
 #endif
 
 /* DO NOT use -R.  There is a special hack described in lastfile.c


@@ -252,7 +272,7 @@ SHORT= shortnames
 
 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */
 
 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */

-ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAG) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS}
+ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAG) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS}

 .c.o:
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 
 .c.o:
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 


@@ -277,10 +297,10 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAG) -I. -I${srcdir} C_SWITCH_MACHINE
 #endif
 
 #ifdef HAVE_X_WINDOWS
 #endif
 
 #ifdef HAVE_X_WINDOWS

-#ifdef HAVE_X_MENU
+#ifdef HAVE_MENUS

 
 /* Include xmenu.o in the list of X object files.  */
 
 /* Include xmenu.o in the list of X object files.  */

-XOBJ= xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o

 
 /* The X Menu stuff is present in the X10 distribution, but missing
    from X11.  If we have X10, just use the installed library;
 
 /* The X Menu stuff is present in the X10 distribution, but missing
    from X11.  If we have X10, just use the installed library;


@@ -297,13 +317,13 @@ LIBXMENU= $(OLDXMENU)
 LIBXMENU= -lXMenu
 #endif /* not HAVE_X11 */
 
 LIBXMENU= -lXMenu
 #endif /* not HAVE_X11 */
 

-#else /* not HAVE_X_MENU */
+#else /* not HAVE_MENUS */

 
 /* Otherwise, omit xmenu.o from the list of X object files, and
    don't worry about the menu library at all.  */
 
 /* Otherwise, omit xmenu.o from the list of X object files, and
    don't worry about the menu library at all.  */

-XOBJ= xterm.o xfns.o xfaces.o xselect.o xrdb.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o

 LIBXMENU=
 LIBXMENU=

-#endif /* not HAVE_X_MENU */
+#endif /* not HAVE_MENUS */

 
 #ifdef USE_X_TOOLKIT
 #define @X_TOOLKIT_TYPE@
 
 #ifdef USE_X_TOOLKIT
 #define @X_TOOLKIT_TYPE@


@@ -311,10 +331,15 @@ LIBXMENU=
 LIBW= -lXaw
 #endif
 #ifdef MOTIF
 LIBW= -lXaw
 #endif
 #ifdef MOTIF

+#ifdef HAVE_MOTIF_2_1
+#define LIB_MOTIF_EXTRA -lXp
+#else
+#define LIB_MOTIF_EXTRA
+#endif

 #ifdef LIB_MOTIF
 #ifdef LIB_MOTIF

-LIBW= LIB_MOTIF
+LIBW= LIB_MOTIF LIB_MOTIF_EXTRA

 #else
 #else

-LIBW= -lXm
+LIBW= -lXm LIB_MOTIF_EXTRA

 #endif
 #endif
 #ifdef OPEN_LOOK
 #endif
 #endif
 #ifdef OPEN_LOOK


@@ -329,11 +354,23 @@ LIBXTR6 = -lSM -lICE
 #endif
 #endif
 
 #endif
 #endif
 

-LIBXT= $(LIBW) -lXmu -lXt $(LIBXTR6) -lXext
-#else
-LIBXT=
+#ifndef LIBXMU
+#define LIBXMU -lXmu

 #endif
 
 #endif
 

+#ifdef LIBXT_STATIC
+/* We assume the config files have defined STATIC_OPTION
+   since that might depend on the operating system.
+   (Don't forget you need different definitions with and without __GNUC__.)  */
+LIBXT= STATIC_OPTION $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext DYNAMIC_OPTION
+#else /* not LIBXT_STATIC */
+LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext
+#endif /* not LIBXT_STATIC */
+
+#else /* not USE_X_TOOLKIT */
+LIBXT=
+#endif /* not USE_X_TOOLKIT */
+

 #ifdef HAVE_X11
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */
 #ifdef HAVE_X11
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */


@@ -393,7 +430,7 @@ GNULIB_VAR = LIB_GCC
 GNULIB_VAR = `if [ -f LIB_GCC ] ; then echo LIB_GCC; else echo; fi`
 #endif /* __GNUC__ < 2 */
 #else /* not __GNUC__ */
 GNULIB_VAR = `if [ -f LIB_GCC ] ; then echo LIB_GCC; else echo; fi`
 #endif /* __GNUC__ < 2 */
 #else /* not __GNUC__ */

-GNULIB_VAR = 
+GNULIB_VAR =

 
 #endif /* not __GNUC__ */
 #endif /* not ORDINARY_LINK */
 
 #endif /* not __GNUC__ */
 #endif /* not ORDINARY_LINK */


@@ -418,11 +455,14 @@ LD=ld
 #endif /* not COFF_ENCAPSULATE */
 #endif /* not ORDINARY_LINK */
 
 #endif /* not COFF_ENCAPSULATE */
 #endif /* not ORDINARY_LINK */
 

-ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
+ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
+        LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS)

 
 

-/* A macro which other sections of ymakefile can redefine to munge the
+/* A macro which other sections of Makefile can redefine to munge the

    flags before they're passed to LD.  This is helpful if you have
    flags before they're passed to LD.  This is helpful if you have

-   redefined LD to something odd, like "gcc".  */
+   redefined LD to something odd, like "gcc".
+   (The YMF prefix is a holdover from the old name "ymakefile".)
+  */

 #ifndef YMF_PASS_LDFLAGS
 #define YMF_PASS_LDFLAGS(flags) flags
 #endif
 #ifndef YMF_PASS_LDFLAGS
 #define YMF_PASS_LDFLAGS(flags) flags
 #endif


@@ -449,7 +489,7 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
 #define GETLOADAVG_OBJ getloadavg.o
 #endif
 
 #define GETLOADAVG_OBJ getloadavg.o
 #endif
 

-#ifdef HAVE_MKTIME
+#if HAVE_MKTIME && ! BROKEN_MKTIME

 #define MKTIME_OBJ
 #else
 #define MKTIME_OBJ mktime.o
 #define MKTIME_OBJ
 #else
 #define MKTIME_OBJ mktime.o


@@ -459,7 +499,7 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
 #ifdef HAVE_X_WINDOWS
 #define MSDOS_OBJ dosfns.o msdos.o
 #else
 #ifdef HAVE_X_WINDOWS
 #define MSDOS_OBJ dosfns.o msdos.o
 #else

-#define MSDOS_OBJ dosfns.o msdos.o xfaces.o xmenu.o
+#define MSDOS_OBJ dosfns.o msdos.o w16select.o

 #endif
 #else
 #define MSDOS_OBJ
 #endif
 #else
 #define MSDOS_OBJ


@@ -467,9 +507,10 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
 
 
 /* lastfile must follow all files
 
 
 /* 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 \
-       cm.o term.o $(XOBJ) \
+   whose initialized data areas should be dumped as pure by dump-emacs.  */
+obj=    dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
+       charset.o coding.o category.o ccl.o\
+       cm.o term.o xfaces.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 \
        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 \


@@ -484,13 +525,13 @@ obj=    dispnew.o frame.o scroll.o xdisp.o window.o \
 /* Object files used on some machine or other.
    These go in the DOC file on all machines
    in case they are needed there.  */
 /* Object files used on some machine or other.
    These go in the DOC file on all machines
    in case they are needed there.  */

-SOME_MACHINE_OBJECTS = sunfns.o msdos.o \
-  xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o
+SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o intervals.o textprop.o \
+  xterm.o xfns.o xmenu.o xselect.o xrdb.o

 
 
 #ifdef TERMINFO
 /* Used to be -ltermcap here.  If your machine needs that,
 
 
 #ifdef TERMINFO
 /* Used to be -ltermcap here.  If your machine needs that,

-   define LIBS_TERMCAP in the m/*.h file.  */
+   define LIBS_TERMCAP in the m/MACHINE.h file.  */

 #ifndef LIBS_TERMCAP
 #define LIBS_TERMCAP -lcurses
 #endif /* LIBS_TERMCAP */
 #ifndef LIBS_TERMCAP
 #define LIBS_TERMCAP -lcurses
 #endif /* LIBS_TERMCAP */


@@ -507,15 +548,19 @@ termcapobj = tparam.o
 
 #ifndef SYSTEM_MALLOC
 
 
 #ifndef SYSTEM_MALLOC
 

-#ifdef GNU_MALLOC  /* New GNU malloc */
+#ifdef DOUG_LEA_MALLOC
+#ifdef REL_ALLOC
+mallocobj = ralloc.o vm-limit.o
+#else /* ! defined (REL_ALLOC) */
+mallocobj = vm-limit.o
+#endif /* ! defined (REL_ALLOC) */
+#else /* ! defined (DOUG_LEA_MALLOC) */

 #ifdef REL_ALLOC
 mallocobj = gmalloc.o ralloc.o vm-limit.o
 #else /* ! defined (REL_ALLOC) */
 mallocobj = gmalloc.o vm-limit.o
 #endif /* ! defined (REL_ALLOC) */
 #ifdef REL_ALLOC
 mallocobj = gmalloc.o ralloc.o vm-limit.o
 #else /* ! defined (REL_ALLOC) */
 mallocobj = gmalloc.o vm-limit.o
 #endif /* ! defined (REL_ALLOC) */

-#else /* Old GNU malloc */
-mallocobj = malloc.o
-#endif /* Old GNU malloc */
+#endif /* ! defined (DOUG_LEA_MALLOC) */

 
 #endif /* SYSTEM_MALLOC */
 
 
 #endif /* SYSTEM_MALLOC */
 


@@ -538,26 +583,20 @@ widgetobj=
 otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 
 #ifdef HAVE_FACES
 otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 
 #ifdef HAVE_FACES

-#define FACE_SUPPORT ${lispdir}faces.elc ${lispdir}facemenu.elc
+#define FACE_SUPPORT ${lispsource}facemenu.elc

 #else
 #define FACE_SUPPORT
 #endif
 
 #ifdef LISP_FLOAT_TYPE
 #else
 #define FACE_SUPPORT
 #endif
 
 #ifdef LISP_FLOAT_TYPE

-#define FLOAT_SUPPORT ${lispdir}float-sup.elc
+#define FLOAT_SUPPORT ${lispsource}float-sup.elc

 #else
 #define FLOAT_SUPPORT
 #endif
 
 #else
 #define FLOAT_SUPPORT
 #endif
 

-#ifdef MULTI_FRAME
-#define FRAME_SUPPORT ${lispdir}frame.elc
-#else
-#define FRAME_SUPPORT
-#endif
-

 #ifdef HAVE_MOUSE
 #ifdef HAVE_MOUSE

-#define MOUSE_SUPPORT ${lispdir}menu-bar.elc ${lispdir}mouse.elc \
-  ${lispdir}select.elc ${lispdir}scroll-bar.elc
+#define MOUSE_SUPPORT ${lispsource}mouse.elc \
+  ${lispsource}select.elc ${lispsource}scroll-bar.elc

 #else
 #define MOUSE_SUPPORT
 #endif
 #else
 #define MOUSE_SUPPORT
 #endif


@@ -569,19 +608,21 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 #endif
 
 #ifdef VMS
 #endif
 
 #ifdef VMS

-#define VMS_SUPPORT ${lispdir}vmsproc.elc ${lispdir}vms-patch.elc
+#define VMS_SUPPORT ${lispsource}vmsproc.elc ${lispsource}vms-patch.elc

 #else
 #define VMS_SUPPORT
 #endif
 
 #ifdef MSDOS
 #else
 #define VMS_SUPPORT
 #endif
 
 #ifdef MSDOS

-#define MSDOS_SUPPORT ${lispdir}ls-lisp.elc ${lispdir}disp-tab.elc ${lispdir}dos-fns.elc
+#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
+ ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc

 #else
 #define MSDOS_SUPPORT
 #endif
 
 #ifdef WINDOWSNT
 #else
 #define MSDOS_SUPPORT
 #endif
 
 #ifdef WINDOWSNT

-#define WINNT_SUPPORT ${lispdir}ls-lisp.elc ${lispdir}winnt.elc
+#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}w32-fns.elc \
+  ${lispsource}dos-w32.elc

 #else
 #define WINNT_SUPPORT
 #endif
 #else
 #define WINNT_SUPPORT
 #endif


@@ -592,58 +633,159 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
 
    Note that this list should not include lisp files which might not
    be present, like site-load.el and site-init.el; this makefile
 
    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.  */
+   expects them all to be either present or buildable.
+
+   Files which are loaded unconditionally should be in shortlisp as well.
+   Files included conditionally here should be included (unconditionally)
+   in SOME_MACHINE_LISP.  */
+

 lisp= \
 lisp= \

-       ${lispdir}abbrev.elc \
-       ${lispdir}buff-menu.elc \
-       ${lispdir}byte-run.elc \
-       ${lispdir}c-mode.elc \
-       ${lispdir}files.elc \
-       ${lispdir}fill.elc \
-       ${lispdir}format.elc \
+       ${lispsource}abbrev.elc \
+       ${lispsource}buff-menu.elc \
+       ${lispsource}byte-run.elc \
+       ${lispsource}cus-start.el \
+       ${lispsource}custom.elc \
+       ${lispsource}emacs-lisp/lisp-mode.elc \
+       ${lispsource}emacs-lisp/lisp.elc \
+       ${lispsource}faces.elc \
+       ${lispsource}files.elc \
+       ${lispsource}format.elc \

        FACE_SUPPORT \
        MOUSE_SUPPORT \
        FLOAT_SUPPORT \
        FACE_SUPPORT \
        MOUSE_SUPPORT \
        FLOAT_SUPPORT \

-       FRAME_SUPPORT \
+       ${lispsource}frame.elc\

        X_WINDOWS_SUPPORT \
        X_WINDOWS_SUPPORT \

-       ${lispdir}help.elc \
-       ${lispdir}indent.elc \
-       ${lispdir}isearch.elc \
-       ${lispdir}lisp-mode.elc \
-       ${lispdir}lisp.elc \
-       ${lispdir}loaddefs.el \
-       ${lispdir}map-ynp.elc \
-       ${lispdir}page.elc \
-       ${lispdir}paragraphs.elc \
-       ${lispdir}paths.el \
-       ${lispdir}register.elc \
-       ${lispdir}replace.elc \
-       ${lispdir}simple.elc \
-       ${lispdir}startup.elc \
-       ${lispdir}subr.elc \
-       ${lispdir}text-mode.elc \
-       ${lispdir}vc-hooks.elc \
+       ${lispsource}help.elc \
+       ${lispsource}indent.elc \
+       ${lispsource}isearch.elc \
+       ${lispsource}loadup.el \
+       ${lispsource}loaddefs.el \
+       ${lispsource}bindings.el \
+       ${lispsource}map-ynp.elc \
+       ${lispsource}menu-bar.elc \
+       ${lispsource}international/mule.elc \
+       ${lispsource}international/mule-conf.el \
+       ${lispsource}international/mule-cmds.elc \
+       ${lispsource}international/characters.elc \
+       ${lispsource}case-table.elc \
+       ${lispsource}language/chinese.elc \
+       ${lispsource}language/cyrillic.elc \
+       ${lispsource}language/indian.elc \
+       ${lispsource}language/devanagari.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}language/korean.elc \
+       ${lispsource}language/lao.elc \
+       ${lispsource}language/thai.elc \
+       ${lispsource}language/tibetan.elc \
+       ${lispsource}language/vietnamese.elc \
+       ${lispsource}language/misc-lang.elc \
+       ${lispsource}paths.el \
+       ${lispsource}register.elc \
+       ${lispsource}replace.elc \
+       ${lispsource}simple.elc \
+       ${lispsource}startup.elc \
+       ${lispsource}subr.elc \
+       ${lispsource}textmodes/fill.elc \
+       ${lispsource}textmodes/page.elc \
+       ${lispsource}textmodes/paragraphs.elc \
+       ${lispsource}textmodes/text-mode.elc \
+       ${lispsource}vc-hooks.elc \
+       ${lispsource}ediff-hook.elc \

        VMS_SUPPORT \
        MSDOS_SUPPORT \
        WINNT_SUPPORT \
        VMS_SUPPORT \
        MSDOS_SUPPORT \
        WINNT_SUPPORT \

-       ${lispdir}window.elc \
-       ${lispdir}version.el
+       ${lispsource}widget.elc \
+       ${lispsource}window.elc \
+       ${lispsource}version.el
+
+/* These are relative file names for the Lisp files
+   that are loaded unconditionally.  This is used in make-docfile.
+   It need not contain the files that are loaded conditionally
+   because SOME_MACHINE_LISP has those.  */
+shortlisp= \
+       ../lisp/abbrev.elc \
+       ../lisp/buff-menu.elc \
+       ../lisp/byte-run.elc \
+       ../lisp/cus-start.el \
+       ../lisp/custom.elc \
+       ../lisp/emacs-lisp/lisp-mode.elc \
+       ../lisp/emacs-lisp/lisp.elc \
+       ../lisp/faces.elc \
+       ../lisp/files.elc \
+       ../lisp/format.elc \
+       ../lisp/help.elc \
+       ../lisp/indent.elc \
+       ../lisp/isearch.elc \
+       ../lisp/loadup.el \
+       ../lisp/loaddefs.el \
+       ../lisp/bindings.el \
+       ../lisp/map-ynp.elc \
+       ../lisp/international/mule.elc \
+       ../lisp/international/mule-conf.el \
+       ../lisp/international/mule-cmds.elc \
+       ../lisp/international/characters.elc \
+       ../lisp/case-table.elc \
+       ../lisp/language/chinese.elc \
+       ../lisp/language/cyrillic.elc \
+       ../lisp/language/indian.elc \
+       ../lisp/language/devanagari.elc \
+       ../lisp/language/english.elc \
+       ../lisp/language/ethiopic.elc \
+       ../lisp/language/european.elc \
+       ../lisp/language/czech.elc \
+       ../lisp/language/slovak.elc \
+       ../lisp/language/romanian.elc \
+       ../lisp/language/greek.elc \
+       ../lisp/language/hebrew.elc \
+       ../lisp/language/japanese.elc \
+       ../lisp/language/korean.elc \
+       ../lisp/language/lao.elc \
+       ../lisp/language/thai.elc \
+       ../lisp/language/tibetan.elc \
+       ../lisp/language/vietnamese.elc \
+       ../lisp/language/misc-lang.elc \
+       ../lisp/paths.el \
+       ../lisp/register.elc \
+       ../lisp/replace.elc \
+       ../lisp/simple.elc \
+       ../lisp/startup.elc \
+       ../lisp/subr.elc \
+       ../lisp/textmodes/fill.elc \
+       ../lisp/textmodes/page.elc \
+       ../lisp/textmodes/paragraphs.elc \
+       ../lisp/textmodes/text-mode.elc \
+       ../lisp/vc-hooks.elc \
+       ../lisp/ediff-hook.elc \
+       ../lisp/widget.elc \
+       ../lisp/window.elc \
+       ../lisp/version.el

 
 /* Lisp files that may or may not be used.
 
 /* Lisp files that may or may not be used.

-   We must unconditionally put them in the DOC file.  */
-SOME_MACHINE_LISP =  ${lispdir}faces.elc ${lispdir}facemenu.elc \
-  ${lispdir}float-sup.elc ${lispdir}frame.elc \
-  ${lispdir}menu-bar.elc ${lispdir}mouse.elc \
-  ${lispdir}select.elc ${lispdir}scroll-bar.elc \
-  ${lispdir}vmsproc.elc ${lispdir}vms-patch.elc \
-  ${lispdir}ls-lisp.elc ${lispdir}dos-fns.elc \
-  ${lispdir}winnt.elc
+   We must unconditionally put them in the DOC file.
+   We use ../lisp/ to start the file names
+   to reduce the size of the argument list for make-docfile
+   for the sake of systems which can't handle large ones.  */
+SOME_MACHINE_LISP = ${dotdot}/lisp/facemenu.elc \
+  ${dotdot}/lisp/float-sup.elc ${dotdot}/lisp/frame.elc \
+  ${dotdot}/lisp/menu-bar.elc ${dotdot}/lisp/mouse.elc \
+  ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \
+  ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \
+  ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
+  ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc

 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get
    duplicated symbols.  If the standard libraries were compiled
    with GCC, we might need gnulib again after them.  */
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get
    duplicated symbols.  If the standard libraries were compiled
    with GCC, we might need gnulib again after them.  */

-LIBES = $(LIBX) LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
+LIBES = $(LOADLIBES) $(LDLIBS) $(LIBX) LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \

    LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
 
 /* Enable recompilation of certain other files depending on system type.  */
    LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
 
 /* Enable recompilation of certain other files depending on system type.  */


@@ -674,6 +816,7 @@ emacs: temacs ${etc}DOC ${lisp}
        ./temacs -batch -l loadup dump
 #endif /* ! defined (HAVE_SHM) */
 #endif /* ! defined (CANNOT_DUMP) */
        ./temacs -batch -l loadup dump
 #endif /* ! defined (HAVE_SHM) */
 #endif /* ! defined (CANNOT_DUMP) */

+       -./emacs -q -batch -f list-load-path-shadows

 
 /* We run make-docfile twice because the command line may get too long
    on some systems.  */
 
 /* We run make-docfile twice because the command line may get too long
    on some systems.  */


@@ -686,7 +829,7 @@ emacs: temacs ${etc}DOC ${lisp}
 ${etc}DOC: ${libsrc}make-docfile ${obj} ${lisp}
        -rm -f ${etc}DOC
        ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC
 ${etc}DOC: ${libsrc}make-docfile ${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} ${SOME_MACHINE_LISP} ${lisp}
+       ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp}

 
 ${libsrc}make-docfile:
        cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile
 
 ${libsrc}make-docfile:
        cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile


@@ -696,13 +839,16 @@ ${libsrc}make-docfile:
 #define MAKE_PARALLEL
 #endif
 
 #define MAKE_PARALLEL
 #endif
 

-temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) $(OLDXMENU) ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args
+temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args

        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
 
        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
 

+/* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
+   often contain options that have to do with using Emacs's crt0,
+   which are only good with temacs.  */

 prefix-args: prefix-args.c $(config_h)
 prefix-args: prefix-args.c $(config_h)

-       $(CC) $(ALL_CFLAGS) ${srcdir}/prefix-args.c -o prefix-args
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args

 
 /* These are needed for C compilation, on the systems that need them */
 #ifdef NEED_CPP
 
 /* These are needed for C compilation, on the systems that need them */
 #ifdef NEED_CPP


@@ -723,11 +869,6 @@ localcpp:
 CPP = $(CC) -E
 #endif /* ! defined (NEED_CPP) */
 
 CPP = $(CC) -E
 #endif /* ! defined (NEED_CPP) */
 

-#ifdef SHORTNAMES
-shortnames:
-       cd ${shortnamesdir}; ${MAKE} ${MFLAGS}
-#endif
-

 /* Don't lose if this was not defined.  */
 #ifndef OLDXMENU_OPTIONS
 #define OLDXMENU_OPTIONS
 /* Don't lose if this was not defined.  */
 #ifndef OLDXMENU_OPTIONS
 #define OLDXMENU_OPTIONS


@@ -738,8 +879,17 @@ shortnames:
 #define LWLIB_OPTIONS
 #endif
 
 #define LWLIB_OPTIONS
 #endif
 

-#ifdef HAVE_X_WINDOWS
-#ifdef HAVE_X11
+#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
+
+/* We use stamp-xmenu with these two deps
+   to both ensure that lwlib gets remade based on its dependencies
+   in its own makefile,
+   and remake temacs if lwlib gets changed by this.  */
+stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) 
+       touch stamp-oldxmenu
+/* Supply an ordering for parallel make.  */
+../src/$(OLDXMENU): ${OLDXMENU}
+

 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib
 
 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib
 


@@ -763,7 +913,6 @@ really-lwlib:
        @true  /* make -t should not create really-lwlib.  */
 .PHONY: really-lwlib
 #else /* not USE_X_TOOLKIT */
        @true  /* make -t should not create really-lwlib.  */
 .PHONY: really-lwlib
 #else /* not USE_X_TOOLKIT */

-#ifdef HAVE_X_MENU

 $(OLDXMENU): really-oldXMenu
 
 /* Encode the values of these two macros in Make variables,
 $(OLDXMENU): really-oldXMenu
 
 /* Encode the values of these two macros in Make variables,


@@ -785,19 +934,22 @@ really-oldXMenu:
     "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
        @true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
     "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
        @true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu

-#endif /* HAVE_X_MENU */

 #endif /* not USE_X_TOOLKIT */
 #endif /* not USE_X_TOOLKIT */

-#endif /* HAVE_X11 */
-#endif /* HAVE_X_WINDOWS */
+#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
+
+/* We don't really need this, but satisfy the dependency.  */
+stamp-oldxmenu:
+       touch stamp-oldxmenu
+#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */

 
 

-paths.h: paths.h.in
-       @echo "The file paths.h needs to be set up from paths.h.in."
-       @echo "Consult the file \`INSTALL' for instructions for building Emacs."
+../config.status:: paths.in
+       @echo "The file paths.h needs to be set up from paths.in."
+       @echo "Please run the `configure' script again."

        exit 1
 
        exit 1
 

-config.h: config.h.in
-       @echo "The file config.h needs to be set up from config.h.in."
-       @echo "Consult the file \`INSTALL' for instructions for building Emacs."
+../config.status:: config.in
+       @echo "The file config.h needs to be set up from config.in."
+       @echo "Please run the `configure' script again."

        exit 1
 
 /* Some machines have alloca built-in.
        exit 1
 
 /* Some machines have alloca built-in.


@@ -841,118 +993,138 @@ 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.  */
 
    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) 
+abbrev.o: abbrev.c buffer.h window.h commands.h $(config_h)

 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \

-   INTERVAL_SRC blockinput.h $(config_h) 
+   INTERVAL_SRC blockinput.h charset.h $(config_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) \
 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) \

-       process.h systty.h syssignal.h
-casefiddle.o: casefiddle.c syntax.h commands.h buffer.h $(config_h) 
+       process.h systty.h syssignal.h charset.h coding.h msdos.h
+casefiddle.o: casefiddle.c syntax.h commands.h buffer.h $(config_h)

 casetab.o: casetab.c buffer.h $(config_h)
 casetab.o: casetab.c buffer.h $(config_h)

+category.o: category.c category.h buffer.h charset.h $(config_h)
+ccl.o: ccl.c ccl.h charset.h coding.h $(config_h)
+charset.o: charset.c charset.h buffer.h coding.h disptab.h $(config_h)
+coding.o: coding.c coding.h buffer.h charset.h $(config_h)

 cm.o: cm.c cm.h termhooks.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) 
+cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) \
+       msdos.h

 pre-crt0.o: pre-crt0.c
 ecrt0.o: ecrt0.c $(config_h)
        CRT0_COMPILE ${srcdir}/ecrt0.c
 pre-crt0.o: pre-crt0.c
 ecrt0.o: ecrt0.c $(config_h)
        CRT0_COMPILE ${srcdir}/ecrt0.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) charset.h coding.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 \
    termchar.h termopts.h termhooks.h cm.h disptab.h systty.h systime.h \

-   xterm.h $(config_h)
+   xterm.h blockinput.h charset.h msdos.h $(config_h)

 doc.o: doc.c $(config_h) paths.h buffer.h keyboard.h
 doc.o: doc.c $(config_h) paths.h buffer.h keyboard.h

-doprnt.o: doprnt.c $(config_h)
+doprnt.o: doprnt.c charset.h $(config_h)

 dosfns.o: buffer.h termchar.h termhooks.h frame.h msdos.h dosfns.h $(config_h)
 dosfns.o: buffer.h termchar.h termhooks.h frame.h msdos.h dosfns.h $(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) 
+editfns.o: editfns.c window.h buffer.h systime.h INTERVAL_SRC charset.h \
+   $(config_h)
+emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
+   buffer.h INTERVAL_SRC $(config_h)
+fileio.o: fileio.c window.h buffer.h systime.h INTERVAL_SRC charset.h \
+   coding.h msdos.h $(config_h)

 filelock.o: filelock.c buffer.h paths.h $(config_h)
 filemode.o: filemode.c  $(config_h)
 filelock.o: filelock.c buffer.h paths.h $(config_h)
 filemode.o: filemode.c  $(config_h)

+frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
+   buffer.h charset.h fontset.h msdos.h $(config_h)
+fontset.o: fontset.h fontset.c ccl.h charset.h frame.h $(config_h)

 getloadavg.o: getloadavg.c $(config_h)
 indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.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 region-cache.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 \
+   termopts.h disptab.h region-cache.h charset.h
+insdel.o: insdel.c window.h buffer.h INTERVAL_SRC blockinput.h charset.h\
+   $(config_h)
+keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h charset.h \

    commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.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 xterm.h $(config_h)
+   systty.h systime.h dispextern.h syntax.h intervals.h blockinput.h \
+   xterm.h puresize.h msdos.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) 
+   puresize.h charset.h $(config_h)

 lastfile.o: lastfile.c  $(config_h)
 macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h $(config_h)
 malloc.o: malloc.c $(config_h)
 lastfile.o: lastfile.c  $(config_h)
 macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h $(config_h)
 malloc.o: malloc.c $(config_h)

-msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h \
-   termopts.h frame.h window.h $(config_h)
-mktime.o: mktime.c $(config_h)

 gmalloc.o: gmalloc.c $(config_h)
 ralloc.o: ralloc.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) 
+vm-limit.o: vm-limit.c mem-limits.h $(config_h)
+marker.o: marker.c buffer.h charset.h $(config_h)

 minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h \
 minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h \

-   buffer.h commands.h $(config_h) 
+   buffer.h commands.h charset.h msdos.h $(config_h)
+mktime.o: mktime.c $(config_h)

 mocklisp.o: mocklisp.c buffer.h $(config_h)
 mocklisp.o: mocklisp.c buffer.h $(config_h)

+msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h \
+   termopts.h frame.h window.h $(config_h)

 process.o: process.c process.h buffer.h window.h termhooks.h termopts.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 
+   commands.h syssignal.h systime.h systty.h syswait.h frame.h \
+   blockinput.h charset.h coding.h msdos.h $(config_h)
+regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h charset.h

 region-cache.o: region-cache.c buffer.h region-cache.h
 region-cache.o: region-cache.c buffer.h region-cache.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 dispextern.h frame.h $(config_h)
+scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h $(config_h)

 search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
 search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \

-   blockinput.h $(config_h) 
+   blockinput.h category.h charset.h $(config_h)

 strftime.o: strftime.c $(config_h)
 strftime.o: strftime.c $(config_h)

-       $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -Dstrftime=emacs_strftime $<
-syntax.o: syntax.c syntax.h buffer.h commands.h $(config_h) 
+syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.h \
+   $(config_h)

 sysdep.o: sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.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
+   frame.h syssignal.h systty.h systime.h syswait.h blockinput.h window.h \
+   msdos.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 keyboard.h
+   disptab.h keyboard.h charset.h coding.h msdos.h

 termcap.o: termcap.c $(config_h)
 terminfo.o: terminfo.c $(config_h)
 tparam.o: tparam.c $(config_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) 
+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)
 /* 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)
+w16select.o: w16select.c lisp.h dispextern.h frame.h blockinput.h \
+   msdos.h $(config_h)
+widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
+   ../lwlib/lwlib.h $(config_h)

 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.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 \
-   termchar.h frame.h window.h disptab.h termhooks.h $(config_h) 
+   termhooks.h disptab.h keyboard.h dispextern.h msdos.h $(config_h)
+xdisp.o: xdisp.c macros.h commands.h indent.h buffer.h dispextern.h coding.h \
+   termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \
+   msdos.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 \
-   blockinput.h paths.h $(config_h)
-xmenu.o: xmenu.c xterm.h window.h dispextern.h frame.h keyboard.h \
-   blockinput.h puresize.h msdos.h $(config_h)
+   window.h charset.h msdos.h $(config_h)
+xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h\
+   ../lwlib/lwlib.h blockinput.h paths.h charset.h $(config_h)
+xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h keyboard.h \
+   ../lwlib/lwlib.h blockinput.h msdos.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 \
 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 \

-  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)
+  keyboard.h gnu.h sink.h sinkmask.h charset.h ccl.h fontset.h $(config_h)
+xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \
+  coding.h buffer.h $(config_h)
+xrdb.o: xrdb.c $(config_h) paths.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 keyboard.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 keyboard.h \

- blockinput.h $(config_h) INTERVAL_SRC
-bytecode.o: bytecode.c buffer.h $(config_h)
-data.o: data.c buffer.h puresize.h syssignal.h keyboard.h $(config_h)
+ blockinput.h charset.h $(config_h) INTERVAL_SRC
+bytecode.o: bytecode.c buffer.h syntax.h $(config_h)
+data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h $(config_h)

 eval.o: eval.c commands.h keyboard.h blockinput.h $(config_h)
 floatfns.o: floatfns.c $(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 keyboard.h $(config_h)
-lread.o: lread.c commands.h keyboard.h buffer.h paths.h $(config_h) \
- termhooks.h
+fns.o: fns.c commands.h $(config_h) frame.h buffer.h keyboard.h \
+ frame.h window.h INTERVAL_SRC
+print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h\
+   $(config_h) dispextern.h msdos.h
+lread.o: lread.c commands.h keyboard.h buffer.h paths.h charset.h $(config_h) \
+ termhooks.h msdos.h

 
 /* Text properties support */
 
 /* Text properties support */

-textprop.o: textprop.c buffer.h intervals.h $(config_h)
+textprop.o: textprop.c buffer.h window.h intervals.h $(config_h)

 intervals.o: intervals.c buffer.h intervals.h keyboard.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.  */
 
 intervals.o: intervals.c buffer.h intervals.h keyboard.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 window.h $(config_h)

 
 ${libsrc}emacstool: ${libsrc}emacstool.c
        cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
 
 ${libsrc}emacstool: ${libsrc}emacstool.c
        cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool


@@ -964,7 +1136,7 @@ clean: mostlyclean
 /**/# This is used in making a distribution.
 /**/# Do not use it on development directories!
 distclean: clean
 /**/# This is used in making a distribution.
 /**/# Do not use it on development directories!
 distclean: clean

-       rm -f paths.h config.h Makefile Makefile.in ../etc/DOC-*
+       rm -f paths.h config.h Makefile Makefile.c ../etc/DOC-*

 maintainer-clean: distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 maintainer-clean: distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."


@@ -976,8 +1148,8 @@ extraclean: distclean
 
 /* The rule for the [sm] files has to be written a little funny to
    avoid looking like a C comment to CPP. */
 
 /* The rule for the [sm] files has to be written a little funny to
    avoid looking like a C comment to CPP. */

-SOURCES = *.[ch] [sm]/?* COPYING ymakefile \
-       config.h.in README COPYING ChangeLog vms.pp-trans
+SOURCES = *.[ch] [sm]/?* COPYING Makefile.in \
+       config.in paths.in README COPYING ChangeLog vms.pp-trans

 unlock:
        chmod u+w $(SOURCES)
 
 unlock:
        chmod u+w $(SOURCES)
 


@@ -985,14 +1157,16 @@ relock:
        chmod -w $(SOURCES)
        chmod +w paths.h
 
        chmod -w $(SOURCES)
        chmod +w paths.h
 

-/* Arrange to make a tags table in ../lisp, and another in this dir
-   which includes ../lisp/TAGS by reference.  */
+/* Arrange to make a tags table TAGS-LISP for ../lisp,
+   plus TAGS for the C files, which includes ../lisp/TAGS by reference.  */

 ctagsfiles = [a-zA-Z]*.[hc]
 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 \
-       --regex='/[     ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' $(ctagsfiles)
-../lisp/TAGS: $(lisptagsfiles)
-       cd ../lisp; $(MAKE) TAGS
-tags: TAGS ../lisp/TAGS
+TAGS: $(srcdir)/$(ctagsfiles)
+       ../lib-src/etags --include=TAGS-LISP \
+         --regex='/[   ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
+         $(srcdir)/$(ctagsfiles)
+frc:
+TAGS-LISP: frc
+       $(MAKE) -f ${lispsource}Makefile TAGS-LISP ETAGS=../lib-src/etags \
+           lispsource=${lispsource}
+tags: TAGS TAGS-LISP

 .PHONY: tags
 .PHONY: tags