[Emacs-diffs] /srv/bzr/emacs/trunk r100332: Combine the two stamp-oldxmenu cases.

[Glenn Morris]

------------------------------------------------------------
revno: 100332
committer: Glenn Morris <address@hidden>
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}.
modified:
  ChangeLog
  configure
  configure.in
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed1x.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-16 23:38:13 +0000
+++ b/ChangeLog 2010-05-17 05:15:03 +0000
@@ -1,3 +1,7 @@
+2010-05-17  Glenn Morris  <address@hidden>
+
+       * configure.in (OLDXMENU_DEPS): New output variable.
+
 2010-05-16  Glenn Morris  <address@hidden>
 
        * configure.in (ns_appbindir, ns_appresdir): Set using $ns_appdir.

=== modified file 'configure'
--- a/configure 2010-05-16 23:38:13 +0000
+++ b/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'
--- a/configure.in      2010-05-16 23:38:13 +0000
+++ b/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'
--- a/msdos/ChangeLog   2010-05-16 23:01:56 +0000
+++ b/msdos/ChangeLog   2010-05-17 05:15:03 +0000
@@ -1,3 +1,8 @@
+2010-05-17  Glenn Morris  <address@hidden>
+
+       * sed1v2.inp (OLDXMENU_DEPS): Edit to empty.
+       * sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}.
+
 2010-05-16  Glenn Morris  <address@hidden>
 
        * sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-16 23:01:56 +0000
+++ b/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'
--- a/msdos/sed1x.inp   2010-05-15 22:33:24 +0000
+++ b/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'
--- a/src/ChangeLog     2010-05-17 00:01:22 +0000
+++ b/src/ChangeLog     2010-05-17 05:15:03 +0000
@@ -1,3 +1,8 @@
+2010-05-17  Glenn Morris  <address@hidden>
+
+       * Makefile.in (OLDXMENU_DEPS): New, set by configure.
+       (stamp-oldxmenu): Use $OLDXMENU_DEPS.
+
 2010-05-16  Glenn Morris  <address@hidden>
 
        * Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-17 00:01:22 +0000
+++ b/src/Makefile.in   2010-05-17 05:15:03 +0000
@@ -180,6 +180,12 @@
 ## Else ${oldXMenudir}libXMenu11.a.
 address@hidden@
 
+## 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. 
address@hidden@
+
 ## 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."