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 --git a/ChangeLog b/ChangeLog
index 65a32fc5789e61b8f0e963cbbae33493e6b8b799..733fb8d1acbdffb46a30a407d46cc12500742404 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-17  Glenn Morris  <rgm@gnu.org>
+
+       * configure.in (OLDXMENU_DEPS): New output variable.
+
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
        * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.

diff --git a/configure b/configure
index 6c6c97e56e11973567bd4eb277bb3f807c87d02d..e4eb0514da15fdbe35d34e04d241313c52cd1749 100755 (executable)
--- 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 2f5abe3a5f9b802e52a7aca2343b27c7feba53cf..e667a5f1e05c7ee4348d900b8f46b20af0503ae1 100644 (file)
--- 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 c9c7aff49fc95c22306907ecfd2fb71a7239b3f5..6763fcd687843d884d5d2ba20cf990370dd60dc8 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-17  Glenn Morris  <rgm@gnu.org>
+
+       * sed1v2.inp (OLDXMENU_DEPS): Edit to empty.
+       * sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}.
+
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
        * sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 523483a796a7ce34e0e1300840cd5fd7e7b5bd8f..ac088cdcf8617f8bca589f4aa9d6987d0cb6bb76 100644 (file)
--- 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 5e8542846e079faf0e6bc025fd7249c94162c49f..d0e0734651fe485548ae2e5085ee66ee5a50d210 100644 (file)
--- 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 8c7bcad885bdf4d54f41825d318f9876b3ed207f..eedd0474dc2fdbd85f9e640410563140bdd2d46d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-17  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (OLDXMENU_DEPS): New, set by configure.
+       (stamp-oldxmenu): Use $OLDXMENU_DEPS.
+
 2010-05-16  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules.

diff --git a/src/Makefile.in b/src/Makefile.in
index 5136ca4ca57d67abfe4c8ee80b9a1095f79d5d70..c99c7ae65d2ad8d8554eacd2aab35da345664a1f 100644 (file)
--- 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."