diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-25 23:41:58 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-25 23:41:58 -0700 |
| commit | 90278cb61102b1bcf2c9a2837cb301af06a18127 (patch) | |
| tree | 4ecd18fa52c2317a32ab158489880080853a2507 /src/Makefile.in | |
| parent | 021eb8d750547099c7edcb537f46478276d7dc8c (diff) | |
| download | emacs-90278cb61102b1bcf2c9a2837cb301af06a18127.tar.gz | |
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.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index bbe573e69be..ea84fa08429 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -634,10 +634,14 @@ ${libsrc}make-docfile${EXEEXT}: 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} |