Mercurial > emacs
diff src/Makefile.in @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 21 Mar 2007 13:33:07 +0000 |
| parents | 2f8e5c845704 61e085a71af3 |
| children | 31beec9ee600 |
line wrap: on
line diff
--- a/src/Makefile.in Sun Mar 18 14:12:38 2007 +0000 +++ b/src/Makefile.in Wed Mar 21 13:33:07 2007 +0000 @@ -1092,7 +1092,7 @@ 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 +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 @@ -1130,7 +1130,7 @@ ecrt0.o: ecrt0.c $(config_h) CRT0_COMPILE ${srcdir}/ecrt0.c dired.o: dired.c commands.h buffer.h $(config_h) character.h charset.h \ - coding.h regex.h systime.h blockinput.h + coding.h regex.h systime.h blockinput.h atimer.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 indent.h intervals.h \ @@ -1139,14 +1139,15 @@ doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h character.h doprnt.o: doprnt.c character.h $(config_h) dosfns.o: buffer.h termchar.h termhooks.h frame.h blockinput.h window.h \ - msdos.h dosfns.h dispextern.h charset.h coding.h $(config_h) + msdos.h dosfns.h dispextern.h charset.h coding.h atimer.h systime.h \ + $(config_h) editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \ - coding.h dispextern.h frame.h blockinput.h $(config_h) + coding.h dispextern.h frame.h blockinput.h atimer.h $(config_h) emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \ termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \ window.h dispextern.h keyboard.h keymap.h fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \ - coding.h msdos.h dispextern.h blockinput.h $(config_h) + coding.h msdos.h dispextern.h blockinput.h atimer.h $(config_h) filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \ epaths.h $(config_h) filemode.o: filemode.c $(config_h) @@ -1188,7 +1189,7 @@ 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 \ - keyboard.h intervals.h buffer.h commands.h blockinput.h $(config_h) + keyboard.h intervals.h buffer.h commands.h blockinput.h atimer.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 dispextern.h \ blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \ @@ -1210,7 +1211,7 @@ 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 character.h charset.h coding.h ccl.h \ - msdos.h window.h keymap.h + msdos.h window.h keymap.h blockinput.h atimer.h systime.h termcap.o: termcap.c $(config_h) terminfo.o: terminfo.c $(config_h) tparam.o: tparam.c $(config_h) @@ -1225,15 +1226,16 @@ $(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 \ - keymap.h blockinput.h $(INTERVAL_SRC) xterm.h w32term.h macterm.h $(config_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 \ coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h \ - charset.h keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h w32term.h \ - macterm.h $(config_h) msdos.h composite.h fontset.h blockinput.h atimer.h \ + charset.h $(config_h) keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h \ + w32term.h macterm.h msdos.h composite.h fontset.h blockinput.h atimer.h \ systime.h keymap.h $(FONTSRC) 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) \ + systime.h keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) \ $(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 \ @@ -1258,7 +1260,8 @@ xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \ lisp.h termopts.h gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \ - blockinput.h window.h atimer.h termhooks.h keyboard.h charset.h coding.h + blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \ + charset.h coding.h hftctl.o: hftctl.c $(config_h) sound.o: sound.c dispextern.h $(config_h) @@ -1278,11 +1281,13 @@ 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 xterm.h + blockinput.h atimer.h systime.h xterm.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 + $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \ + blockinput.h atimer.h systime.h lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \ - charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h + charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h \ + blockinput.h atimer.h systime.h /* Text properties support */ textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \ @@ -1306,14 +1311,15 @@ coding.h ccl.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 systime.h $(config_h) + atimer.h systime.h epaths.h termhooks.h coding.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) -macselect.o: blockinput.h macterm.h macgui.h frame.h keymap.h $(config_h) +macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \ + keymap.h $(config_h) ${emacsapp}Contents/Resources/English.lproj: mkdir -p $@
