From 16455a8509026404dcba9a1adfe389883b3ef990 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 16 May 2010 22:15:03 -0700 Subject: [PATCH] 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}. --- ChangeLog | 4 ++++ configure | 5 +++++ configure.in | 4 ++++ msdos/ChangeLog | 5 +++++ msdos/sed1v2.inp | 1 + msdos/sed1x.inp | 1 + src/ChangeLog | 5 +++++ src/Makefile.in | 23 ++++++++++++----------- 8 files changed, 37 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65a32fc5789..733fb8d1acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/configure b/configure index 6c6c97e56e1..e4eb0514da1 100755 --- a/configure +++ b/configure @@ -809,6 +809,7 @@ OLDXMENU_TARGET OLDXMENU LIBXMENU LIBX_OTHER +OLDXMENU_DEPS CYGWIN_OBJ PRE_ALLOC_OBJ POST_ALLOC_OBJ @@ -26488,6 +26489,7 @@ _ACEOF 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 @@ else 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 diff --git a/configure.in b/configure.in index 2f5abe3a5f9..e667a5f1e05 100644 --- a/configure.in +++ b/configure.in @@ -3159,6 +3159,7 @@ if test "${HAVE_X11}" = "yes" ; then 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 @@ else 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, diff --git a/msdos/ChangeLog b/msdos/ChangeLog index c9c7aff49fc..6763fcd6878 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -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). diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 523483a796a..ac088cdcf86 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -84,6 +84,7 @@ s/\.h\.in/.h-in/ /^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@// diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index 5e8542846e0..d0e0734651f 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -8,6 +8,7 @@ s/DOC/DOC-X/g /^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! diff --git a/src/ChangeLog b/src/ChangeLog index 8c7bcad885b..eedd0474dc2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/Makefile.in b/src/Makefile.in index 5136ca4ca57..c99c7ae65d2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -180,6 +180,12 @@ OLDXMENU_TARGET=@OLDXMENU_TARGET@ ## 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 @@ really-oldXMenu: @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." -- 2.39.5