#define NOT_C_CODE
#include "config.h"
+/* We won't really call alloca;
+ don't let the file name alloca.c get messed up. */
+#ifdef alloca
+#undef alloca
+#endif
+
/* Use HAVE_X11 as an alias for X11 in this file
to avoid problems with X11 as a subdirectory name
in -I and other such options which pass through this file. */
#define LD_SWITCH_X_SITE
#endif
+#ifndef LD_SWITCH_X_DEFAULT
+#define LD_SWITCH_X_DEFAULT
+#endif
+
/* These can be passed in from config.h to define special load and
compile switches needed by individual sites */
#ifndef LD_SWITCH_SITE
otherwise, use our own copy. */
#ifdef HAVE_X11
#ifdef USE_X_TOOLKIT
-OLDXMENU=liblw.a
+OLDXMENU=${lwlibdir}liblw.a
LIBXMENU= $(OLDXMENU)
#else /* not USE_X_TOOLKIT */
-OLDXMENU= libXMenu11.a
+OLDXMENU= ${oldXMenudir}libXMenu11.a
LIBXMENU= $(OLDXMENU)
#endif /* not USE_X_TOOLKIT */
#else /* not HAVE_X11 */
#endif
#ifdef HAVE_X11XTR6
+#ifdef NEED_LIBW
+LIBXTR6 = -lSM -lICE -lw
+#else
LIBXTR6 = -lSM -lICE
#endif
+#endif
-LIBXT= $(LIBW) -lXt $(LIBXTR6) -lXmu -lXext
+LIBXT= $(LIBW) -lXmu -lXt $(LIBXTR6) -lXext
#else
LIBXT=
#endif
#ifdef HAVE_X11
-LIBX= $(LIBXMENU) LD_SWITCH_X_SITE $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
+/* LD_SWITCH_X_DEFAULT comes after everything else that specifies
+ options for where to find X libraries, but before those libraries. */
+X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
#else /* not HAVE_X11 */
LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
#endif /* not HAVE_X11 */
#define GETLOADAVG_OBJ getloadavg.o
#endif
+#ifdef HAVE_MKTIME
+#define MKTIME_OBJ
+#else
+#define MKTIME_OBJ mktime.o
+#endif
+
+#ifdef MSDOS
+#ifdef HAVE_X_WINDOWS
+#define MSDOS_OBJ dosfns.o msdos.o
+#else
+#define MSDOS_OBJ dosfns.o msdos.o xfaces.o xmenu.o
+#endif
+#else
+#define MSDOS_OBJ
+#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 window.o \
- term.o cm.o $(XOBJ) \
+ cm.o term.o $(XOBJ) \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
buffer.o filelock.o insdel.o marker.o INTERVAL_OBJ \
minibuf.o fileio.o dired.o filemode.o \
eval.o floatfns.o fns.o print.o lread.o \
abbrev.o syntax.o UNEXEC mocklisp.o bytecode.o \
process.o callproc.o \
- doprnt.o GETLOADAVG_OBJ
+ region-cache.o \
+ doprnt.o strftime.o MKTIME_OBJ GETLOADAVG_OBJ MSDOS_OBJ
/* Object files used on some machine or other.
These go in the DOC file on all machines
#ifdef MULTI_FRAME
#define FRAME_SUPPORT ${lispdir}frame.elc ${lispdir}menu-bar.elc \
- ${lispdir}mouse.elc ${lispdir}select.elc ${lispdir}scroll-bar.elc
+ ${lispdir}mouse.elc ${lispdir}select.elc ${lispdir}scroll-bar.elc \
+ ${lispdir}faces.elc
#else
#define FRAME_SUPPORT
#endif
#endif
#ifdef MSDOS
-#define MSDOS_SUPPORT ${lispdir}ls-lisp.elc ${lispdir}disp-tab.elc ${lispdir}dos-fns.elc ${lispdir}mouse.elc
+#define MSDOS_SUPPORT ${lispdir}ls-lisp.elc ${lispdir}disp-tab.elc ${lispdir}dos-fns.elc ${lispdir}mouse.elc ${lispdir}faces.elc
#else
#define MSDOS_SUPPORT
#endif
#endif /* ! defined (HAVE_SHM) */
#endif /* ! defined (CANNOT_DUMP) */
+# We run make-docfile twice because the command line may get too long
+# on some systems.
${etc}DOC: ${libsrc}make-docfile ${obj} ${lisp}
-rm -f ${etc}DOC
- ${libsrc}make-docfile -d ${srcdir} ${obj} ${SOME_MACHINE_OBJECTS} \
- ${lisp} > ${etc}DOC
+ ${libsrc}make-docfile -d ${srcdir} ${obj} ${SOME_MACHINE_OBJECTS} > ${etc}DOC
+ ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${lisp}
${libsrc}make-docfile:
cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile
#ifdef HAVE_X11
#ifdef USE_X_TOOLKIT
$(OLDXMENU): really-lwlib
- -rm -f $(OLDXMENU) /* We might have a link to an old version. */
- ${LN_S} ${lwlibdir}liblw.a $(OLDXMENU)
/* Encode the values of these two macros in Make variables,
so we can use $(...) to substitute their values within "...". */
#else /* not USE_X_TOOLKIT */
#ifdef HAVE_X_MENU
$(OLDXMENU): really-oldXMenu
- -rm -f $(OLDXMENU) /* We might have a link to an old version. */
- ${LN_S} ${oldXMenudir}libXMenu11.a $(OLDXMENU)
/* Encode the values of these two macros in Make variables,
so we can use $(...) to substitute their values within "...". */
alloca.o : alloca.s $(config_h)
/* $(CPP) is cc -E, which may get confused by filenames
that do not end in .c. So copy file to a safe name. */
+ -rm -f allocatem.c
cp ${srcdir}/alloca.s allocatem.c
/* Remove any ^L, blank lines, and preprocessor comments,
since some assemblers barf on them. Use a different basename for the
/* Xenix, in particular, needs to run assembler via cc. */
$(CC) -c allocax.s
mv allocax.o alloca.o
- rm allocax.s allocatem.c
+ -rm -f allocax.s allocatem.c
#endif /* HAVE_ALLOCA */
#endif /* ! defined (C_ALLOCA) */
it is so often changed in ways that do not require any recompilation
and so rarely changed in ways that do require any. */
-abbrev.o : abbrev.c buffer.h commands.h $(config_h)
-buffer.o : buffer.c buffer.h commands.h window.h \
+abbrev.o: abbrev.c buffer.h commands.h $(config_h)
+buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
INTERVAL_SRC blockinput.h $(config_h)
-callint.o : callint.c window.h commands.h buffer.h mocklisp.h \
+callint.o: callint.c window.h commands.h buffer.h mocklisp.h \
keyboard.h $(config_h)
-callproc.o : callproc.c paths.h buffer.h commands.h $(config_h) \
+callproc.o: callproc.c paths.h buffer.h commands.h $(config_h) \
process.h systty.h syssignal.h
-casefiddle.o : casefiddle.c syntax.h commands.h buffer.h $(config_h)
-casetab.o : casetab.c buffer.h $(config_h)
-cm.o : cm.c cm.h termhooks.h $(config_h)
-cmds.o : cmds.c syntax.h buffer.h commands.h $(config_h)
-pre-crt0.o : pre-crt0.c
-crt0.o : crt0.c $(config_h)
+casefiddle.o: casefiddle.c syntax.h commands.h buffer.h $(config_h)
+casetab.o: casetab.c buffer.h $(config_h)
+cm.o: cm.c cm.h termhooks.h $(config_h)
+cmds.o: cmds.c syntax.h buffer.h commands.h window.h $(config_h)
+pre-crt0.o: pre-crt0.c
+crt0.o: crt0.c $(config_h)
CRT0_COMPILE ${srcdir}/crt0.c
-dired.o : dired.c commands.h buffer.h $(config_h) regex.h
-dispnew.o : dispnew.c commands.h frame.h window.h buffer.h dispextern.h \
+dired.o: dired.c commands.h buffer.h $(config_h) regex.h
+dispnew.o: dispnew.c commands.h frame.h window.h buffer.h dispextern.h \
termchar.h termopts.h termhooks.h cm.h disptab.h systty.h systime.h $(config_h)
-doc.o : doc.c $(config_h) paths.h buffer.h keyboard.h
-doprnt.o : doprnt.c
-editfns.o : editfns.c window.h buffer.h systime.h INTERVAL_SRC $(config_h)
-emacs.o : emacs.c commands.h systty.h syssignal.h process.h INTERVAL_SRC $(config_h)
-fileio.o : fileio.c window.h buffer.h systime.h INTERVAL_SRC $(config_h)
-filelock.o : filelock.c buffer.h paths.h $(config_h)
-filemode.o : filemode.c $(config_h)
-getloadavg.o : getloadavg.c $(config_h)
-indent.o : indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
- termopts.h disptab.h
-insdel.o : insdel.c window.h buffer.h INTERVAL_SRC blockinput.h $(config_h)
-keyboard.o : keyboard.c termchar.h termhooks.h termopts.h buffer.h \
+doc.o: doc.c $(config_h) paths.h buffer.h keyboard.h
+doprnt.o: doprnt.c $(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)
+filelock.o: filelock.c buffer.h paths.h $(config_h)
+filemode.o: filemode.c $(config_h)
+getloadavg.o: getloadavg.c $(config_h)
+indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
+ termopts.h disptab.h 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 \
commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
systty.h systime.h dispextern.h intervals.h blockinput.h $(config_h)
-keymap.o : keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
+keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
$(config_h)
-lastfile.o : lastfile.c $(config_h)
-macros.o : macros.c window.h buffer.h commands.h macros.h $(config_h)
-malloc.o : malloc.c $(config_h)
-gmalloc.o : gmalloc.c $(config_h)
-ralloc.o : ralloc.c $(config_h)
-vm-limit.o : vm-limit.c mem-limits.h $(config_h)
-marker.o : marker.c buffer.h $(config_h)
-minibuf.o : minibuf.c syntax.h dispextern.h frame.h window.h \
+lastfile.o: lastfile.c $(config_h)
+macros.o: macros.c window.h buffer.h commands.h macros.h $(config_h)
+malloc.o: malloc.c $(config_h)
+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)
+vm-limit.o: vm-limit.c mem-limits.h $(config_h)
+marker.o: marker.c buffer.h $(config_h)
+minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h \
buffer.h commands.h $(config_h)
-mocklisp.o : mocklisp.c buffer.h $(config_h)
-process.o : process.c process.h buffer.h window.h termhooks.h termopts.h \
+mocklisp.o: mocklisp.c buffer.h $(config_h)
+process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \
commands.h syssignal.h systime.h systty.h syswait.h frame.h $(config_h)
-regex.o : regex.c syntax.h buffer.h $(config_h) regex.h
-frame.o : frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
+regex.o: regex.c syntax.h buffer.h $(config_h) regex.h
+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 $(config_h) dispextern.h frame.h
-search.o : search.c regex.h commands.h buffer.h syntax.h blockinput.h $(config_h)
-syntax.o : syntax.c syntax.h buffer.h commands.h $(config_h)
-sysdep.o : sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.h \
+scroll.o: scroll.c termchar.h dispextern.h frame.h $(config_h)
+search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
+ blockinput.h $(config_h)
+strftime.o: strftime.c $(config_h)
+syntax.o: syntax.c syntax.h buffer.h commands.h $(config_h)
+sysdep.o: sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.h \
frame.h syssignal.h systty.h systime.h syswait.h blockinput.h window.h
-term.o : term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
+term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
disptab.h
-termcap.o : termcap.c $(config_h)
-terminfo.o : terminfo.c $(config_h)
-tparam.o : tparam.c $(config_h)
-undo.o : undo.c buffer.h commands.h $(config_h)
+termcap.o: termcap.c $(config_h)
+terminfo.o: terminfo.c $(config_h)
+tparam.o: tparam.c $(config_h)
+undo.o: undo.c buffer.h commands.h $(config_h)
/* This hack is to discard any space that cpp might put at the beginning
of UNEXEC when substituting it in. */
UNEXEC_ALIAS=UNEXEC
-$(UNEXEC_ALIAS) : UNEXEC_SRC $(config_h)
-widget.o : widget.c xterm.h frame.h dispextern.h widgetprv.h $(config_h)
-window.o : window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
+$(UNEXEC_ALIAS): UNEXEC_SRC $(config_h)
+widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h $(config_h)
+window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
termhooks.h disptab.h keyboard.h $(config_h)
-xdisp.o : xdisp.c macros.h commands.h indent.h buffer.h dispextern.h \
+xdisp.o: xdisp.c macros.h commands.h indent.h buffer.h dispextern.h \
termchar.h frame.h window.h disptab.h termhooks.h $(config_h)
-xfaces.o : xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
+xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
window.h $(config_h)
-xfns.o : xfns.c buffer.h frame.h window.h keyboard.h xterm.h \
- blockinput.h $(config_h)
-xmenu.o : xmenu.c xterm.h window.h frame.h keyboard.h blockinput.h $(config_h)
-xterm.o : xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
+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 $(config_h)
+xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
dispextern.h frame.h disptab.h blockinput.h systime.h syssignal.h \
- gnu.h sink.h sinkmask.h $(config_h)
-xselect.o : xselect.c dispextern.h frame.h xterm.h blockinput.h $(config_h)
-xrdb.o : xrdb.c $(config_h)
-hftctl.o : hftctl.c $(config_h)
+ keyboard.h gnu.h sink.h sinkmask.h $(config_h)
+xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h $(config_h)
+xrdb.o: xrdb.c $(config_h)
+hftctl.o: hftctl.c $(config_h)
/* The files of Lisp proper */
-alloc.o : alloc.c frame.h window.h buffer.h puresize.h syssignal.h
-alloc.o : blockinput.h $(config_h) INTERVAL_SRC
-bytecode.o : bytecode.c buffer.h $(config_h)
-data.o : data.c buffer.h puresize.h syssignal.h $(config_h)
-eval.o : eval.c commands.h keyboard.h blockinput.h $(config_h)
-floatfns.o : floatfns.c $(config_h)
-fns.o : fns.c commands.h $(config_h) frame.h buffer.h keyboard.h INTERVAL_SRC
-print.o : print.c process.h frame.h window.h buffer.h $(config_h)
-lread.o : lread.c commands.h keyboard.h buffer.h paths.h $(config_h) \
+alloc.o: alloc.c frame.h window.h buffer.h puresize.h syssignal.h
+alloc.o: blockinput.h $(config_h) INTERVAL_SRC
+bytecode.o: bytecode.c buffer.h $(config_h)
+data.o: data.c buffer.h puresize.h syssignal.h $(config_h)
+eval.o: eval.c commands.h keyboard.h blockinput.h $(config_h)
+floatfns.o: floatfns.c $(config_h)
+fns.o: fns.c commands.h $(config_h) frame.h buffer.h keyboard.h INTERVAL_SRC
+print.o: print.c process.h frame.h window.h buffer.h $(config_h)
+lread.o: lread.c commands.h keyboard.h buffer.h paths.h $(config_h) \
termhooks.h
/* Text properties support */
-textprop.o : textprop.c buffer.h intervals.h $(config_h)
-intervals.o : intervals.c buffer.h intervals.h puresize.h $(config_h)
+textprop.o: textprop.c buffer.h intervals.h $(config_h)
+intervals.o: intervals.c buffer.h intervals.h puresize.h $(config_h)
/* System-specific programs to be made.
OTHER_FILES, OBJECTS_SYSTEM and OBJECTS_MACHINE
select which of these should be compiled. */
-sunfns.o : sunfns.c buffer.h $(config_h)
+sunfns.o: sunfns.c buffer.h $(config_h)
${libsrc}emacstool: ${libsrc}emacstool.c
cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool
mostlyclean:
- rm -f temacs prefix-args xmakefile* core \#* *.o libXMenu11.a liblw.a
+ rm -f temacs prefix-args core \#* *.o libXMenu11.a liblw.a
rm -f ../etc/DOC
clean: mostlyclean
rm -f emacs-* emacs
/* Arrange to make a tags table in ../lisp, and another in this dir
which includes ../lisp/TAGS by reference. */
-ctagsfiles = [a-zA-Z]*.h [a-zA-Z]*.c
+ctagsfiles = [a-zA-Z]*.[hc]
lisptagsfiles = ../lisp/[a-zA-Z]*.el ../lisp/term/[a-zA-Z]*.el
TAGS: $(ctagsfiles)
../lib-src/etags --include=../lisp/TAGS $(ctagsfiles)
HCoop / bpt / emacs.git / blobdiff