Mercurial > emacs
comparison src/Makefile.in @ 54344:2f2226cb24b3
Image consolidation:
(XOBJ, MAC_OBJ): Add image.o.
(image.o): Add dependencies.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Thu, 11 Mar 2004 00:29:25 +0000 |
parents | 56a9e0fafeda |
children | 6240e31356bd |
comparison
equal
deleted
inserted
replaced
54343:02a264d3657d | 54344:2f2226cb24b3 |
---|---|
332 | 332 |
333 #else /* not HAVE_MENUS */ | 333 #else /* not HAVE_MENUS */ |
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 |
341 #ifdef USE_X_TOOLKIT | 341 #ifdef USE_X_TOOLKIT |
342 #define @X_TOOLKIT_TYPE@ | 342 #define @X_TOOLKIT_TYPE@ |
560 #endif | 560 #endif |
561 | 561 |
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 |
569 XMENU_OBJ = xmenu.o | 569 XMENU_OBJ = xmenu.o |
570 #endif | 570 #endif |
1077 msdos.h dosfns.h dispextern.h $(config_h) | 1077 msdos.h dosfns.h dispextern.h $(config_h) |
1078 fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) | 1078 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 |
1085 insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \ | 1087 insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \ |
1086 dispextern.h atimer.h systime.h $(config_h) | 1088 dispextern.h atimer.h systime.h $(config_h) |