# 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
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 \
#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 */
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/lisp-mode.elc \
${lispsource}emacs-lisp/lisp.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/utf-8.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/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/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/utf-8.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/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/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 \
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 \
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)
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 sink.h sinkmask.h charset.h ccl.h fontset.h composite.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)
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
-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
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-emacs: bootstrap-temacs bootstrap-doc
#ifdef CANNOT_DUMP
ln temacs bootstrap-emacs
#else
HCoop / bpt / emacs.git / blobdiff