[Emacs-diffs] Changes to emacs/lib-src/Makefile.in,v

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 08/07/16 23:24:46

Index: lib-src/Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/lib-src/Makefile.in,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- lib-src/Makefile.in 15 Jul 2008 18:14:55 -0000      1.164
+++ lib-src/Makefile.in 16 Jul 2008 23:24:40 -0000      1.165
@@ -144,7 +144,7 @@
 #define NOT_C_CODE
 #include "../src/config.h"
 
-#if defined(COCOA)
+#if defined(NS_IMPL_COCOA)
 /* Build these programs as universal binaries. */
 CFLAGS := $(CFLAGS) -universal
 /* Add mac-fix-env for OS X systems running NS version. */
@@ -278,14 +278,13 @@
    Using an explicit command made it work.  */
 .c.o:
        ${CC} -c ${CPP_CFLAGS} $<
-#ifdef HAVE_NS
+
 .m.o:
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import 
-fconstant-string-class=NSConstantString $<
 #else
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 #endif
-#endif
 
 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} 
${INSTALLABLE_SCRIPTS}
 
@@ -483,7 +482,7 @@
        $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \
          -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\""
 
-#if defined(COCOA)
+#if defined(NS_IMPL_COCOA)
 mac-fix-env: ${srcdir}/mac-fix-env.m
        $(CC) -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework 
Foundation
 #endif