diff src/Makefile.in @ 108624:ecb7cdb525f0

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.

--- a/src/Makefile.in	Sun May 16 10:58:27 2010 -0700
+++ b/src/Makefile.in	Sun May 16 16:01:56 2010 -0700
@@ -115,6 +115,9 @@
 ## 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 @@
 	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