Mercurial > emacs
changeset 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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 16 May 2010 16:01:56 -0700 |
| parents | 6b62ba6da320 |
| children | cb966dd854bc |
| files | ChangeLog configure configure.in msdos/ChangeLog msdos/sed1v2.inp src/ChangeLog src/Makefile.in |
| diffstat | 7 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 16 10:58:27 2010 -0700 +++ b/ChangeLog Sun May 16 16:01:56 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris <rgm@gnu.org> + * configure.in (TEMACS_LDFLAGS2): New output variable. + * configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable. (START_FILES): Set to empty if NS_IMPL_GNUSTEP. (GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
--- a/configure Sun May 16 10:58:27 2010 -0700 +++ b/configure Sun May 16 16:01:56 2010 -0700 @@ -719,6 +719,7 @@ LD_SWITCH_X_SITE_AUX_RPATH NS_IMPL_GNUSTEP_INC NS_IMPL_GNUSTEP_TEMACS_LDFLAGS +TEMACS_LDFLAGS2 NS_OBJ NS_SUPPORT LIB_STANDARD @@ -9937,6 +9938,7 @@ tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" +TEMACS_LDFLAGS2="\${LDFLAGS}" if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes @@ -9967,6 +9969,7 @@ LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" LIB_STANDARD= START_FILES= + TEMACS_LDFLAGS2= fi if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5 @@ -10156,6 +10159,7 @@ + NS_OBJ= NS_SUPPORT= if test "${HAVE_NS}" = yes; then
--- a/configure.in Sun May 16 10:58:27 2010 -0700 +++ b/configure.in Sun May 16 16:01:56 2010 -0700 @@ -1458,6 +1458,7 @@ tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" +TEMACS_LDFLAGS2="\${LDFLAGS}" if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes @@ -1490,6 +1491,7 @@ LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" LIB_STANDARD= START_FILES= + TEMACS_LDFLAGS2= fi AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], [AC_MSG_ERROR([`--with-ns' was specified, but the include @@ -1505,6 +1507,7 @@ fi AC_SUBST(NS_IMPL_GNUSTEP_INC) AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) +AC_SUBST(TEMACS_LDFLAGS2) NS_OBJ= NS_SUPPORT=
--- a/msdos/ChangeLog Sun May 16 10:58:27 2010 -0700 +++ b/msdos/ChangeLog Sun May 16 16:01:56 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris <rgm@gnu.org> + * sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS). + * sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove. (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
--- a/msdos/sed1v2.inp Sun May 16 10:58:27 2010 -0700 +++ b/msdos/sed1v2.inp Sun May 16 16:01:56 2010 -0700 @@ -52,6 +52,7 @@ /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// /^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// +/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/ /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// /^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/ /^LIB_STANDARD *=/s/@LIB_STANDARD@//
--- a/src/ChangeLog Sun May 16 10:58:27 2010 -0700 +++ b/src/ChangeLog Sun May 16 16:01:56 2010 -0700 @@ -1,5 +1,8 @@ 2010-05-16 Glenn Morris <rgm@gnu.org> + * Makefile.in (TEMACS_LDFLAGS2): New, set by configure. + (temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default. + * Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused. (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure. (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
--- 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