Merge from emacs--devo--0

[gnu-emacs] / mac / makefile.MPW

diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index ec9e4126371c31dcb2cdde324f9a77dfe2f00b9b..47fc1f9abf2fd3999ec2a6694623cdea8170c1e8 100644 (file)
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1,6 +1,6 @@
 #    Make file for building GNU Emacs on the Macintosh.
-#    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-#       2005 Free Software Foundation, Inc.
+#    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+#       2005, 2006, 2007  Free Software Foundation, Inc.
 #
 #    Author: Andrew Choi <akochoi@users.sourceforge.net>
 #
@@ -8,7 +8,7 @@
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -373,7 +373,8 @@ buildobj.lst 
        "{Src}charset.h" ¶
        "{Src}coding.h" ¶
                "{Src}ccl.h" ¶
-       "{Src}regex.h"
+       "{Src}regex.h" ¶
+       {BLOCKINPUT_H_GROUP}
 
 {Src}dispnew.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
@@ -425,7 +426,8 @@ buildobj.lst 
        "{Src}ccl.h" ¶
        {WINDOW_H_GROUP} ¶
        "{Src}systime.h" ¶
-               "{Includes}sys:time.h"
+               "{Includes}sys:time.h" ¶
+       {BLOCKINPUT_H_GROUP}
 
 {Src}emacs.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
@@ -468,7 +470,8 @@ buildobj.lst 
        {WINDOW_H_GROUP} ¶
        "{Src}systime.h" ¶
                "{Includes}sys:time.h" ¶
-       "{Src}commands.h"
+       "{Src}commands.h" ¶
+       {BLOCKINPUT_H_GROUP}
 
 {Src}filemode.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
@@ -637,7 +640,8 @@ buildobj.lst 
        "{Includes}epaths.h" ¶
        "{Src}commands.h" ¶
        "{Src}keyboard.h" ¶
-       "{Src}termhooks.h"
+       "{Src}termhooks.h" ¶
+       {BLOCKINPUT_H_GROUP}
 
 {Src}macros.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
@@ -681,7 +685,8 @@ buildobj.lst 
        {DISPEXTERN_H_GROUP} ¶
        "{Src}termchar.h" ¶
        "{Src}keyboard.h" ¶
-       {INTERVALS_H_GROUP}
+       {INTERVALS_H_GROUP} ¶
+       {BLOCKINPUT_H_GROUP}
 
 {Src}process.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
@@ -788,7 +793,8 @@ buildobj.lst 
        "{Src}cm.h" ¶
        "{Src}macterm.h" ¶
                "{Src}macgui.h" ¶
-               "{Src}frame.h"
+               "{Src}frame.h" ¶
+       {BLOCKINPUT_H_GROUP}
 
 {Src}termcap.c.x Ä ¶
        {CONFIG_H_GROUP} ¶
@@ -1039,6 +1045,7 @@ shortlisp = 
        {Lisp}help.elc ¶
        {Lisp}indent.elc ¶
        {Lisp}isearch.elc ¶
+       {Lisp}rfn-eshadow.elc ¶
        {Lisp}loadup.el ¶
        {Lisp}loaddefs.el ¶
        {Lisp}bindings.elc ¶
@@ -1113,9 +1120,13 @@ SOME_MACHINE_LISP = {Lisp}mouse.elc 
   {Lisp}ls-lisp.elc {Lisp}dos-fns.elc ¶
   {Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶
   {Lisp}disp-table.elc {Lisp}dos-vars.elc ¶
-  {Lisp}tooltip.elc ¶
+  {Lisp}tooltip.elc {Lisp}image.elc ¶
+  {Lisp}fringe.elc {Lisp}dnd.elc ¶
+  {Lisp}mwheel.elc {Lisp}tool-bar.elc ¶
+  {Lisp}x-dnd.elc ¶
   {Lisp}international:ccl.elc ¶
-  {Lisp}international:codepage.elc
+  {Lisp}international:codepage.elc ¶
+  {Lisp}international:fontset.elc
 
 Doc Ä {DocTarget}DOC