(${emacsapp}Contents/Resources/Emacs.rsrc)

[HAVE_CARBON]: Remove target.
(macosx-app) [HAVE_CARBON]: Don't depend on it.

diff --git a/src/ChangeLog b/src/ChangeLog
index c0bae63b766fc1bdacc8e15fca32071de223ddc1..9ad8b7d6c4d9c1da824693365a2557fa895ec5bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-17  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * Makefile.in (${emacsapp}Contents/Resources/Emacs.rsrc)
+       [HAVE_CARBON]: Remove target.
+       (macosx-app) [HAVE_CARBON]: Don't depend on it.
+
 2007-02-17  Juanma Barranquero  <lekktu@gmail.com>
 
        * callproc.c (syms_of_callproc) <doc-directory>:

diff --git a/src/Makefile.in b/src/Makefile.in
index 9407eb6c0bc2ab9e630d065e93123b99815f671b..9ddfdc7bfe22641ad152f9a868a1dbef319fe4e7 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1302,15 +1302,10 @@ macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \
        ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \
        ${emacsapp}Contents/Resources/Emacs.icns \
        ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
-macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \
-  ${emacsapp}Contents/Resources/Emacs.rsrc
+macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs
 ${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT}
        mkdir -p ${emacsapp}Contents/MacOS/;
        cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT}
-${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
-       /Developer/Tools/Rez -useDF \
-       -o ${emacsapp}Contents/Resources/Emacs.rsrc \
-       /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $<
 #endif
 
 ${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c