# Makefile for GNU Emacs.
-# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001
+# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
+
+# Note that this file is edited by msdos/sed1v2.inp for MSDOS. That
+# script may need modifying in sync with changes made here. Try to
+# avoid shell-ism because the DOS build has to use the DOS shell.
+
+# Don't try to replace the cpp processing using autoconf facilities,
+# says rms.
+
# Here are the things that we expect ../configure to edit.
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
srcdir=@srcdir@
# Substitute an assignment for the MAKE variable, because
# BSD doesn't have it as a default.
@SET_MAKE@
-LIBS = @LIBS@
+# Don't use LIBS. configure puts stuff in it that either shouldn't be
+# linked with Emacs or is duplicated by the cpp stuff below.
+# LIBS = @LIBS@
+LIBOBJS = @LIBOBJS@
# On Xenix and the IBM RS6000, double-dot gets screwed up.
dot = .
etc = $(dot)$(dot)/etc/
oldXMenudir = $(dot)$(dot)/oldXMenu/
lwlibdir = $(dot)$(dot)/lwlib/
+lispdir = $(dot)$(dot)/lisp/
# Configuration files for .o files to depend on.
M_FILE = ${srcdir}/@machfile@
/* 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
+#ifndef GNU_LINUX
#define ORDINARY_LINK
#endif
#endif
#define C_SWITCH_ASM
#endif
-/* Figure out whether the system cpp can handle long names.
- Do it by testing it right now.
- If it loses, arrange to use the GNU cpp. */
-
-#define LONGNAMEBBBFOOX
-#ifdef LONGNAMEBBBARFOOX
-/* Installed cpp fails to distinguish those names! */
-/* Arrange to compile the GNU cpp later on */
-#define NEED_CPP
-/* Cause cc to invoke the cpp that comes with Emacs,
- which will be in a file named localcpp. */
-MYCPPFLAG= -Blocal
-/* LOCALCPP is the local one or nothing.
- CPP is the local one or the standard one. */
-LOCALCPP= localcpp
-#endif /* ! defined (LONGNAMEBBBARFOOX) */
-
#ifdef USE_X_TOOLKIT
#define USE_@X_TOOLKIT_TYPE@
TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@
/* LD_SWITCH_X_DEFAULT comes after everything else that specifies
options for where to find X libraries, but before those libraries. */
X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM LIBXPM LIBTIFF LIBJPEG LIBPNG LIBGIF
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM 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 */
#endif /* not HAVE_X_WINDOWS */
+LIBSOUND= @LIBSOUND@
+
#ifndef ORDINARY_LINK
/* Fix linking if compiled with GCC. */
#ifdef __GNUC__
INTERVAL_SRC = intervals.h composite.h
-#ifdef HAVE_GETLOADAVG
-#define GETLOADAVG_OBJ
-#else
-#define GETLOADAVG_OBJ getloadavg.o
-#endif
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
#ifdef MSDOS
#ifdef HAVE_X_WINDOWS
-#define MSDOS_OBJ dosfns.o msdos.o
+MSDOS_OBJ = dosfns.o msdos.o
#else
-#define MSDOS_OBJ dosfns.o msdos.o w16select.o
+MSDOS_OBJ = dosfns.o msdos.o w16select.o
#endif
-#else
-#define MSDOS_OBJ
#endif
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\
+ character.o chartab.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 \
cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
alloc.o data.o doc.o editfns.o callint.o \
eval.o floatfns.o fns.o print.o lread.o \
- abbrev.o syntax.o UNEXEC mocklisp.o bytecode.o \
+ abbrev.o syntax.o UNEXEC bytecode.o \
process.o callproc.o \
region-cache.o sound.o atimer.o \
- doprnt.o strftime.o intervals.o textprop.o composite.o \
- @LIBOBJS@ MSDOS_OBJ
+ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
+ $(MSDOS_OBJ)
/* Object files used on some machine or other.
These go in the DOC file on all machines
#define LIBS_TERMCAP
termcapobj = termcap.o tparam.o
#else /* LIBS_TERMCAP */
-# ifdef TERMCAP_OBJ
-termcapobj = TERMCAP_OBJ
-# else
termcapobj = tparam.o
-# endif /* not TERMCAP_OBJ */
#endif /* LIBS_TERMCAP */
#endif /* ! defined (TERMINFO) */
#ifndef SYSTEM_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) */
+#ifndef DOUG_LEA_MALLOC
+gmallocobj = gmalloc.o
+#endif
+
#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) */
-#endif /* ! defined (DOUG_LEA_MALLOC) */
+rallocobj = ralloc.o
+#endif
+
+mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o
#endif /* SYSTEM_MALLOC */
/* define otherobj as list of object files that make-docfile
should not be told about. */
-otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
+otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS)
#ifdef HAVE_MOUSE
#define MOUSE_SUPPORT ${lispsource}mouse.elc \
#ifdef MSDOS
#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
- ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc
+ ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \
+ ${lispsource}international/ccl.elc ${lispsource}international/codepage.elc
+
#else
#define MSDOS_SUPPORT
#endif
#ifdef WINDOWSNT
-#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}w32-fns.elc \
- ${lispsource}dos-w32.elc
+#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
+ ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \
+ ${lispsource}w32-fns.elc
#else
#define WINNT_SUPPORT
#endif
lisp= \
${lispsource}abbrev.elc \
${lispsource}buff-menu.elc \
+ ${lispsource}button.elc \
${lispsource}byte-run.elc \
- ${lispsource}cus-start.el \
+ ${lispsource}cus-start.elc \
${lispsource}custom.elc \
+ ${lispsource}emacs-lisp/backquote.elc \
${lispsource}emacs-lisp/lisp-mode.elc \
${lispsource}emacs-lisp/lisp.elc \
+ ${lispsource}env.elc \
${lispsource}faces.elc \
${lispsource}files.elc \
${lispsource}format.elc \
${lispsource}isearch.elc \
${lispsource}loadup.el \
${lispsource}loaddefs.el \
- ${lispsource}bindings.el \
+ ${lispsource}bindings.elc \
${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}international/latin-1.el \
+ ${lispsource}international/latin-2.el \
+ ${lispsource}international/latin-3.el \
+ ${lispsource}international/latin-4.el \
+ ${lispsource}international/latin-5.el \
+ ${lispsource}international/latin-8.el \
+ ${lispsource}international/latin-9.el \
${lispsource}case-table.elc \
${lispsource}language/chinese.elc \
- ${lispsource}language/cyrillic.elc \
+ ${lispsource}language/cyrillic.el \
${lispsource}language/indian.elc \
- ${lispsource}language/devanagari.elc \
- ${lispsource}language/english.elc \
+ ${lispsource}language/devanagari.el \
+ ${lispsource}language/english.el \
${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/czech.el \
+ ${lispsource}language/slovak.el \
+ ${lispsource}language/romanian.el \
+ ${lispsource}language/greek.el \
+ ${lispsource}language/hebrew.el \
+ ${lispsource}language/japanese.el \
+ ${lispsource}language/korean.el \
+ ${lispsource}language/lao.el \
+ ${lispsource}language/thai.el \
${lispsource}language/tibetan.elc \
- ${lispsource}language/vietnamese.elc \
- ${lispsource}language/misc-lang.elc \
+ ${lispsource}language/vietnamese.el \
+ ${lispsource}language/misc-lang.el \
+ ${lispsource}language/utf-8-lang.el \
+ ${lispsource}language/georgian.el \
${lispsource}paths.el \
${lispsource}register.elc \
${lispsource}replace.elc \
shortlisp= \
../lisp/abbrev.elc \
../lisp/buff-menu.elc \
+ ../lisp/button.elc \
../lisp/byte-run.elc \
- ../lisp/cus-start.el \
+ ../lisp/cus-start.elc \
../lisp/custom.elc \
+ ../lisp/emacs-lisp/backquote.elc \
../lisp/emacs-lisp/lisp-mode.elc \
../lisp/emacs-lisp/lisp.elc \
../lisp/facemenu.elc \
../lisp/isearch.elc \
../lisp/loadup.el \
../lisp/loaddefs.el \
- ../lisp/bindings.el \
+ ../lisp/bindings.elc \
../lisp/map-ynp.elc \
+ ../lisp/env.elc \
../lisp/international/mule.elc \
../lisp/international/mule-conf.el \
../lisp/international/mule-cmds.elc \
../lisp/international/characters.elc \
+ ../lisp/international/latin-1.el \
+ ../lisp/international/latin-2.el \
+ ../lisp/international/latin-3.el \
+ ../lisp/international/latin-4.el \
+ ../lisp/international/latin-5.el \
+ ../lisp/international/latin-8.el \
+ ../lisp/international/latin-9.el \
../lisp/case-table.elc \
../lisp/language/chinese.elc \
- ../lisp/language/cyrillic.elc \
+ ../lisp/language/cyrillic.el \
../lisp/language/indian.elc \
- ../lisp/language/devanagari.elc \
- ../lisp/language/english.elc \
+ ../lisp/language/devanagari.el \
+ ../lisp/language/english.el \
../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/czech.el \
+ ../lisp/language/slovak.el \
+ ../lisp/language/romanian.el \
+ ../lisp/language/greek.el \
+ ../lisp/language/hebrew.el \
+ ../lisp/language/japanese.el \
+ ../lisp/language/korean.el \
+ ../lisp/language/lao.el \
+ ../lisp/language/thai.el \
../lisp/language/tibetan.elc \
- ../lisp/language/vietnamese.elc \
- ../lisp/language/misc-lang.elc \
+ ../lisp/language/vietnamese.el \
+ ../lisp/language/misc-lang.el \
+ ../lisp/language/utf-8-lang.el \
+ ../lisp/language/georgian.el \
+ ../lisp/menu-bar.elc \
../lisp/paths.el \
../lisp/register.elc \
../lisp/replace.elc \
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/menu-bar.elc ${dotdot}/lisp/mouse.elc \
+SOME_MACHINE_LISP = ${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
+ ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
+ ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
+ ${dotdot}/lisp/international/ccl.elc \
+ ${dotdot}/lisp/international/codepage.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. */
-LIBES = $(LOADLIBES) $(LIBS) $(LIBX) LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
- LIBS_DEBUG $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
+LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \
+ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
+ LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \
+ $(GNULIB_VAR)
/* Enable recompilation of certain other files depending on system type. */
for the first time, this prevents any variation between configurations
in the contents of the DOC file.
Likewise for ${SOME_MACHINE_LISP}. */
-${etc}DOC: ${libsrc}make-docfile ${obj} ${lisp}
+${etc}DOC: ${libsrc}make-docfile ${obj} ${shortlisp} ${SOME_MACHINE_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} ${shortlisp}
prefix-args: prefix-args.c $(config_h)
$(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
-CPP = ./localcpp
-localcpp:
- cd ${cppdir}; ${MAKE} ${MFLAGS} EMACS=-DEMACS
- ln ${cppdir}cpp localcpp /* Name where ALL_CFLAGS will refer to it */
-/* cc appears to be cretinous and require all of these to exist
- if -B is specified -- we can't use one local pass and let the
- others be the standard ones. What a loser.
- We can't 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) */
-
/* Don't lose if this was not defined. */
#ifndef OLDXMENU_OPTIONS
#define OLDXMENU_OPTIONS
whenever emacs was #defined, but that's not appropriate for all
users of alloca in Emacs. Check out ../lib-src/getopt.c. */
alloca.o : alloca.c
- $(CC) -c $(CPPFLAGS) -Dfree=xfree -Dmalloc=xmalloc \
+ $(CC) -c $(CPPFLAGS) -DEMACS_FREE=xfree \
$(ALL_CFLAGS) ${srcdir}/alloca.c
#else
#ifndef HAVE_ALLOCA
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 window.h commands.h charset.h $(config_h)
+abbrev.o: abbrev.c buffer.h window.h dispextern.h commands.h character.h \
+ $(config_h)
buffer.o: buffer.c buffer.h region-cache.h commands.h window.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)
+ dispextern.h $(INTERVAL_SRC) blockinput.h atimer.h systime.h character.h \
+ $(config_h)
+callint.o: callint.c window.h commands.h buffer.h \
+ keyboard.h dispextern.h $(config_h)
callproc.o: callproc.c epaths.h buffer.h commands.h $(config_h) \
- process.h systty.h syssignal.h charset.h coding.h ccl.h msdos.h
-casefiddle.o: casefiddle.c syntax.h commands.h buffer.h composite.h $(config_h)
+ process.h systty.h syssignal.h character.h coding.h ccl.h msdos.h \
+ composite.h
+casefiddle.o: casefiddle.c syntax.h commands.h buffer.h character.h \
+ composite.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 ccl.h buffer.h charset.h $(config_h)
+category.o: category.c category.h buffer.h charset.h character.h $(config_h)
+ccl.o: ccl.c ccl.h charset.h character.h coding.h $(config_h)
+character.o: character.c character.h buffer.h charset.h composite.h disptab.h \
+ $(config.h)
+charset.o: charset.c charset.h character.h buffer.h coding.h composite.h \
+ disptab.h $(config_h)
+chartab.o: character.h $(config.h)
+coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h composite.h \
+ $(config_h)
cm.o: cm.c cm.h termhooks.h $(config_h)
-cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) \
- msdos.h
+cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h $(config_h) \
+ msdos.h dispextern.h
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) charset.h coding.h regex.h \
- systime.h
+dired.o: dired.c commands.h buffer.h $(config_h) character.h charset.h \
+ coding.h regex.h systime.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 \
- xterm.h blockinput.h charset.h msdos.h composite.h $(config_h)
-doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h charset.h
-doprnt.o: doprnt.c charset.h $(config_h)
+ xterm.h blockinput.h atimer.h character.h msdos.h composite.h keyboard.h \
+ $(config_h)
+doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h character.h
+doprnt.o: doprnt.c character.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) charset.h \
- coding.h $(config_h)
+editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \
+ coding.h dispextern.h $(config_h)
emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
- termhooks.h buffer.h $(INTERVAL_SRC) $(config_h)
-fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \
- coding.h ccl.h msdos.h $(config_h)
-filelock.o: filelock.c buffer.h systime.h epaths.h $(config_h)
+ termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h)
+fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \
+ coding.h ccl.h msdos.h dispextern.h $(config_h)
+filelock.o: filelock.c buffer.h charset.h coding.h systime.h epaths.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 dosfns.h $(config_h)
-fontset.o: dispextern.h fontset.h fontset.c ccl.h charset.h frame.h $(config_h)
+ buffer.h character.h fontset.h msdos.h dosfns.h dispextern.h $(config_h)
+fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \
+ charset.h frame.h keyboard.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 \
- termopts.h disptab.h region-cache.h charset.h composite.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 \
+ termopts.h disptab.h region-cache.h character.h category.h composite.h \
+ dispextern.h keyboard.h
+insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h character.h \
+ dispextern.h atimer.h systime.h $(config_h)
+keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
systty.h systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \
- xterm.h puresize.h msdos.h $(config_h)
+ atimer.h xterm.h puresize.h msdos.h $(config_h)
keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
- puresize.h charset.h $(config_h)
+ atimer.h systime.h puresize.h character.h charset.h intervals.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)
+macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h \
+ dispextern.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 charset.h $(config_h)
-minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h \
- buffer.h commands.h charset.h msdos.h $(config_h)
+marker.o: marker.c buffer.h character.h $(config_h)
+minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \
+ buffer.h commands.h character.h msdos.h $(config_h)
mktime.o: mktime.c $(config_h)
-mocklisp.o: mocklisp.c buffer.h $(config_h)
msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \
- termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h $(config_h)
+ termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \
+ keyboard.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 \
- blockinput.h charset.h coding.h ccl.h msdos.h composite.h $(config_h)
-regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h charset.h
+ commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \
+ blockinput.h atimer.h character.h coding.h ccl.h msdos.h composite.h \
+ keyboard.h $(config_h)
+regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h character.h \
+ charset.h
region-cache.o: region-cache.c buffer.h region-cache.h
-scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h $(config_h)
+scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \
+ $(config_h)
search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
- blockinput.h category.h charset.h composite.h $(config_h)
+ blockinput.h atimer.h systime.h category.h character.h composite.h \
+ $(config_h)
strftime.o: strftime.c $(config_h)
-syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.h \
+syntax.o: syntax.c syntax.h buffer.h commands.h category.h character.h \
composite.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 \
- msdos.h dosfns.h
+ frame.h syssignal.h systty.h systime.h syswait.h blockinput.h atimer.h \
+ window.h msdos.h dosfns.h keyboard.h
term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
- disptab.h keyboard.h charset.h coding.h ccl.h msdos.h
+ disptab.h dispextern.h keyboard.h character.h charset.h coding.h ccl.h \
+ msdos.h
termcap.o: termcap.c $(config_h)
terminfo.o: terminfo.c $(config_h)
tparam.o: tparam.c $(config_h)
of UNEXEC when substituting it in. */
UNEXEC_ALIAS=UNEXEC
$(UNEXEC_ALIAS): UNEXEC_SRC $(config_h)
-w16select.o: w16select.c dispextern.h frame.h blockinput.h \
+w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \
msdos.h $(config_h)
widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
$(srcdir)/../lwlib/lwlib.h $(config_h)
termhooks.h disptab.h keyboard.h dispextern.h msdos.h composite.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 composite.h
+ termchar.h frame.h window.h disptab.h termhooks.h character.h charset.h \
+ $(config_h) msdos.h composite.h fontset.h
xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
- window.h charset.h msdos.h dosfns.h composite.h $(config_h)
-xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h\
- $(srcdir)/../lwlib/lwlib.h blockinput.h epaths.h charset.h $(config_h)
-xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h keyboard.h \
- $(srcdir)/../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 \
- keyboard.h gnu.h sink.h sinkmask.h charset.h ccl.h fontset.h composite.h \
- $(config_h)
-xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \
- coding.h ccl.h buffer.h $(config_h)
+ window.h character.h msdos.h dosfns.h composite.h atimer.h systime.h \
+ fontset.h $(config_h)
+xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
+ $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
+ character.h charset.h coding.h $(config_h)
+xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \
+ charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \
+ systime.h msdos.h $(config_h)
+xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
+ dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
+ keyboard.h gnu.h character.h charset.h ccl.h fontset.h composite.h \
+ coding.h $(config_h)
+xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h character.h \
+ coding.h composite.h ccl.h buffer.h atimer.h systime.h $(config_h)
xrdb.o: xrdb.c $(config_h) epaths.h
hftctl.o: hftctl.c $(config_h)
sound.o: sound.c dispextern.h $(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 charset.h $(config_h) $(INTERVAL_SRC)
-bytecode.o: bytecode.c buffer.h syntax.h charset.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)
+ blockinput.h atimer.h systime.h character.h dispextern.h $(config_h) \
+ $(INTERVAL_SRC)
+bytecode.o: bytecode.c buffer.h syntax.h character.h $(config_h)
+data.o: data.c buffer.h puresize.h character.h syssignal.h keyboard.h \
+ $(config_h)
+eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \
+ $(config_h)
floatfns.o: floatfns.c $(config_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\
+fns.o: fns.c commands.h $(config_h) frame.h buffer.h character.h keyboard.h \
+ frame.h window.h dispextern.h coding.h $(INTERVAL_SRC)
+print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \
$(config_h) dispextern.h msdos.h composite.h
-lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h $(config_h) \
- termhooks.h msdos.h
+lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \
+ charset.h $(config_h) termhooks.h msdos.h
/* Text properties support */
-textprop.o: textprop.c buffer.h window.h $(INTERVAL_SRC) $(config_h)
+textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \
+ $(config_h)
intervals.o: intervals.c buffer.h $(INTERVAL_SRC) keyboard.h puresize.h $(config_h)
-composite.o: composite.c buffer.h charset.h $(INTERVAL_SRC) $(config_h)
+composite.o: composite.c buffer.h character.h $(INTERVAL_SRC) $(config_h)
/* System-specific programs to be made.
OTHER_FILES and OBJECTS_MACHINE
select which of these should be compiled. */
-sunfns.o: sunfns.c buffer.h window.h $(config_h)
+sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h)
${libsrc}emacstool: ${libsrc}emacstool.c
cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
mostlyclean:
rm -f temacs prefix-args core *.core \#* *.o libXMenu11.a liblw.a
rm -f ../etc/DOC
+ rm -f bootstrap-emacs
clean: mostlyclean
- rm -f emacs-* emacs bootstrap-emacs
+ rm -f emacs-* emacs
/**/# This is used in making a distribution.
/**/# Do not use it on development directories!
distclean: clean
rm -f epaths.h config.h Makefile Makefile.c config.stamp stamp-oldxmenu ../etc/DOC-*
+ mv ./.gdbinit ./.gdbinit.save
+ if test -f "${srcdir}/.gdbinit"; then rm -f ./.gdbinit.save; \
+ else mv ./.gdbinit.save ./.gdbinit; fi
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
/* Arrange to make a tags table TAGS-LISP for ../lisp,
plus TAGS for the C files, which includes ../lisp/TAGS by reference. */
+
ctagsfiles1 = [xyzXYZ]*.[hc]
ctagsfiles2 = [a-wA-W]*.[hc]
-TAGS: $(srcdir)/$(ctagsfiles)
+
+TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
../lib-src/etags --include=TAGS-LISP --include=${lwlibdir}/TAGS \
--regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \
$(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
frc:
TAGS-LISP: frc
- $(MAKE) -f ${lispsource}Makefile TAGS-LISP ETAGS=../lib-src/etags \
- lispsource=${lispsource}
-tags: TAGS TAGS-LISP
+ $(MAKE) -f ${lispdir}Makefile TAGS-LISP ETAGS=../lib-src/etags
+
+$(lwlibdir)TAGS:
+ (cd $(lwlibdir); $(MAKE) -f $(lwlibdir)Makefile tags ETAGS=../lib-src/etags)
+
+tags: TAGS TAGS-LISP $(lwlibdir)TAGS
.PHONY: tags
Lisp files from loadup.el in source form. */
bootstrap-temacs:
- LC_ALL=C $(MAKE) $(MFLAGS) temacs ALL_CFLAGS="$(ALL_CFLAGS) -DPURESIZE=5000000"
+ LC_ALL=C $(MAKE) $(MFLAGS) temacs ALL_CFLAGS="$(ALL_CFLAGS) -DPURESIZE=5000000 -I../src"
+
+/* Build a DOC file. */
+
+bootstrap-doc: ${libsrc}make-docfile
+ -rm -f ${etc}DOC
+ els=`echo ${shortlisp} ${SOME_MACHINE_LISP} \
+ | sed -e "s/\\.elc/.el/g"`; \
+ ${libsrc}make-docfile -d ${srcdir} $$els ${obj} > ${etc}DOC
/* Dump an Emacs executable named bootstrap-emacs containing the
files from loadup.el in source form. */
-bootstrap-emacs: bootstrap-temacs
+bootstrap-emacs: bootstrap-temacs bootstrap-doc
#ifdef CANNOT_DUMP
ln temacs bootstrap-emacs
#else
HCoop / bpt / emacs.git / blobdiff