# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1218039515 0
# Node ID 4fb874878836d80970da72ef20062bd5e9a8d196
# Parent  7b285e87b6ba266807fc9a99515132e7e555546b
* Makefile.in (CFLAGS): Drop -universal under NS_IMPL_COCOA. (.m.o): Dispense with GNUstep-specific flags.

diff -r 7b285e87b6ba -r 4fb874878836 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Wed Aug 06 15:55:46 2008 +0000
+++ b/lib-src/ChangeLog	Wed Aug 06 16:18:35 2008 +0000
@@ -1,3 +1,8 @@
+2008-07-16  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* Makefile.in (CFLAGS): Drop -universal under NS_IMPL_COCOA.
+	(.m.o): Dispense with GNUstep-specific flags.
+
 2008-08-05  Ulrich Mueller  <ulm@gentoo.org>
 
 	* pop.c (socket_connection): Add conditionals for
diff -r 7b285e87b6ba -r 4fb874878836 lib-src/Makefile.in
--- a/lib-src/Makefile.in	Wed Aug 06 15:55:46 2008 +0000
+++ b/lib-src/Makefile.in	Wed Aug 06 16:18:35 2008 +0000
@@ -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}