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

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 08/08/06 16:18:35

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/lib-src/Makefile.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- Makefile.in 21 Jul 2008 17:05:37 -0000      1.167
+++ Makefile.in 6 Aug 2008 16:18:35 -0000       1.168
@@ -145,8 +145,6 @@
 #include "../src/config.h"
 
 #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. */
 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} 
ebrowse${EXEEXT} mac-fix-env${EXEEXT}
 #endif
@@ -259,11 +257,7 @@
        ${CC} -c ${CPP_CFLAGS} $<
 
 .m.o:
-#ifdef NS_IMPL_GNUSTEP
-       $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -fgnu-runtime -Wno-import 
-fconstant-string-class=NSConstantString $<
-#else
        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
-#endif
 
 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} 
${INSTALLABLE_SCRIPTS}