diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
| commit | 8d9cc0b7ea1893059df8788129998e9a71ec07f3 (patch) | |
| tree | 4caa326ed8de37c8c0a859c7071593362832d37e /mac | |
| parent | cb5b9015b372175f1fc90cb7ba3f43298c621509 (diff) | |
| parent | 5142de65ce179e846514ec7355274ab22822a85c (diff) | |
| download | emacs-8d9cc0b7ea1893059df8788129998e9a71ec07f3.tar.gz | |
Merge multi-tty branch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/ChangeLog | 7 | ||||
| -rw-r--r-- | mac/makefile.MPW | 21 |
2 files changed, 25 insertions, 3 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index c25d89a83ba..8b00774471e 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,10 @@ +2007-08-29 Karoly Lorentey <lorentey@elte.hu> + + * makefile.MPW (EmacsObjects): Add terminal.c.x. + (callproc.c.x): Add dependencies frame.h, termhooks.h. + ({Src}terminal.c.x): New. + (shortlisp): Add server.elc and termdev.elc. + 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 9c03942effa..47fc1f9abf2 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -118,6 +118,7 @@ EmacsObjects = ¶ "{Src}sysdep.c.x" ¶ "{Src}term.c.x" ¶ "{Src}termcap.c.x" ¶ + "{Src}terminal.c.x" ¶ "{Src}textprop.c.x" ¶ "{Src}tparam.c.x" ¶ "{Src}undo.c.x" ¶ @@ -260,8 +261,8 @@ buildobj.lst Ä {CONFIG_H_GROUP} ¶ "{Includes}sys:types.h" ¶ "{Includes}sys:file.h" ¶ - "{Includes}sys:types.h" ¶ - "{Includes}sys:stat.h" ¶ + "{Includes}sys:types.h" ¶ + "{Includes}sys:stat.h" ¶ "{Src}lisp.h" ¶ "{Src}commands.h" ¶ "{Src}buffer.h" ¶ @@ -273,7 +274,9 @@ buildobj.lst Ä "{Src}process.h" ¶ "{Src}syssignal.h" ¶ "{Src}systty.h" ¶ - "{Includes}termio.h" + "{Includes}termio.h" ¶ + "{Src}frame.h" ¶ + "{Src}termhooks.h" {Src}casefiddle Ä ¶ {CONFIG_H_GROUP} ¶ @@ -798,6 +801,16 @@ buildobj.lst Ä "{Src}lisp.h" ¶ "{Includes}sys:file.h" +{Src}terminal.c.x Ä ¶ + {CONFIG_H_GROUP} ¶ + "{Src}lisp.h" ¶ + "{Src}frame.h" ¶ + "{Src}termchar.h" ¶ + "{Src}termhooks.h" ¶ + "{Src}charset.h" ¶ + "{Src}coding.h" ¶ + "{Src}keyboard.h" + {Src}textproc.c.x Ä ¶ {CONFIG_H_GROUP} ¶ "{Src}lisp.h" ¶ @@ -1014,6 +1027,7 @@ shortlisp = ¶ {Lisp}abbrev.elc ¶ {Lisp}buff-menu.elc ¶ {Lisp}button.elc ¶ + {Lisp}server.elc ¶ {Lisp}emacs-lisp:byte-run.elc ¶ {Lisp}cus-face.elc ¶ {Lisp}cus-start.elc ¶ @@ -1027,6 +1041,7 @@ shortlisp = ¶ {Lisp}emacs-lisp:float-sup.elc ¶ {Lisp}format.elc ¶ {Lisp}frame.elc ¶ + {Lisp}termdev.elc ¶ {Lisp}help.elc ¶ {Lisp}indent.elc ¶ {Lisp}isearch.elc ¶ |