* Makefile.in (CFLAGS): Drop -universal under NS_IMPL_COCOA. (.m.o): Dispense with GNUstep-specific flags.

2 files changed, 5 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fdf2082f37c..48a50a5fb43 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -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 --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 5f8e6d4fc60..70bb8111c02 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -145,8 +145,6 @@ MOVE_FLAGS=
 #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 @@ BASE_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
         ${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}