diff src/Makefile.in @ 108792:939ecb6ccd4d

Replace YMF_PASS_LDFLAGS with autoconf. * configure.in (YMF_PASS_LDFLAGS): Remove. (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables. * configure: Regenerate. * src/Makefile.in (YMF_PASS_LDFLAGS): Remove. (temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS. * msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
author Glenn Morris <rgm@gnu.org>
date Tue, 25 May 2010 23:41:58 -0700
parents b06e3f33ea78
children dedcf813aa69
line wrap: on
line diff
--- a/src/Makefile.in	Tue May 25 21:06:09 2010 -0700
+++ b/src/Makefile.in	Tue May 25 23:41:58 2010 -0700
@@ -634,10 +634,14 @@
 buildobj.h: Makefile
 	echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-#define YMF_PASS_LDFLAGS(flags) @YMF_PASS_LDFLAGS@
 
+/* We cannot define variables for PRE_EDIT and POST_EDIT.
+   If !ORDINARY_LINK && !LINKER && GCC, they add a
+   \`./prefix-args -Xlinker ... \` wrapper, otherwise they are empty.
+   One alternative to this approach would be to always call prefix-args, 
+   and have it DTRT in all cases, by testing the above defines.  */
 temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
-	$(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) \
+	$(LD) @PRE_EDIT_LDFLAGS@ ${TEMACS_LDFLAGS} @POST_EDIT_LDFLAGS@ \
 	  ${TEMACS_LDFLAGS2} \
 	  -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}