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.
# ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */
-CPPFLAGS=
-LDFLAGS=
C_SWITCH_SYSTEM=
/* just to be sure the sh is used */
#endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */
#endif /* LD_SWITCH_SYSTEM */
+/* 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
+/* 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
#ifdef HAVE_MENUS
/* Include xmenu.o in the list of X object files. */
-XOBJ= xterm.o xfns.o xfaces.o xselect.o xrdb.o fontset.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;
/* 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 fontset.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o
LIBXMENU=
#endif /* not HAVE_MENUS */
LIBW= -lXaw
#endif
#ifdef MOTIF
+#ifdef HAVE_MOTIF_2_1
+#define LIB_MOTIF_EXTRA -lXp
+#else
+#define LIB_MOTIF_EXTRA
+#endif
#ifdef LIB_MOTIF
-LIBW= LIB_MOTIF
+LIBW= LIB_MOTIF LIB_MOTIF_EXTRA
#else
-LIBW= -lXm
+LIBW= -lXm LIB_MOTIF_EXTRA
#endif
#endif
#ifdef OPEN_LOOK
#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 Makefile can redefine to munge the
flags before they're passed to LD. This is helpful if you have
#ifdef HAVE_X_WINDOWS
#define MSDOS_OBJ dosfns.o msdos.o
#else
-#define MSDOS_OBJ dosfns.o msdos.o xfaces.o w16select.o
+#define MSDOS_OBJ dosfns.o msdos.o w16select.o
#endif
#else
#define MSDOS_OBJ
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 $(XOBJ) \
+ 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 \
These go in the DOC file on all machines
in case they are needed there. */
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o intervals.o textprop.o \
- xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o
+ xterm.o xfns.o xmenu.o xselect.o xrdb.o
#ifdef TERMINFO
otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj)
#ifdef HAVE_FACES
-#define FACE_SUPPORT ${lispsource}faces.elc ${lispsource}facemenu.elc
+#define FACE_SUPPORT ${lispsource}facemenu.elc
#else
#define FACE_SUPPORT
#endif
be present, like site-load.el and site-init.el; this makefile
expects them all to be either present or buildable.
- Always update shortlisp as well as this variable. */
+ Files which are loaded unconditionally should be in shortlisp as well.
+ Files included conditionally here should be included (unconditionally)
+ in SOME_MACHINE_LISP. */
lisp= \
${lispsource}abbrev.elc \
${lispsource}buff-menu.elc \
${lispsource}byte-run.elc \
- ${lispsource}cus-start.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}fill.elc \
${lispsource}format.elc \
FACE_SUPPORT \
MOUSE_SUPPORT \
${lispsource}help.elc \
${lispsource}indent.elc \
${lispsource}isearch.elc \
- ${lispsource}lisp-mode.elc \
- ${lispsource}lisp.elc \
${lispsource}loadup.el \
${lispsource}loaddefs.el \
+ ${lispsource}bindings.el \
${lispsource}map-ynp.elc \
${lispsource}menu-bar.elc \
- ${lispsource}mule.elc \
- ${lispsource}mule-conf.el \
- ${lispsource}mule-cmds.elc \
- ${lispsource}characters.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/devanagari.elc \
${lispsource}language/tibetan.elc \
${lispsource}language/vietnamese.elc \
${lispsource}language/misc-lang.elc \
- ${lispsource}page.elc \
- ${lispsource}paragraphs.elc \
${lispsource}paths.el \
${lispsource}register.elc \
${lispsource}replace.elc \
${lispsource}simple.elc \
${lispsource}startup.elc \
${lispsource}subr.elc \
- ${lispsource}text-mode.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 \
+ ${lispsource}widget.elc \
${lispsource}window.elc \
${lispsource}version.el
../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/fill.elc \
../lisp/format.elc \
../lisp/help.elc \
../lisp/indent.elc \
../lisp/isearch.elc \
- ../lisp/lisp-mode.elc \
- ../lisp/lisp.elc \
../lisp/loadup.el \
../lisp/loaddefs.el \
+ ../lisp/bindings.el \
../lisp/map-ynp.elc \
- ../lisp/mule.elc \
- ../lisp/mule-conf.el \
- ../lisp/mule-cmds.elc \
- ../lisp/characters.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/devanagari.elc \
../lisp/language/tibetan.elc \
../lisp/language/vietnamese.elc \
../lisp/language/misc-lang.elc \
- ../lisp/page.elc \
- ../lisp/paragraphs.elc \
../lisp/paths.el \
../lisp/register.elc \
../lisp/replace.elc \
../lisp/simple.elc \
../lisp/startup.elc \
../lisp/subr.elc \
- ../lisp/text-mode.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
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/faces.elc ${dotdot}/lisp/facemenu.elc \
+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 \
./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. */
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
@true /* make -t should not create really-oldXMenu. */
.PHONY: really-oldXMenu
#endif /* not USE_X_TOOLKIT */
-#endif /* HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS */
+#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) */
../config.status:: paths.in
@echo "The file paths.h needs to be set up from paths.in."
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
+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 \
xterm.h blockinput.h charset.h $(config_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 \
- 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 $(config_h)
keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
puresize.h charset.h $(config_h)
lastfile.o: lastfile.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)
+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 $(config_h)
mktime.o: mktime.c $(config_h)
search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \
blockinput.h category.h charset.h $(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 category.h charset.h \
$(config_h)
sysdep.o: sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.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 puresize.h msdos.h $(config_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 \
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 \
- $(config_h)
-xrdb.o: xrdb.c $(config_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 \
- blockinput.h $(config_h) INTERVAL_SRC
+ 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)
$$DIR/../lib-src/etags --include=../lisp/TAGS \
--regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' $(ctagsfiles)
${lispsource}TAGS: ${lispsource}$(lisptagsfiles)
- cd ${lispsource}; $(MAKE) TAGS
+ export DIR; DIR=`pwd`; cd ${lispsource}; \
+ $(MAKE) TAGS ETAGS=$$DIR/../lib-src/etags
tags: TAGS ${lispsource}TAGS
.PHONY: tags
HCoop / bpt / emacs.git / blobdiff