# 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 ccp processing using autoconf facilities,
+# Don't try to replace the cpp processing using autoconf facilities,
# says rms.
# Here are the things that we expect ../configure to edit.
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 LD_SWITCH_SYSTEM_TEMACS
#endif
+/* Some s/SYSTEM.h files define this to request special switches
+ for compiling temacs. */
+#ifndef C_SWITCH_SYSTEM_TEMACS
+#define C_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
/* 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 $(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}
+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 C_SWITCH_SYSTEM_TEMACS ${CFLAGS}
.c.o:
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
#ifdef HAVE_MENUS
/* Include xmenu.o in the list of X object files. */
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
/* The X Menu stuff is present in the X10 distribution, but missing
from X11. If we have X10, just use the installed library;
/* 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 xselect.o xrdb.o fontset.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
LIBXMENU=
#endif /* not HAVE_MENUS */
#endif /* not LIBXT_STATIC */
#else /* not USE_X_TOOLKIT */
+#ifdef HAVE_X_SM
+LIBXT=-lSM -lICE
+#else
LIBXT=
+#endif
#endif /* not USE_X_TOOLKIT */
#if HAVE_XPM
#endif
#endif
+#ifdef HAVE_CARBON
+XMENU_OBJ =
+MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o
+emacsapp = ../mac/Emacs.app/
+#else
+XMENU_OBJ = xmenu.o
+#endif
/* 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 xmenu.o window.o \
+obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) 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 \
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 md5.o \
- $(MSDOS_OBJ)
+ $(MSDOS_OBJ) $(MAC_OBJ)
/* 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 dosfns.o msdos.o \
- xterm.o xfns.o xmenu.o xselect.o xrdb.o
+ xterm.o xfns.o xmenu.o xselect.o xrdb.o \
+ mac.o macterm.o macfns.o macmenu.o
#ifdef 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 */
#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}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/ucs-tables.elc \
${lispsource}international/utf-8.elc \
${lispsource}international/latin-1.el \
${lispsource}international/latin-2.el \
${lispsource}language/chinese.elc \
${lispsource}language/cyrillic.elc \
${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/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/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/ucs-tables.elc \
../lisp/international/utf-8.elc \
../lisp/international/latin-1.el \
../lisp/international/latin-2.el \
../lisp/language/chinese.elc \
../lisp/language/cyrillic.elc \
../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/misc-lang.el \
+ ../lisp/language/utf-8-lang.el \
+ ../lisp/language/georgian.el \
../lisp/menu-bar.elc \
../lisp/paths.el \
../lisp/register.elc \
../lisp/startup.elc \
../lisp/subr.elc \
../lisp/term/tty-colors.elc \
+ ../lisp/font-core.elc \
../lisp/textmodes/fill.elc \
../lisp/textmodes/page.elc \
../lisp/textmodes/paragraphs.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. */
+ for the sake of systems which can\'t handle large ones. */
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 \
#endif /* not USE_X_TOOLKIT */
#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
-/* We don't really need this, but satisfy the dependency. */
+/* We don\'t really need this, but satisfy the dependency. */
stamp-oldxmenu:
touch stamp-oldxmenu
#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
dispextern.h $(INTERVAL_SRC) blockinput.h atimer.h systime.h charset.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 \
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 \
CRT0_COMPILE ${srcdir}/ecrt0.c
dired.o: dired.c commands.h buffer.h $(config_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 \
+dispnew.o: dispnew.c systty.h systime.h commands.h process.h frame.h \
+ window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \
+ disptab.h \
xterm.h blockinput.h atimer.h charset.h msdos.h composite.h keyboard.h \
$(config_h)
doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h charset.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 dispextern.h $(config_h)
-fontset.o: dispextern.h fontset.h fontset.c ccl.h charset.h frame.h \
+fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.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 \
minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.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)
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 \
keyboard.h $(config_h)
strftime.o: strftime.c $(config_h)
syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.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 atimer.h \
- window.h msdos.h dosfns.h keyboard.h
+sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \
+ process.h dispextern.h termhooks.h termchar.h termopts.h \
+ frame.h atimer.h window.h msdos.h dosfns.h keyboard.h $(config_h)
term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
disptab.h dispextern.h keyboard.h charset.h coding.h ccl.h msdos.h
termcap.o: termcap.c $(config_h)
window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.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 \
+xdisp.o: xdisp.c macros.h commands.h process.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 fontset.h
xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.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 \
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 atimer.h systime.h msdos.h \
- $(config_h)
-xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
+xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.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 charset.h ccl.h fontset.h composite.h \
- coding.h $(config_h)
-xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \
- coding.h ccl.h buffer.h atimer.h systime.h $(config_h)
+ coding.h process.h $(config_h)
+xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \
+ charset.h coding.h ccl.h buffer.h atimer.h systime.h $(config_h)
xrdb.o: xrdb.c $(config_h) epaths.h
+xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h lisp.h termhooks.h
hftctl.o: hftctl.c $(config_h)
sound.o: sound.c dispextern.h $(config_h)
atimer.o: atimer.c atimer.h systime.h $(config_h)
/* The files of Lisp proper */
-alloc.o: alloc.c frame.h window.h buffer.h puresize.h syssignal.h keyboard.h \
+alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h keyboard.h \
blockinput.h atimer.h systime.h charset.h dispextern.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)
print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.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
+ termhooks.h coding.h msdos.h
/* Text properties support */
textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \
sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h)
+#ifdef HAVE_CARBON
+abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
+ fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \
+ scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \
+ xterm.o xselect.o sound.o: macgui.h
+mac.o: mac.c process.h sysselect.h systime.h $(config_h)
+macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \
+ dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \
+ atimer.h systime.h epaths.h termhooks.h coding.h ccl.h systime.h $(config_h)
+macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \
+ keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h)
+macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \
+ frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \
+ termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \
+ process.h coding.h $(config_h)
+
+macosx-app: ${emacsapp}Contents/MacOS/Emacs \
+ ${emacsapp}Contents/Resources/Emacs.rsrc
+
+${emacsapp}Contents/MacOS/Emacs: emacs
+ if [ -d ${emacsapp}Contents/MacOS/ ]; then true; else \
+ mkdir ${emacsapp}Contents/MacOS/; \
+ fi
+ cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs Emacs
+
+${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
+ /Developer/Tools/Rez -useDF -o \
+ ${emacsapp}Contents/Resources/Emacs.rsrc \
+ /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r \
+ ../mac/src/Emacs.r
+#endif
+
${libsrc}emacstool: ${libsrc}emacstool.c
cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
+bootstrapclean:
+ rm -f bootstrap-emacs
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."
$(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
frc:
TAGS-LISP: frc
- $(MAKE) -f ${lispsource}Makefile TAGS-LISP ETAGS=../lib-src/etags
+ $(MAKE) -f ${lispdir}Makefile TAGS-LISP ETAGS=../lib-src/etags
$(lwlibdir)TAGS:
(cd $(lwlibdir); $(MAKE) -f $(lwlibdir)Makefile tags ETAGS=../lib-src/etags)
bootstrap: bootstrap-emacs
-/* Build a temacs with a sufficiently large PURESIZE to load the
- Lisp files from loadup.el in source form. */
-
-bootstrap-temacs:
- 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-doc
+bootstrap-emacs: temacs
#ifdef CANNOT_DUMP
ln temacs bootstrap-emacs
#else
#endif /* ! defined (HAVE_SHM) */
#endif /* ! defined (CANNOT_DUMP) */
mv -f emacs bootstrap-emacs
- rm -f temacs