diff options
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 80 |
1 files changed, 27 insertions, 53 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 217e9846e2..f968fcf459 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -76,12 +76,6 @@ SHELL=/bin/sh #define NOT_C_CODE #include "config.h" -/* We will not really call alloca; - do not let the file name alloca.c get messed up. */ -#ifdef alloca -#undef alloca -#endif - /* Do not let the file name mktime.c get messed up. */ #ifdef mktime #undef mktime @@ -613,7 +607,7 @@ FONTOBJ = font.o whose initialized data areas should be dumped as pure by dump-emacs. */ obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o character.o chartab.o \ - cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\ + cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ)\ emacs.o keyboard.o macros.o keymap.o sysdep.o \ buffer.o filelock.o insdel.o marker.o \ minibuf.o fileio.o dired.o filemode.o \ @@ -668,12 +662,6 @@ mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o #endif /* SYSTEM_MALLOC */ -#ifndef HAVE_ALLOCA -allocaobj = alloca.o -#else -allocaobj = -#endif - #ifdef USE_X_TOOLKIT widgetobj= widget.o #else /* not USE_X_TOOLKIT */ @@ -685,9 +673,9 @@ widgetobj= should not be told about. */ #ifdef CYGWIN /* Cygwin differs because of its unexec(). */ -otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(allocaobj) $(widgetobj) $(LIBOBJS) +otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(widgetobj) $(LIBOBJS) #else -otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBOBJS) +otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) #endif #ifdef HAVE_MOUSE @@ -946,7 +934,9 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \ ${dotdot}/lisp/x-dnd.elc \ ${dotdot}/lisp/international/ccl.elc \ ${dotdot}/lisp/international/codepage.elc \ - ${dotdot}/lisp/international/fontset.elc + ${dotdot}/lisp/international/fontset.elc \ + ${dotdot}/lisp/mouse.elc \ + ${dotdot}/lisp/term/x-win.elc /* Construct full set of libraries to be linked. Note that SunOS needs -lm to come before -lc; otherwise, you get @@ -1106,12 +1096,6 @@ stamp-oldxmenu: @echo "Please run the `configure' script again." exit 1 -/* Some machines have alloca built-in. - They should define HAVE_ALLOCA. - Some use the C version in alloca.c (these define C_ALLOCA in config.h). - */ -alloca.o: alloca.c blockinput.h atimer.h systime.h - /* Nearly all the following files depend on lisp.h, but it is not included as a dependency because it is so often changed in ways that do not require any recompilation @@ -1126,7 +1110,7 @@ callint.o: callint.c window.h commands.h buffer.h keymap.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 character.h coding.h ccl.h msdos.h \ - composite.h w32.h blockinput.h atimer.h systime.h + composite.h w32.h blockinput.h atimer.h systime.h frame.h termhooks.h casefiddle.o: casefiddle.c syntax.h commands.h buffer.h character.h \ composite.h \ charset.h keymap.h $(config_h) @@ -1140,8 +1124,8 @@ charset.o: charset.c charset.h character.h buffer.h coding.h composite.h \ disptab.h $(config_h) chartab.o: charset.h character.h $(config.h) coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h intervals.h composite.h \ - window.h dispextern.h $(config_h) -cm.o: cm.c cm.h termhooks.h $(config_h) + window.h dispextern.h frame.h termhooks.h $(config_h) +cm.o: cm.c frame.h cm.h termhooks.h termchar.h $(config_h) cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h $(config_h) \ msdos.h dispextern.h keyboard.h keymap.h pre-crt0.o: pre-crt0.c @@ -1171,13 +1155,13 @@ filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \ filemode.o: filemode.c $(config_h) frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ blockinput.h atimer.h systime.h buffer.h character.h fontset.h \ - msdos.h dosfns.h dispextern.h w32term.h macterm.h $(config_h) -fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) + msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h) +fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhook.h $(config_h) font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ font.h $(config_h) ftfont.o: dispextern.h frame.h character.h charset.h font.h $(config_h) fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \ - charset.h frame.h keyboard.h $(FONTSRC) $(config_h) + charset.h frame.h keyboard.h termhooks.h $(FONTSRC) $(config_h) getloadavg.o: getloadavg.c $(config_h) image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h) @@ -1188,7 +1172,7 @@ insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h character.h \ dispextern.h atimer.h systime.h region-cache.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 \ + systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \ atimer.h xterm.h puresize.h msdos.h keymap.h w32term.h macterm.h $(config_h) keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ atimer.h systime.h puresize.h character.h intervals.h keymap.h window.h \ @@ -1203,7 +1187,8 @@ vm-limit.o: vm-limit.c mem-limits.h $(config_h) marker.o: marker.c buffer.h character.h $(config_h) md5.o: md5.c md5.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 $(INTERVAL_SRC) keymap.h $(config_h) + buffer.h commands.h character.h msdos.h $(INTERVAL_SRC) keymap.h \ + terhooks.h $(config_h) mktime.o: mktime.c $(config_h) msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \ @@ -1216,7 +1201,7 @@ 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 $(config_h) scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \ - $(config_h) + termhooks.h $(config_h) search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \ blockinput.h atimer.h systime.h category.h character.h charset.h \ composite.h $(INTERVAL_SRC) \ @@ -1226,11 +1211,13 @@ syntax.o: syntax.c syntax.h buffer.h commands.h category.h character.h \ composite.h keymap.h regex.h $(INTERVAL_SRC) $(config_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) + frame.h atimer.h window.h msdos.h dosfns.h keyboard.h cm.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 character.h charset.h coding.h ccl.h \ msdos.h window.h keymap.h blockinput.h atimer.h systime.h termcap.o: termcap.c $(config_h) +terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \ + keyboard.h $(config_h) terminfo.o: terminfo.c $(config_h) tparam.o: tparam.c $(config_h) undo.o: undo.c buffer.h commands.h window.h $(config_h) @@ -1243,7 +1230,7 @@ w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \ widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \ $(srcdir)/../lwlib/lwlib.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 dispextern.h msdos.h composite.h \ + disptab.h keyboard.h dispextern.h msdos.h composite.h \ keymap.h blockinput.h atimer.h systime.h $(INTERVAL_SRC) \ xterm.h w32term.h macterm.h $(config_h) xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \ @@ -1254,11 +1241,11 @@ xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \ xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \ systime.h keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) \ - $(FONTSRC) $(config_h) + termchar.h termhooks.h $(FONTSRC) $(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 gtkutil.h $(config_h) termhooks.h \ - fontset.h $(FONTSRC) + fontset.h termchar.h $(FONTSRC) xfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ font.h $(config_h) xftfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ @@ -1273,7 +1260,7 @@ xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ keyboard.h gnu.h character.h charset.h ccl.h fontset.h composite.h \ coding.h process.h gtkutil.h $(FONTSRC) $(config_h) xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \ - buffer.h atimer.h systime.h $(config_h) + buffer.h atimer.h systime.h termhooks.h $(config_h) xrdb.o: xrdb.c $(config_h) epaths.h xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \ lisp.h termopts.h @@ -1293,13 +1280,13 @@ alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h key bytecode.o: bytecode.c buffer.h syntax.h character.h window.h dispextern.h \ frame.h xterm.h $(config_h) data.o: data.c buffer.h puresize.h character.h syssignal.h keyboard.h frame.h \ - $(config_h) + termhooks.h $(config_h) eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \ dispextern.h $(config_h) floatfns.o: floatfns.c $(config_h) fns.o: fns.c commands.h $(config_h) frame.h buffer.h character.h keyboard.h \ keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \ - blockinput.h atimer.h systime.h xterm.h + blockinput.h atimer.h systime.h xterm.h termhooks.h print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \ $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \ blockinput.h atimer.h systime.h @@ -1318,12 +1305,12 @@ composite.o: composite.c buffer.h character.h $(INTERVAL_SRC) $(config_h) OTHER_FILES and OBJECTS_MACHINE select which of these should be compiled. */ -sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h) +sunfns.o: sunfns.c buffer.h window.h dispextern.h termhooks.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 \ + scroll.o sysdep.o term.o terminal.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 blockinput.h atimer.h systime.h charset.h \ coding.h ccl.h $(config_h) @@ -1364,8 +1351,6 @@ ${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT} cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT} #endif -${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c - cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool${EXEEXT} bootstrapclean: rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} mostlyclean: @@ -1391,17 +1376,6 @@ versionclean: extraclean: distclean -rm -f *~ \#* m/?*~ s/?*~ -/* The rule for the [sm] files has to be written a little funny to - avoid looking like a C comment to CPP. */ -SOURCES = *.[ch] [sm]/?* COPYING Makefile.in \ - config.in epaths.in README COPYING ChangeLog vms.pp-trans -unlock: - chmod u+w $(SOURCES) - -relock: - chmod -w $(SOURCES) - chmod +w epaths.h - /* Arrange to make a tags table TAGS-LISP for ../lisp, plus TAGS for the C files, which includes ../lisp/TAGS by reference. */ |