aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2007-02-17 02:36:19 +0000
committerYAMAMOTO Mitsuharu2007-02-17 02:36:19 +0000
commitbc23733a9d8d9d663e6ab5f6955a9a0bf3be786e (patch)
treed7d64aa3b49193b04c06a09c1d0687049c811db3
parent68810cae54cfa437574bfa688b7a57aab32029bf (diff)
downloademacs-bc23733a9d8d9d663e6ab5f6955a9a0bf3be786e.tar.gz
emacs-bc23733a9d8d9d663e6ab5f6955a9a0bf3be786e.zip
(${emacsapp}Contents/Resources/Emacs.rsrc)
[HAVE_CARBON]: Remove target. (macosx-app) [HAVE_CARBON]: Don't depend on it.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.in7
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c0bae63b766..9ad8b7d6c4d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12007-02-17 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * Makefile.in (${emacsapp}Contents/Resources/Emacs.rsrc)
4 [HAVE_CARBON]: Remove target.
5 (macosx-app) [HAVE_CARBON]: Don't depend on it.
6
12007-02-17 Juanma Barranquero <lekktu@gmail.com> 72007-02-17 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * callproc.c (syms_of_callproc) <doc-directory>: 9 * 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 \
1302 ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \ 1302 ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \
1303 ${emacsapp}Contents/Resources/Emacs.icns \ 1303 ${emacsapp}Contents/Resources/Emacs.icns \
1304 ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings 1304 ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings
1305macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \ 1305macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs
1306 ${emacsapp}Contents/Resources/Emacs.rsrc
1307${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT} 1306${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT}
1308 mkdir -p ${emacsapp}Contents/MacOS/; 1307 mkdir -p ${emacsapp}Contents/MacOS/;
1309 cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT} 1308 cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT}
1310${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r
1311 /Developer/Tools/Rez -useDF \
1312 -o ${emacsapp}Contents/Resources/Emacs.rsrc \
1313 /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $<
1314#endif 1309#endif
1315 1310
1316${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c 1311${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c