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}.

2 files changed, 17 insertions, 11 deletions

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  <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 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."