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.

7 files changed, 19 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0465d866c41..131abbb6079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+        * configure.in (TEMACS_LDFLAGS2): New output variable.
+
         * 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,
diff --git a/configure b/configure
index eef5502c8ef..327ae22d2f0 100755
--- a/configure
+++ b/configure
@@ -719,6 +719,7 @@ LD_SWITCH_X_SITE_AUX
 LD_SWITCH_X_SITE_AUX_RPATH
 NS_IMPL_GNUSTEP_INC
 NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
+TEMACS_LDFLAGS2
 NS_OBJ
 NS_SUPPORT
 LIB_STANDARD
@@ -9937,6 +9938,7 @@ tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
 CFLAGS="$CFLAGS -x objective-c"
+TEMACS_LDFLAGS2="\${LDFLAGS}"
 if test "${with_ns}" != no; then
   if test "${opsys}" = darwin; then
      NS_IMPL_COCOA=yes
@@ -9967,6 +9969,7 @@ shared=no
      LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
      LIB_STANDARD=
      START_FILES=
+     TEMACS_LDFLAGS2=
   fi
   if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5
@@ -10156,6 +10159,7 @@ fi
 
 
 
+
 NS_OBJ=
 NS_SUPPORT=
 if test "${HAVE_NS}" = yes; then
diff --git a/configure.in b/configure.in
index 15214aa359b..28846991ae5 100644
--- a/configure.in
+++ b/configure.in
@@ -1458,6 +1458,7 @@ tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
 CFLAGS="$CFLAGS -x objective-c"
+TEMACS_LDFLAGS2="\${LDFLAGS}"
 if test "${with_ns}" != no; then
   if test "${opsys}" = darwin; then
      NS_IMPL_COCOA=yes
@@ -1490,6 +1491,7 @@ shared=no
      LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
      LIB_STANDARD=
      START_FILES=
+     TEMACS_LDFLAGS2=
   fi
   AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
                   [AC_MSG_ERROR([`--with-ns' was specified, but the include
@@ -1505,6 +1507,7 @@ shared=no
 fi
 AC_SUBST(NS_IMPL_GNUSTEP_INC)
 AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
+AC_SUBST(TEMACS_LDFLAGS2)
 
 NS_OBJ=
 NS_SUPPORT=
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 385a8a41ede..c9c7aff49fc 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
+        * sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).
+
         * sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
         (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
 
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 8d77a4be21b..523483a796a 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -52,6 +52,7 @@ s/\.h\.in/.h-in/
 /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
 /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
 /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@//
+/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
 /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
 /^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/
 /^LIB_STANDARD *=/s/@LIB_STANDARD@//
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