From 90278cb61102b1bcf2c9a2837cb301af06a18127 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 25 May 2010 23:41:58 -0700 Subject: [PATCH] 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. --- ChangeLog | 3 +++ configure | 17 +++++++++-------- configure.in | 16 ++++++++-------- msdos/ChangeLog | 4 +++- msdos/sed1v2.inp | 2 ++ src/ChangeLog | 3 +++ src/Makefile.in | 8 ++++++-- 7 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0eb8fc8c8e0..f17fd567624 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-05-26 Glenn Morris + * 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. diff --git a/configure b/configure index 83b74eaafdf..7895df600a2 100755 --- a/configure +++ b/configure @@ -818,7 +818,8 @@ CYGWIN_OBJ 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 @@ case "$opsys" in ;; 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,11 +26686,13 @@ elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then ## 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 + test "x$LINKER" = "x" && LINKER=ld ## FIXME? What setting of YMF_PASS_LDFLAGS should this have? test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" diff --git a/configure.in b/configure.in index 01b52e3e38a..7cdf520dc5d 100644 --- a/configure.in +++ b/configure.in @@ -3335,11 +3335,9 @@ case "$opsys" in ;; 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 @@ elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then ## 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? diff --git a/msdos/ChangeLog b/msdos/ChangeLog index db8a37896b8..b868d714295 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,7 @@ 2010-05-26 Glenn Morris + * 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 - * 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". diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index eec6be62195..6b85d986ecf 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -147,6 +147,8 @@ s/\.h\.in/.h-in/ 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/ diff --git a/src/ChangeLog b/src/ChangeLog index ba513b1bcf2..83d2e956af6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-05-26 Glenn Morris + * 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. 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} -- 2.39.2