Merged from emacs@sv.gnu.org

[gnu-emacs] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 0aa80866a385ce2d481ffa91b656e2e96ec74db6..e19083e3e15ce083146e8b9e974b7c054276954f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -403,8 +403,9 @@ LIBXT=$(LIBW)
 #endif /* not USE_X_TOOLKIT */
 
 #if HAVE_XFT
-#undef LIB_X11_LIB
-#define LIB_X11_LIB @XFT_LIBS@
+#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */
+#define LIB_X11_LIB
+XFT_LIBS=@XFT_LIBS@
 #endif /* HAVE_XFT */
 
 #if HAVE_XPM
@@ -451,7 +452,7 @@ LIBXT=$(LIBW)
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */
 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS)
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
@@ -1312,15 +1313,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