From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sat, 17 Feb 2007 02:36:19 +0000 (+0000)
Subject: (${emacsapp}Contents/Resources/Emacs.rsrc)
X-Git-Tag: emacs-pretest-22.0.94~108
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc23733a9d8d9d663e6ab5f6955a9a0bf3be786e;p=emacs.git

(${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 c0bae63b766..9ad8b7d6c4d 100644
--- 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 9407eb6c0bc..9ddfdc7bfe2 100644
--- 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