Mercurial > emacs
comparison src/Makefile.in @ 90159:08185296b491
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 272-288)
- src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 67)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 05 May 2005 00:04:55 +0000 |
parents | e1fbb019c538 5d27eef91c1e |
children | 3e2ec732efd4 |
comparison
equal
deleted
inserted
replaced
90158:bf4846baba9a | 90159:08185296b491 |
---|---|
568 CYGWIN_OBJ = sheap.o | 568 CYGWIN_OBJ = sheap.o |
569 #endif | 569 #endif |
570 | 570 |
571 #ifdef HAVE_CARBON | 571 #ifdef HAVE_CARBON |
572 mac = $(dot)$(dot)/mac/ | 572 mac = $(dot)$(dot)/mac/ |
573 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o | 573 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o |
574 emacsapp = $(PWD)/$(mac)Emacs.app/ | 574 emacsapp = $(PWD)/$(mac)Emacs.app/ |
575 emacsappsrc = ${srcdir}/../mac/Emacs.app/ | 575 emacsappsrc = ${srcdir}/../mac/Emacs.app/ |
576 #endif | 576 #endif |
577 | 577 |
578 /* lastfile must follow all files | 578 /* lastfile must follow all files |
595 /* Object files used on some machine or other. | 595 /* Object files used on some machine or other. |
596 These go in the DOC file on all machines | 596 These go in the DOC file on all machines |
597 in case they are needed there. */ | 597 in case they are needed there. */ |
598 SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \ | 598 SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \ |
599 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ | 599 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ |
600 mac.o macterm.o macfns.o macmenu.o fontset.o \ | 600 mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ |
601 w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ | 601 w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ |
602 w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o | 602 w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o |
603 | 603 |
604 | 604 |
605 #ifdef TERMINFO | 605 #ifdef TERMINFO |
1228 abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \ | 1228 abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \ |
1229 fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \ | 1229 fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \ |
1230 scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \ | 1230 scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \ |
1231 xterm.o xselect.o sound.o: macgui.h | 1231 xterm.o xselect.o sound.o: macgui.h |
1232 mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \ | 1232 mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \ |
1233 coding.h $(config_h) | 1233 coding.h ccl.h $(config_h) |
1234 macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \ | 1234 macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \ |
1235 dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \ | 1235 dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \ |
1236 atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h) | 1236 atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h) |
1237 macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \ | 1237 macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \ |
1238 keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) | 1238 keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) |
1239 macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ | 1239 macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ |
1240 frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ | 1240 frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ |
1241 termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ | 1241 termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ |
1242 process.h coding.h $(config_h) | 1242 process.h coding.h $(config_h) |
1243 macselect.o: blockinput.h macterm.h macgui.h frame.h $(config_h) | |
1243 | 1244 |
1244 ${emacsapp}Contents/Resources/English.lproj: | 1245 ${emacsapp}Contents/Resources/English.lproj: |
1245 mkdir -p $@ | 1246 mkdir -p $@ |
1246 | 1247 |
1247 ifneq (${emacsapp},${emacsappsrc}) | 1248 ifneq (${emacsapp},${emacsappsrc}) |