* s/darwin.h (OTHER_FILES): Do not define here, defined in

config.in.

* Makefile.in (ALL_OBJC_CFLAGS): New variable.
(.m.o): Use it.
* config.in: Regenerate.

* Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES.  Do
not special case for NS_IMPL_COCOA.

* configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable.
AC_SUBST it.
(GNU_OBJC_CFLAGS): Define as a shell variable instead of #define.
AC_SUBST it.
(OTHER_FILES): Always define for HAVE_NS.
(C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA.
* configure: Regenerate.

4 files changed, 15 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d1bd1e3b488..4544bf0b841 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/darwin.h (OTHER_FILES): Do not define here, defined in
+        config.in.
+
+        * Makefile.in (ALL_OBJC_CFLAGS): New variable.
+        (.m.o): Use it.
+        * config.in: Regenerate.
+
 2008-08-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (redisplay_window): Revert last change.
diff --git a/src/Makefile.in b/src/Makefile.in
index 3a12c7e2e95..a17a5acc221 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -254,11 +254,13 @@ DBUS_OBJ = dbusbind.o
 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */
 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
+ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
+
 .SUFFIXES: .m
 .c.o:
         $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 .m.o:
-        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) GNU_OBJC_CFLAGS $<
+        $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifndef LIBX11_SYSTEM
 #define LIBX11_SYSTEM
diff --git a/src/config.in b/src/config.in
index ffa4688462e..1b10aa399cc 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1039,18 +1039,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    side does this in s/darwin.h and we cannot
    parallel this exactly since GNUstep is multi-OS. */
 #ifdef HAVE_NS
+#define OTHER_FILES ns-app
 # ifdef NS_IMPL_GNUSTEP
 /* See also .m.o rule in Makefile.in */
 #  define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
-#  define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE
-#  define OTHER_FILES ns-app
-# else /* NS_IMPL_COCOA */
-#  define C_SWITCH_X_SYSTEM
-#  define GNU_OBJC_CFLAGS
-# endif /* NS_IMPL_COCOA */
+# endif /* NS_IMPL_GNUSTEP */
 #endif /* HAVE_NS */
 
-/* Define `subprocesses' should be defined if you want to
+/* `subprocesses' should be defined if you want to
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
    Only MSDOS does not support this.  */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 4dcf8bb5fdd..068531df146 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -154,7 +154,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Definitions for how to compile & link.  */
 
 #ifdef HAVE_NS
-#define OTHER_FILES ns-app
 /* XXX: lresolv is here because configure when testing #undefs res_init,
         a macro in /usr/include/resolv.h for res_9_init, not in stdc lib. */
 #define LIBS_NSGUI -framework AppKit -lresolv