Mercurial > emacs
changeset 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 | 737446e13a3f |
| children | d38bcb4008ab |
| files | ChangeLog configure configure.in msdos/ChangeLog msdos/sed1v2.inp src/ChangeLog src/Makefile.in |
| diffstat | 7 files changed, 35 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 25 21:06:09 2010 -0700 +++ b/ChangeLog Tue May 25 23:41:58 2010 -0700 @@ -1,5 +1,8 @@ 2010-05-26 Glenn Morris <rgm@gnu.org> + * configure.in (YMF_PASS_LDFLAGS): Remove. + (PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables. + * configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS): Add $GNUSTEP_LOCAL_HEADERS. (LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.
--- a/configure Tue May 25 21:06:09 2010 -0700 +++ b/configure Tue May 25 23:41:58 2010 -0700 @@ -818,7 +818,8 @@ PRE_ALLOC_OBJ POST_ALLOC_OBJ LD_SWITCH_SYSTEM_TEMACS -YMF_PASS_LDFLAGS +PRE_EDIT_LDFLAGS +POST_EDIT_LDFLAGS LINKER LIB_GCC MOUSE_SUPPORT @@ -26655,11 +26656,9 @@ ;; esac -## A macro which other sections of Makefile can redefine to munge the -## flags before they are passed to LD. This is helpful if you have -## redefined LD to something odd, like "gcc". -## (The YMF prefix is a holdover from the old name "ymakefile".) -YMF_PASS_LDFLAGS=flags + +PRE_EDIT_LDFLAGS= +POST_EDIT_LDFLAGS= if test "x$ORDINARY_LINK" = "xyes"; then LINKER="\$(CC)" @@ -26687,9 +26686,11 @@ ## shell''s ``for'' construct. Note that sane people do not have '.' in ## their paths, so we must use ./prefix-args. ## TODO either make prefix-args check ORDINARY_LINK internally, - ## or remove it altogether (bug#6184), removing the need for this macro. - YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' -fi + ## or remove it altogether (bug#6184), removing the need for this hack. + PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker' + POST_EDIT_LDFLAGS='`' +fi + test "x$LINKER" = "x" && LINKER=ld
--- a/configure.in Tue May 25 21:06:09 2010 -0700 +++ b/configure.in Tue May 25 23:41:58 2010 -0700 @@ -3335,11 +3335,9 @@ ;; esac -## A macro which other sections of Makefile can redefine to munge the -## flags before they are passed to LD. This is helpful if you have -## redefined LD to something odd, like "gcc". -## (The YMF prefix is a holdover from the old name "ymakefile".) -YMF_PASS_LDFLAGS=flags + +PRE_EDIT_LDFLAGS= +POST_EDIT_LDFLAGS= if test "x$ORDINARY_LINK" = "xyes"; then LINKER="\$(CC)" @@ -3363,10 +3361,12 @@ ## shell''s ``for'' construct. Note that sane people do not have '.' in ## their paths, so we must use ./prefix-args. ## TODO either make prefix-args check ORDINARY_LINK internally, - ## or remove it altogether (bug#6184), removing the need for this macro. - YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' + ## or remove it altogether (bug#6184), removing the need for this hack. + PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker' + POST_EDIT_LDFLAGS='`' fi -AC_SUBST(YMF_PASS_LDFLAGS) +AC_SUBST(PRE_EDIT_LDFLAGS) +AC_SUBST(POST_EDIT_LDFLAGS) test "x$LINKER" = "x" && LINKER=ld ## FIXME? What setting of YMF_PASS_LDFLAGS should this have?
--- a/msdos/ChangeLog Tue May 25 21:06:09 2010 -0700 +++ b/msdos/ChangeLog Tue May 25 23:41:58 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-26 Glenn Morris <rgm@gnu.org> + * sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing. + * sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): No longer present. @@ -9,7 +11,7 @@ 2010-05-21 Glenn Morris <rgm@gnu.org> - * sed1v2.inp(@ns_frag@): Edit to nothing. + * sed1v2.inp (@ns_frag@): Edit to nothing. * sed1x.inp (OLDXMENU): Replace any initial value. * sed1v2.inp (OLDXMENU): Edit to "nothing".
--- a/msdos/sed1v2.inp Tue May 25 21:06:09 2010 -0700 +++ b/msdos/sed1v2.inp Tue May 25 23:41:58 2010 -0700 @@ -147,6 +147,8 @@ s/@YMF_PASS_LDFLAGS@/flags/ s/@deps_frag@// s/@ns_frag@// +s/@PRE_EDIT_LDFLAGS@// +s/@POST_EDIT_LDFLAGS@// s/bootstrap-emacs/b-emacs/ s/bootstrap-temacs/b-temacs/ s/bootstrap-doc/b-doc/
--- a/src/ChangeLog Tue May 25 21:06:09 2010 -0700 +++ b/src/ChangeLog Tue May 25 23:41:58 2010 -0700 @@ -1,5 +1,8 @@ 2010-05-26 Glenn Morris <rgm@gnu.org> + * Makefile.in (YMF_PASS_LDFLAGS): Remove. + (temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS. + * Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Remove. (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
--- 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}