Mercurial > emacs

comparison src/Makefile.in @ 94145:3af508d0bd74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1112
author Miles Bader <miles@gnu.org>
date Fri, 18 Apr 2008 02:56:45 +0000
parents 5b10e5646973 99f3f4865e9b
children dfdc13740582
comparison
equal deleted inserted replaced
94144:40901fec25aa 94145:3af508d0bd74
547 CYGWIN_OBJ = sheap.o 547 CYGWIN_OBJ = sheap.o
548 #endif 548 #endif
549 549
550 #ifdef HAVE_CARBON 550 #ifdef HAVE_CARBON
551 mac = $(dot)$(dot)/mac/ 551 mac = $(dot)$(dot)/mac/
552 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o 552 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o mactoolbox.o
553 emacsapp = $(PWD)/$(mac)Emacs.app/ 553 emacsapp = $(PWD)/$(mac)Emacs.app/
554 emacsappsrc = ${srcdir}/../mac/Emacs.app/ 554 emacsappsrc = ${srcdir}/../mac/Emacs.app/
555 #endif 555 #endif
556 556
557 #ifdef HAVE_WINDOW_SYSTEM 557 #ifdef HAVE_WINDOW_SYSTEM
1266 frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ 1266 frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \
1267 termchar.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ 1267 termchar.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \
1268 process.h coding.h $(config_h) 1268 process.h coding.h $(config_h)
1269 macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \ 1269 macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \
1270 keymap.h $(config_h) 1270 keymap.h $(config_h)
1271 mactoolbox.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \
1272 charset.h coding.h ccl.h dispextern.h fontset.h termhooks.h buffer.h \
1273 window.h keyboard.h $(config_h)
1271 1274
1272 ${emacsapp}Contents/Resources/English.lproj: 1275 ${emacsapp}Contents/Resources/English.lproj:
1273 mkdir -p $@ 1276 mkdir -p $@
1274 1277
1275 ifneq (${emacsapp},${emacsappsrc}) 1278 ifneq (${emacsapp},${emacsappsrc})