Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100332. ------------------------------------------------------------ revno: 100332 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 22:15:03 -0700 message: Combine the two stamp-oldxmenu cases. * configure.in (OLDXMENU_DEPS): New output variable. * configure: Regenerate. * src/Makefile.in (OLDXMENU_DEPS): New, set by configure. (stamp-oldxmenu): Use $OLDXMENU_DEPS. * msdos/sed1v2.inp (OLDXMENU_DEPS): Edit to empty. * msdos/sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}. diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-16 23:38:13 +0000 +++ ChangeLog 2010-05-17 05:15:03 +0000 @@ -1,3 +1,7 @@ +2010-05-17 Glenn Morris + + * configure.in (OLDXMENU_DEPS): New output variable. + 2010-05-16 Glenn Morris * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir. === modified file 'configure' --- configure 2010-05-16 23:38:13 +0000 +++ configure 2010-05-17 05:15:03 +0000 @@ -809,6 +809,7 @@ OLDXMENU LIBXMENU LIBX_OTHER +OLDXMENU_DEPS CYGWIN_OBJ PRE_ALLOC_OBJ POST_ALLOC_OBJ @@ -26488,6 +26489,7 @@ fi LIBXMENU="\$(OLDXMENU)" LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" + OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}" else OLDXMENU= ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?). @@ -26497,17 +26499,20 @@ LIBXMENU= fi LIBX_OTHER= + OLDXMENU_DEPS= fi if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU= LIBXMENU= + OLDXMENU_DEPS= fi + if test "${HAVE_MENUS}" = "yes" ; then cat >>confdefs.h <<\_ACEOF === modified file 'configure.in' --- configure.in 2010-05-16 23:38:13 +0000 +++ configure.in 2010-05-17 05:15:03 +0000 @@ -3159,6 +3159,7 @@ fi LIBXMENU="\$(OLDXMENU)" LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" + OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}" else OLDXMENU= ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?). @@ -3168,16 +3169,19 @@ LIBXMENU= fi LIBX_OTHER= + OLDXMENU_DEPS= fi if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU= LIBXMENU= + OLDXMENU_DEPS= fi AC_SUBST(OLDXMENU) AC_SUBST(LIBXMENU) AC_SUBST(LIBX_OTHER) +AC_SUBST(OLDXMENU_DEPS) if test "${HAVE_MENUS}" = "yes" ; then AC_DEFINE(HAVE_MENUS, 1, === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-05-16 23:01:56 +0000 +++ msdos/ChangeLog 2010-05-17 05:15:03 +0000 @@ -1,3 +1,8 @@ +2010-05-17 Glenn Morris + + * sed1v2.inp (OLDXMENU_DEPS): Edit to empty. + * sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}. + 2010-05-16 Glenn Morris * sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS). === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-05-16 23:01:56 +0000 +++ msdos/sed1v2.inp 2010-05-17 05:15:03 +0000 @@ -84,6 +84,7 @@ /^LIBXTR6 *=/s/@LIBXTR6@// /^LIBXT_OTHER *=/s/@LIBXT_OTHER@// /^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@// +/^OLDXMENU_DEPS *=/s/@OLDXMENU_DEPS@// /^XOBJ *=/s/@XOBJ@// /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// === modified file 'msdos/sed1x.inp' --- msdos/sed1x.inp 2010-05-15 22:33:24 +0000 +++ msdos/sed1x.inp 2010-05-17 05:15:03 +0000 @@ -8,6 +8,7 @@ /^LIBXMENU *=/s!= *!= ${OLDXMENU}! /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}! /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! +/^OLDXMENU_DEPS *=/s!= *!= ${OLDXMENU} ../src/${OLDXMENU}! /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! /^FONT_OBJ *=/s!= *!= xfont.o! === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-17 00:01:22 +0000 +++ src/ChangeLog 2010-05-17 05:15:03 +0000 @@ -1,3 +1,8 @@ +2010-05-17 Glenn Morris + + * Makefile.in (OLDXMENU_DEPS): New, set by configure. + (stamp-oldxmenu): Use $OLDXMENU_DEPS. + 2010-05-16 Glenn Morris * Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-17 00:01:22 +0000 +++ src/Makefile.in 2010-05-17 05:15:03 +0000 @@ -180,6 +180,12 @@ ## Else ${oldXMenudir}libXMenu11.a. OLDXMENU=@OLDXMENU@ +## If HAVE_X11 && !USE_GTK, ${OLDXMENU} ../src/${OLDXMENU}; else empty. +## We use stamp-xmenu with these two deps to both ensure that lwlib +## gets remade based on its dependencies in its own makefile, +## and remake temacs if lwlib gets changed by this. +OLDXMENU_DEPS=@OLDXMENU_DEPS@ + ## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible). ## Else if !HAVE_X11 || USE_GTK, empty. ## Else $(OLDXMENU). @@ -706,23 +712,18 @@ @true /* make -t should not create really-oldXMenu. */ .PHONY: really-oldXMenu +/* We don''t really need this when OLDXMENU_DEPS is empty, but as + things stand we need something to satisfy the temacs dependency. */ +stamp-oldxmenu: ${OLDXMENU_DEPS} + touch stamp-oldxmenu + /* HAVE_X11 implies HAVE_X_WINDOWS and HAVE_MENUS. */ #if defined (HAVE_X11) && ! defined (USE_GTK) -/* We use stamp-xmenu with these two deps to both ensure that lwlib - gets remade based on its dependencies in its own makefile, - and remake temacs if lwlib gets changed by this. */ -stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) - touch stamp-oldxmenu /* Supply an ordering for parallel make. */ ../src/$(OLDXMENU): ${OLDXMENU} $(OLDXMENU): $(OLDXMENU_TARGET) - -#else /* !HAVE_X11 || USE_GTK */ -/* We don''t really need this, but satisfy the dependency. */ -stamp-oldxmenu: - touch stamp-oldxmenu -#endif /* HAVE_X11 && !USE_GTK */ +#endif /* HAVE_X11 && !USE_GTK */ ../config.status:: epaths.in @echo "The file epaths.h needs to be set up from epaths.in." ------------------------------------------------------------ revno: 100331 committer: Jay Belanger branch nick: trunk timestamp: Sun 2010-05-16 23:16:29 -0500 message: calc-vec.el (math-vector-avg): Put the vector elements in order before computing the averages. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-05-16 04:43:09 +0000 +++ lisp/ChangeLog 2010-05-17 04:16:29 +0000 @@ -1,3 +1,8 @@ +2010-05-17 Jay Belanger + + * calc/calc-vec.el (math-vector-avg): Put the vector elements in + order before computing the averages. + 2010-05-16 Jay Belanger * calc/calc-vec.el (calc-histogram): === modified file 'lisp/calc/calc-vec.el' --- lisp/calc/calc-vec.el 2010-05-16 04:43:09 +0000 +++ lisp/calc/calc-vec.el 2010-05-17 04:16:29 +0000 @@ -1178,7 +1178,7 @@ ;;; Replace a vector [a b c ...] with a vector of averages ;;; [(a+b)/2 (b+c)/2 ...] (defun math-vector-avg (vec) - (let ((vp (cdr vec)) + (let ((vp (sort (copy-sequence (cdr vec)) 'math-beforep)) (res nil)) (while (and vp (cdr vp)) (setq res (cons (math-div (math-add (car vp) (cadr vp)) 2) res) ------------------------------------------------------------ revno: 100330 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 17:01:22 -0700 message: * src/Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-16 23:46:44 +0000 +++ src/ChangeLog 2010-05-17 00:01:22 +0000 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris + * Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules. + * Makefile.in (clean): Get rid of HAVE_NS conditional. * Makefile.in (ns_appdir, ns_appbindir): Now configure adds the === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-16 23:46:44 +0000 +++ src/Makefile.in 2010-05-17 00:01:22 +0000 @@ -999,13 +999,14 @@ rm -fr ${ns_appdir} mkdir -p ${ns_appdir} ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) +#endif /* HAVE_NS */ +/* These are only used if HAVE_NS, but no harm in always defining them. */ ${ns_appbindir}Emacs: emacs${EXEEXT} mkdir -p ${ns_appbindir} cp -f emacs${EXEEXT} ${ns_appbindir}Emacs ns-app: ${ns_appdir} ${ns_appbindir}Emacs -#endif /* HAVE_NS */ mostlyclean: rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a ------------------------------------------------------------ revno: 100329 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 16:46:44 -0700 message: * src/Makefile.in (clean): Get rid of HAVE_NS conditional. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-16 23:31:05 +0000 +++ src/ChangeLog 2010-05-16 23:46:44 +0000 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris + * Makefile.in (clean): Get rid of HAVE_NS conditional. + * Makefile.in (ns_appdir, ns_appbindir): Now configure adds the trailing "/". === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-16 23:31:05 +0000 +++ src/Makefile.in 2010-05-16 23:46:44 +0000 @@ -1015,9 +1015,8 @@ clean: mostlyclean rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT} -rm -rf deps -#ifdef HAVE_NS - rm -fr ${ns_appdir} -#endif + test "X${ns_appdir}" = "X" || rm -rf ${ns_appdir} + /* bootstrap-clean is used to clean up just before a bootstrap. It should remove all files generated during a compilation/bootstrap, but not things like config.status or TAGS. */ ------------------------------------------------------------ revno: 100328 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 16:38:13 -0700 message: * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir. * configure: Regenerate. diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-16 23:31:05 +0000 +++ ChangeLog 2010-05-16 23:38:13 +0000 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris + * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir. + * configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value. * Makefile.in (install-arch-dep): Update for above change. === modified file 'configure' --- configure 2010-05-16 23:01:56 +0000 +++ configure 2010-05-16 23:38:13 +0000 @@ -9942,15 +9942,15 @@ if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes - ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS - ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources + ns_appdir=`pwd`/nextstep/Emacs.app/ + ns_appbindir=${ns_appdir}Contents/MacOS/ + ns_appresdir=${ns_appdir}Contents/Resources ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes - ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=`pwd`/nextstep/Emacs.app - ns_appresdir=`pwd`/nextstep/Emacs.app/Resources + ns_appdir=`pwd`/nextstep/Emacs.app/ + ns_appbindir=${ns_appdir} + ns_appresdir=${ns_appdir}Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" === modified file 'configure.in' --- configure.in 2010-05-16 23:31:05 +0000 +++ configure.in 2010-05-16 23:38:13 +0000 @@ -1466,14 +1466,14 @@ if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes ns_appdir=`pwd`/nextstep/Emacs.app/ - ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS/ - ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources + ns_appbindir=${ns_appdir}Contents/MacOS/ + ns_appresdir=${ns_appdir}Contents/Resources ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes ns_appdir=`pwd`/nextstep/Emacs.app/ - ns_appbindir=`pwd`/nextstep/Emacs.app/ - ns_appresdir=`pwd`/nextstep/Emacs.app/Resources + ns_appbindir=${ns_appdir} + ns_appresdir=${ns_appdir}Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base dnl FIXME sourcing this 3 times in subshells seems inefficient. GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" ------------------------------------------------------------ revno: 100327 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 16:31:05 -0700 message: Tweak ns_app*dir values set by configure. * configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value. * Makefile.in (install-arch-dep): Update for above change. * src/Makefile.in (ns_appdir, ns_appbindir): Now configure adds the trailing "/". diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-16 23:21:06 +0000 +++ ChangeLog 2010-05-16 23:31:05 +0000 @@ -1,5 +1,8 @@ 2010-05-16 Glenn Morris + * configure.in (ns_appdir, ns_appbindir): Add trailing "/" to value. + * Makefile.in (install-arch-dep): Update for above change. + * Makefile.in (ns_appdir): Remove. (install-arch-dep): Test $ns_appresdir instead of $ns_appdir. === modified file 'Makefile.in' --- Makefile.in 2010-05-16 23:21:06 +0000 +++ Makefile.in 2010-05-16 23:31:05 +0000 @@ -422,9 +422,9 @@ if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ rm -fr share ) ; \ - ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ + ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ rm -fr emacs ) ; \ - ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-24* ; \ + ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \ ln -sf ../libexec/* .) ; \ else true ; fi === modified file 'configure.in' --- configure.in 2010-05-16 23:01:56 +0000 +++ configure.in 2010-05-16 23:31:05 +0000 @@ -1459,17 +1459,20 @@ CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" TEMACS_LDFLAGS2="\${LDFLAGS}" +dnl I don't think it's especially important, but src/Makefile.in +dnl (now the only user of ns_appdir) used to go to the trouble of adding a +dnl trailing "/" to it, so now we do it here. if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes - ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS + ns_appdir=`pwd`/nextstep/Emacs.app/ + ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS/ ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes - ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=`pwd`/nextstep/Emacs.app + ns_appdir=`pwd`/nextstep/Emacs.app/ + ns_appbindir=`pwd`/nextstep/Emacs.app/ ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base dnl FIXME sourcing this 3 times in subshells seems inefficient. === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-16 23:01:56 +0000 +++ src/ChangeLog 2010-05-16 23:31:05 +0000 @@ -1,5 +1,8 @@ 2010-05-16 Glenn Morris + * Makefile.in (ns_appdir, ns_appbindir): Now configure adds the + trailing "/". + * Makefile.in (TEMACS_LDFLAGS2): New, set by configure. (temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-16 23:01:56 +0000 +++ src/Makefile.in 2010-05-16 23:31:05 +0000 @@ -224,8 +224,8 @@ ## $MSDOS_SUPPORT_REAL if MSDOS. MSDOS_SUPPORT = -ns_appdir=@ns_appdir@/ -ns_appbindir=@ns_appbindir@/ +ns_appdir=@ns_appdir@ +ns_appbindir=@ns_appbindir@ ns_appsrc=@ns_appsrc@ NS_OBJ=@NS_OBJ@ NS_SUPPORT=@NS_SUPPORT@ ------------------------------------------------------------ revno: 100326 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 16:21:06 -0700 message: Remove one variable from Makefile.in. * Makefile.in (ns_appdir): Remove. (install-arch-dep): Test $ns_appresdir instead of $ns_appdir. diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-16 23:01:56 +0000 +++ ChangeLog 2010-05-16 23:21:06 +0000 @@ -1,5 +1,8 @@ 2010-05-16 Glenn Morris + * Makefile.in (ns_appdir): Remove. + (install-arch-dep): Test $ns_appresdir instead of $ns_appdir. + * configure.in (TEMACS_LDFLAGS2): New output variable. * configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable. === modified file 'Makefile.in' --- Makefile.in 2010-05-15 00:48:53 +0000 +++ Makefile.in 2010-05-16 23:21:06 +0000 @@ -164,7 +164,6 @@ x_default_search_path=@x_default_search_path@ # Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa -ns_appdir=@ns_appdir@ ns_appbindir=@ns_appbindir@ ns_appresdir=@ns_appresdir@ @@ -418,7 +417,7 @@ ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \ else true; fi ; \ done - if test "${ns_appdir}" != ""; then \ + if test "${ns_appresdir}" != ""; then \ ( cd ${ns_appresdir} ; \ if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ ------------------------------------------------------------ revno: 100325 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 16:01:56 -0700 message: 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. diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-16 17:58:27 +0000 +++ ChangeLog 2010-05-16 23:01:56 +0000 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris + * 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, === modified file 'configure' --- configure 2010-05-16 17:58:27 +0000 +++ configure 2010-05-16 23:01:56 +0000 @@ -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 === modified file 'configure.in' --- configure.in 2010-05-16 17:58:27 +0000 +++ configure.in 2010-05-16 23:01:56 +0000 @@ -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= === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-05-16 17:58:27 +0000 +++ msdos/ChangeLog 2010-05-16 23:01:56 +0000 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris + * sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS). + * sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove. (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-05-16 17:58:27 +0000 +++ msdos/sed1v2.inp 2010-05-16 23:01:56 +0000 @@ -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@// === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-16 17:58:27 +0000 +++ src/ChangeLog 2010-05-16 23:01:56 +0000 @@ -1,5 +1,8 @@ 2010-05-16 Glenn Morris + * 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. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-16 17:58:27 +0000 +++ src/Makefile.in 2010-05-16 23:01:56 +0000 @@ -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} ) \ - -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 + $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ + ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \ + ${TEMACS_LDFLAGS2} \ + -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} prefix-args${EXEEXT}: prefix-args.o $(config_h) $(CC) $(LDFLAGS) prefix-args.o -o prefix-args ------------------------------------------------------------ revno: 100324 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-05-16 10:58:27 -0700 message: Simplify temacs build rule. * 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, nothing uses. * configure: Regenerate. * src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused. (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure. (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic. (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced. Make most of the NS_IMPL_GNUSTEP case the same as the default case. * msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove. (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty. diff: === modified file 'ChangeLog' --- ChangeLog 2010-05-16 05:58:55 +0000 +++ ChangeLog 2010-05-16 17:58:27 +0000 @@ -1,3 +1,10 @@ +2010-05-16 Glenn Morris + + * 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, + nothing uses. + 2010-05-16 Dan Nicolaescu * configure.in: Remove references to usg5-4 and bsd-common, $opsys === modified file 'configure' --- configure 2010-05-16 05:58:55 +0000 +++ configure 2010-05-16 17:58:27 +0000 @@ -718,6 +718,7 @@ LD_SWITCH_X_SITE_AUX LD_SWITCH_X_SITE_AUX_RPATH NS_IMPL_GNUSTEP_INC +NS_IMPL_GNUSTEP_TEMACS_LDFLAGS NS_OBJ NS_SUPPORT LIB_STANDARD @@ -795,8 +796,6 @@ ns_appbindir ns_appresdir ns_appsrc -GNUSTEP_SYSTEM_HEADERS -GNUSTEP_SYSTEM_LIBRARIES GNU_OBJC_CFLAGS OTHER_FILES FONT_OBJ @@ -9933,6 +9932,7 @@ NS_IMPL_COCOA=no NS_IMPL_GNUSTEP=no NS_IMPL_GNUSTEP_INC= +NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" @@ -9960,11 +9960,13 @@ include $GNUSTEP_MAKEFILES/Additional/gui.make shared=no " + NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" LIB_STANDARD= + START_FILES= fi if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5 @@ -10153,6 +10155,7 @@ fi + NS_OBJ= NS_SUPPORT= if test "${HAVE_NS}" = yes; then @@ -21594,7 +21597,7 @@ ## Use terminfo instead of termcap? ## Note only system files NOT using terminfo are: -## bsd-common, freebsd < 40000, ms-w32, msdos, netbsd, and +## freebsd < 40000, ms-w32, msdos, netbsd, and ## darwin|gnu without ncurses. TERMINFO=no LIBS_TERMCAP= @@ -26359,8 +26362,6 @@ - - cat >>confdefs.h <<_ACEOF #define EMACS_CONFIGURATION "${canonical}" _ACEOF === modified file 'configure.in' --- configure.in 2010-05-16 05:58:55 +0000 +++ configure.in 2010-05-16 17:58:27 +0000 @@ -1453,6 +1453,7 @@ NS_IMPL_COCOA=no NS_IMPL_GNUSTEP=no NS_IMPL_GNUSTEP_INC= +NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" @@ -1481,11 +1482,14 @@ include $GNUSTEP_MAKEFILES/Additional/gui.make shared=no " + dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes. + NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}" LIB_STANDARD= + START_FILES= fi AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], [AC_MSG_ERROR([`--with-ns' was specified, but the include @@ -1500,6 +1504,7 @@ fi fi AC_SUBST(NS_IMPL_GNUSTEP_INC) +AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) NS_OBJ= NS_SUPPORT= @@ -3051,8 +3056,6 @@ AC_SUBST(ns_appbindir) AC_SUBST(ns_appresdir) AC_SUBST(ns_appsrc) -AC_SUBST(GNUSTEP_SYSTEM_HEADERS) -AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES) AC_SUBST(GNU_OBJC_CFLAGS) AC_SUBST(OTHER_FILES) === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-05-15 22:33:24 +0000 +++ msdos/ChangeLog 2010-05-16 17:58:27 +0000 @@ -1,3 +1,8 @@ +2010-05-16 Glenn Morris + + * sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove. + (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty. + 2010-05-15 Glenn Morris * sed1v2.inp (LIBXMENU): Edit to empty. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-05-15 22:33:24 +0000 +++ msdos/sed1v2.inp 2010-05-16 17:58:27 +0000 @@ -99,7 +99,6 @@ /^NS_OBJ *=/s/@NS_OBJ@// /^NS_SUPPORT *=/s/@NS_SUPPORT@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// -/^GNUSTEP_SYSTEM_LIBRARIES *=/s/@GNUSTEP_SYSTEM_LIBRARIES@// /^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// @@ -123,6 +122,7 @@ /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// /^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@// +/^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@// /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! /^.\${libsrc}make-doc/s!>.*$!! /^[ ]*$/d === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-16 06:40:19 +0000 +++ src/ChangeLog 2010-05-16 17:58:27 +0000 @@ -1,5 +1,11 @@ 2010-05-16 Glenn Morris + * Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused. + (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure. + (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic. + (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced. + Make most of the NS_IMPL_GNUSTEP case the same as the default case. + * Makefile.in (temacs${EXEEXT}) [!NS_IMPL_GNUSTEP]: Remove ${STARTFLAGS}, nothing ever sets it. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-16 06:40:19 +0000 +++ src/Makefile.in 2010-05-16 17:58:27 +0000 @@ -226,9 +226,8 @@ ns_appsrc=@ns_appsrc@ NS_OBJ=@NS_OBJ@ NS_SUPPORT=@NS_SUPPORT@ -## Next two only set if NS_IMPL_GNUSTEP. +## Only set if NS_IMPL_GNUSTEP. GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ -GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@ ## Empty if !HAVE_X_WINDOWS ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT @@ -287,6 +286,10 @@ /* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. */ @NS_IMPL_GNUSTEP_INC@ +/* FIXME move to LD_SWITCH_SYSTEM_TEMACS? + This uses ${CONFIG_SYSTEM_LIBS}, presumably set by the above include. */ +NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@ + /* DO NOT use -R. There is a special hack described in lastfile.c which is used instead. Some initialized data areas are modified at initial startup, then labeled as part of the text area when @@ -357,6 +360,12 @@ #endif /* not ORDINARY_LINK */ + +#ifdef NS_IMPL_GNUSTEP +LD=$(CC) -rdynamic +#endif + + /* lastfile must follow all files whose initialized data areas should be dumped as pure by dump-emacs. */ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ @@ -670,16 +679,16 @@ buildobj.h: Makefile echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h -/* FIXME LOCALCPP not defined or mentioned anywhere. */ -temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} +temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT} #ifdef NS_IMPL_GNUSTEP - $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ - -L$(GNUSTEP_SYSTEM_LIBRARIES) -lgnustep-gui -lgnustep-base \ - -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ - ${obj} ${otherobj} ${LIBES} + $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ + ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \ + -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} #else - $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) $(LDFLAGS) \ - -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} + $(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) ------------------------------------------------------------ revno: 100323 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-05-15 23:40:19 -0700 message: Remove unused Makefile variables STARTFLAGS. * src/Makefile.in (temacs${EXEEXT}) [!NS_IMPL_GNUSTEP]: Remove ${STARTFLAGS}, nothing ever sets it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-05-16 05:40:10 +0000 +++ src/ChangeLog 2010-05-16 06:40:19 +0000 @@ -1,3 +1,8 @@ +2010-05-16 Glenn Morris + + * Makefile.in (temacs${EXEEXT}) [!NS_IMPL_GNUSTEP]: + Remove ${STARTFLAGS}, nothing ever sets it. + 2010-05-16 Dan Nicolaescu * m/ia64.h (UNEXEC): Remove, set in s/*.h. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-05-16 00:30:14 +0000 +++ src/Makefile.in 2010-05-16 06:40:19 +0000 @@ -678,9 +678,8 @@ -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ ${obj} ${otherobj} ${LIBES} #else - $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ - -o temacs ${START_FILES} ${obj} ${otherobj} \ - ${LIBES} + $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) $(LDFLAGS) \ + -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} #endif prefix-args${EXEEXT}: prefix-args.o $(config_h)