Simplify temacs build rule.

* configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
(START_FILES): Set to empty if NS_IMPL_GNUSTEP.
(GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
nothing uses.

* configure: Regenerate.

* src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
(LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
(temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
Make most of the NS_IMPL_GNUSTEP case the same as the default case.

* msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.

2 files changed, 25 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b331c578af..e4f2b5f0db3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
+        (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
+        (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
+        (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
+        Make most of the NS_IMPL_GNUSTEP case the same as the default case.
+
         * Makefile.in (temacs${EXEEXT}) [!NS_IMPL_GNUSTEP]:
         Remove ${STARTFLAGS}, nothing ever sets it.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index c7d438695dd..5487cc5e10f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -226,9 +226,8 @@ ns_appbindir=@ns_appbindir@/
 ns_appsrc=@ns_appsrc@
 NS_OBJ=@NS_OBJ@
 NS_SUPPORT=@NS_SUPPORT@
-## Next two only set if NS_IMPL_GNUSTEP.
+## Only set if NS_IMPL_GNUSTEP.
 GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
-GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@
 
 ## Empty if !HAVE_X_WINDOWS
 ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT
@@ -287,6 +286,10 @@ DEPFLAGS = -MMD -MF deps/$*.d
 /* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.  */
 @NS_IMPL_GNUSTEP_INC@
 
+/* FIXME move to LD_SWITCH_SYSTEM_TEMACS?
+   This uses ${CONFIG_SYSTEM_LIBS}, presumably set by the above include.  */
+NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@
+
 /* DO NOT use -R.  There is a special hack described in lastfile.c
    which is used instead.  Some initialized data areas are modified
    at initial startup, then labeled as part of the text area when
@@ -357,6 +360,12 @@ LD=ld
 
 #endif /* not ORDINARY_LINK */
 
+
+#ifdef NS_IMPL_GNUSTEP
+LD=$(CC) -rdynamic
+#endif
+
+
 /* lastfile must follow all files whose initialized data areas should
    be dumped as pure by dump-emacs.  */
 obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
@@ -670,16 +679,16 @@ ${libsrc}make-docfile${EXEEXT}:
 buildobj.h: Makefile
         echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-/* FIXME LOCALCPP not defined or mentioned anywhere.  */
-temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
+temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
 #ifdef NS_IMPL_GNUSTEP
-        $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
-        -L$(GNUSTEP_SYSTEM_LIBRARIES) -lgnustep-gui -lgnustep-base \
-        -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \
-        ${obj} ${otherobj} ${LIBES}
+        $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
+          ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+          -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
 #else
-        $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) $(LDFLAGS) \
-        -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
+        $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
+          ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+          ${LDFLAGS} \
+          -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
 #endif
 
 prefix-args${EXEEXT}: prefix-args.o $(config_h)