diff src/Makefile.in @ 97354:0defde3a9c5f

* 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.

--- a/src/Makefile.in	Thu Aug 07 09:29:58 2008 +0000
+++ b/src/Makefile.in	Thu Aug 07 14:21:43 2008 +0000
@@ -254,11 +254,13 @@
 /* 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