diff options
| author | Kim F. Storm | 2004-03-11 00:29:25 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-03-11 00:29:25 +0000 |
| commit | 3cdbfa1922db604de878b77c38620739d2e2a023 (patch) | |
| tree | e675cc5e63c53427a30092e7ed70263e4898e412 /src | |
| parent | 175ca1f4cb9eec4a02066fef6d285045ef586564 (diff) | |
| download | emacs-3cdbfa1922db604de878b77c38620739d2e2a023.tar.gz emacs-3cdbfa1922db604de878b77c38620739d2e2a023.zip | |
Image consolidation:
(XOBJ, MAC_OBJ): Add image.o.
(image.o): Add dependencies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ecf59f87b59..5eebc10fb6d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -334,7 +334,7 @@ LIBXMENU= -lXMenu | |||
| 334 | 334 | ||
| 335 | /* Otherwise, omit xmenu.o from the list of X object files, and | 335 | /* Otherwise, omit xmenu.o from the list of X object files, and |
| 336 | don't worry about the menu library at all. */ | 336 | don't worry about the menu library at all. */ |
| 337 | XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o | 337 | XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o |
| 338 | LIBXMENU= | 338 | LIBXMENU= |
| 339 | #endif /* not HAVE_MENUS */ | 339 | #endif /* not HAVE_MENUS */ |
| 340 | 340 | ||
| @@ -562,7 +562,7 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o | |||
| 562 | #ifdef HAVE_CARBON | 562 | #ifdef HAVE_CARBON |
| 563 | mac = $(dot)$(dot)/mac/ | 563 | mac = $(dot)$(dot)/mac/ |
| 564 | XMENU_OBJ = | 564 | XMENU_OBJ = |
| 565 | MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o | 565 | MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o |
| 566 | emacsapp = $(PWD)/$(mac)Emacs.app/ | 566 | emacsapp = $(PWD)/$(mac)Emacs.app/ |
| 567 | emacsappsrc = ${srcdir}/../mac/Emacs.app/ | 567 | emacsappsrc = ${srcdir}/../mac/Emacs.app/ |
| 568 | #else | 568 | #else |
| @@ -1079,6 +1079,8 @@ fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) | |||
| 1079 | fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ | 1079 | fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ |
| 1080 | keyboard.h $(config_h) | 1080 | keyboard.h $(config_h) |
| 1081 | getloadavg.o: getloadavg.c $(config_h) | 1081 | getloadavg.o: getloadavg.c $(config_h) |
| 1082 | image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ | ||
| 1083 | systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h) | ||
| 1082 | indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ | 1084 | indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ |
| 1083 | termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \ | 1085 | termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \ |
| 1084 | keyboard.h | 1086 | keyboard.h |