aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorDan Nicolaescu2008-07-27 18:24:48 +0000
committerDan Nicolaescu2008-07-27 18:24:48 +0000
commit9e2a2647758db83b490e2993aa31cd4607305a82 (patch)
tree9c3d41b47bcd316c60d56bef8d7fd32789e59411 /src/Makefile.in
parent7f19297073b2dd6c28987bf5663933591f59e91e (diff)
downloademacs-9e2a2647758db83b490e2993aa31cd4607305a82.tar.gz
emacs-9e2a2647758db83b490e2993aa31cd4607305a82.zip
Remove support for Mac Carbon.
* mactoolbox.c: * macterm.h: * macterm.c: * macselect.c: * macmenu.c: * macgui.h: * macfns.c: * mac.c: Remove file. * s/darwin.h: * m/intel386.h: * xfaces.c: * xdisp.c: * window.c: * tparam.c: * termhooks.h: * termcap.c: * term.c: * syssignal.h: * sysselect.h: * sysdep.c: * process.c: * lread.c: * lisp.h: * keyboard.c: * image.c: * fringe.c: * frame.h: * frame.c: * fontset.c: * font.h: * font.c: * fns.c: * fileio.c: * emacs.c: * dispnew.c: * dispextern.h: * config.in: * atimer.c: * Makefile.in: Remove code for Carbon * erc.el: Remove code for Carbon. Remove support for Mac Carbon. * term/mac-win.el: Remove file * international/mule-cmds.el: * version.el: * startup.el: * simple.el: * mwheel.el: * mouse.el: * loadup.el: * isearch.el: * info.el: * frame.el: * faces.el: * disp-table.el: * cus-start.el: * cus-face.el: * cus-edit.el: * Makefile.in: Remove code for Carbon. Remove support for Mac Carbon. * makefile.w32-in: * emacsclient.c: Remove code for Carbon. * PROBLEMS: * MACHINES: Remove mentions of Mac Carbon. * ns-emacs.texi: * faq.texi: Remove mentions of Mac Carbon. * os.texi: * frames.texi: * display.texi: Remove mentions of Mac Carbon. * xresources.texi: Remove mentions of Mac Carbon. * make-tarball.txt: * admin.el: * FOR-RELEASE: * CPP-DEFINES: Remove mentions of Mac Carbon. Remove support for Mac Carbon. * mac: Remove directory. * make-dist: * configure.in: * README: * Makefile.in: * INSTALL: Remove code for Carbon. * configure: Regenerate.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in70
1 files changed, 8 insertions, 62 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 3dcaa83ad00..2fe5990a1a5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -513,13 +513,6 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o
513CYGWIN_OBJ = sheap.o 513CYGWIN_OBJ = sheap.o
514#endif 514#endif
515 515
516#ifdef HAVE_CARBON
517mac = ../mac/
518MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o mactoolbox.o
519emacsapp = $(PWD)/$(mac)Emacs.app/
520emacsappsrc = ${srcdir}/../mac/Emacs.app/
521#endif
522
523#ifdef HAVE_NS 516#ifdef HAVE_NS
524ns_appdir=@ns_appdir@/ 517ns_appdir=@ns_appdir@/
525ns_appbindir=@ns_appbindir@/ 518ns_appbindir=@ns_appbindir@/
@@ -557,14 +550,14 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
557 process.o callproc.o \ 550 process.o callproc.o \
558 region-cache.o sound.o atimer.o \ 551 region-cache.o sound.o atimer.o \
559 doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ 552 doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
560 $(MSDOS_OBJ) $(MAC_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) 553 $(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
561 554
562/* Object files used on some machine or other. 555/* Object files used on some machine or other.
563 These go in the DOC file on all machines 556 These go in the DOC file on all machines
564 in case they are needed there. */ 557 in case they are needed there. */
565SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ 558SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
566 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ 559 xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
567 mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ 560 fontset.o \
568 nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ 561 nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
569 w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ 562 w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
570 w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) 563 w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
@@ -1089,7 +1082,7 @@ filelock.o: filelock.c buffer.h character.h charset.h coding.h systime.h \
1089filemode.o: filemode.c $(config_h) 1082filemode.o: filemode.c $(config_h)
1090frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ 1083frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \
1091 blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h \ 1084 blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h \
1092 msdos.h dosfns.h dispextern.h w32term.h macterm.h macgui.h termchar.h \ 1085 msdos.h dosfns.h dispextern.h w32term.h termchar.h \
1093 $(config_h) 1086 $(config_h)
1094fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h) 1087fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h)
1095font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ 1088font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \
@@ -1099,7 +1092,7 @@ fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \
1099 charset.h frame.h keyboard.h termhooks.h font.h $(config_h) 1092 charset.h frame.h keyboard.h termhooks.h font.h $(config_h)
1100getloadavg.o: getloadavg.c $(config_h) 1093getloadavg.o: getloadavg.c $(config_h)
1101image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ 1094image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
1102 systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h font.h \ 1095 systime.h xterm.h w32term.h w32gui.h font.h \
1103 nsterm.h nsgui.h $(config_h) 1096 nsterm.h nsgui.h $(config_h)
1104indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ 1097indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
1105 termopts.h disptab.h region-cache.h character.h category.h composite.h \ 1098 termopts.h disptab.h region-cache.h character.h category.h composite.h \
@@ -1109,7 +1102,7 @@ insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h character.h \
1109keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \ 1102keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \
1110 commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ 1103 commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \
1111 systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h atimer.h \ 1104 systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h atimer.h \
1112 xterm.h puresize.h msdos.h keymap.h w32term.h macterm.h macgui.h nsterm.h \ 1105 xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h \
1113 $(config_h) 1106 $(config_h)
1114keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ 1107keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \
1115 atimer.h systime.h puresize.h character.h intervals.h keymap.h window.h \ 1108 atimer.h systime.h puresize.h character.h intervals.h keymap.h window.h \
@@ -1176,15 +1169,15 @@ widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
1176window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \ 1169window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
1177 disptab.h keyboard.h dispextern.h msdos.h composite.h \ 1170 disptab.h keyboard.h dispextern.h msdos.h composite.h \
1178 keymap.h blockinput.h atimer.h systime.h $(INTERVAL_SRC) \ 1171 keymap.h blockinput.h atimer.h systime.h $(INTERVAL_SRC) \
1179 xterm.h w32term.h macterm.h macgui.h nsterm.h $(config_h) 1172 xterm.h w32term.h nsterm.h $(config_h)
1180xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \ 1173xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \
1181 coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h \ 1174 coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h \
1182 charset.h $(config_h) keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h \ 1175 charset.h $(config_h) keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h \
1183 w32term.h macterm.h macgui.h nsterm.h msdos.h composite.h fontset.h \ 1176 w32term.h nsterm.h msdos.h composite.h fontset.h \
1184 blockinput.h atimer.h systime.h keymap.h font.h 1177 blockinput.h atimer.h systime.h keymap.h font.h
1185xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ 1178xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
1186 window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \ 1179 window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \
1187 systime.h keyboard.h fontset.h w32term.h macterm.h macgui.h nsterm.h \ 1180 systime.h keyboard.h fontset.h w32term.h nsterm.h \
1188 $(INTERVAL_SRC) termchar.h termhooks.h font.h $(config_h) 1181 $(INTERVAL_SRC) termchar.h termhooks.h font.h $(config_h)
1189xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \ 1182xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \
1190 $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \ 1183 $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \
@@ -1252,53 +1245,6 @@ composite.o: composite.c buffer.h character.h $(INTERVAL_SRC) $(config_h)
1252 OTHER_FILES and OBJECTS_MACHINE 1245 OTHER_FILES and OBJECTS_MACHINE
1253 select which of these should be compiled. */ 1246 select which of these should be compiled. */
1254 1247
1255#ifdef HAVE_CARBON
1256buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
1257 fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \
1258 scroll.o sysdep.o term.o terminal.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \
1259 xterm.o xselect.o sound.o: macgui.h
1260mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \
1261 coding.h ccl.h $(config_h)
1262macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \
1263 dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \
1264 atimer.h systime.h epaths.h termhooks.h coding.h $(config_h)
1265macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \
1266 keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h)
1267macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \
1268 frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \
1269 termchar.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \
1270 process.h coding.h $(config_h)
1271macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \
1272 keymap.h $(config_h)
1273mactoolbox.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \
1274 charset.h coding.h ccl.h dispextern.h fontset.h termhooks.h buffer.h \
1275 window.h keyboard.h $(config_h)
1276
1277${emacsapp}Contents/Resources/English.lproj:
1278 mkdir -p $@
1279
1280ifneq (${emacsapp},${emacsappsrc})
1281${emacsapp}Contents/Info.plist: ${emacsappsrc}Contents/Info.plist
1282 cp $< $@
1283${emacsapp}Contents/PkgInfo: ${emacsappsrc}Contents/PkgInfo
1284 cp $< $@
1285${emacsapp}Contents/Resources/Emacs.icns: ${emacsappsrc}Contents/Resources/Emacs.icns
1286 mkdir -p ${emacsapp}Contents/Resources
1287 cp $< $@
1288${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings: ${emacsappsrc}Contents/Resources/English.lproj/InfoPlist.strings
1289 cp $< $@
1290endif
1291
1292macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \
1293 ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \
1294 ${emacsapp}Contents/Resources/Emacs.icns \
1295 ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
1296macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs
1297${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT}
1298 mkdir -p ${emacsapp}Contents/MacOS/;
1299 cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT}
1300#endif /* HAVE_CARBON */
1301
1302#ifdef HAVE_NS 1248#ifdef HAVE_NS
1303buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \ 1249buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \
1304 fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \ 1250 fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \