Simplify temacs build rule.

* configure.in (TEMACS_LDFLAGS2): New output variable.
* configure: Regenerate.

* msdos/sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).

* src/Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
(temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e4f2b5f0db3..d731dd88a5c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
+        (temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.
+
         * Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
         (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
         (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
diff --git a/src/Makefile.in b/src/Makefile.in
index 5487cc5e10f..fdb3976b940 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -115,6 +115,9 @@ LD_SWITCH_SYSTEM_EXTRA=@LD_SWITCH_SYSTEM_EXTRA@
 ## Flags to pass to ld only for temacs.
 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_EXTRA) $(LD_SWITCH_SYSTEM_TEMACS)
 
+## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
+TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
+
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM=@LIBS_SYSTEM@
 
@@ -680,16 +683,10 @@ buildobj.h: Makefile
         echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
 temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
-#ifdef NS_IMPL_GNUSTEP
         $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
           ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+          ${TEMACS_LDFLAGS2} \
           -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
-#else
-        $(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)
         $(CC) $(LDFLAGS) prefix-args.o -o prefix-args