[Emacs-diffs] /srv/bzr/emacs/trunk r100311: Always define OLDXMENU in src/Makefile.in.

[Glenn Morris]

------------------------------------------------------------
revno: 100311
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-15 15:01:22 -0700
message:
  Always define OLDXMENU in src/Makefile.in.
  
  * src/Makefile.in (OLDXMENU): Always define.
  
  * msdos/sed1v2.inp (OLDXMENU): Edit to empty.
  * msdos/sed1x.inp (OLDXMENU): Expect empty initial value.
modified:
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed1x.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-15 21:51:12 +0000
+++ b/msdos/ChangeLog   2010-05-15 22:01:22 +0000
@@ -1,5 +1,8 @@
 2010-05-15  Glenn Morris  <address@hidden>
 
+       * sed1v2.inp (OLDXMENU): Edit to empty.
+       * sed1x.inp (OLDXMENU): Expect empty initial value.
+
        * sed1v2.inp (LIBX_OTHER): Edit to empty.
        * sed1x.inp (LIBX_OTHER): Expect empty initial value.
 

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-15 21:47:58 +0000
+++ b/msdos/sed1v2.inp  2010-05-15 22:01:22 +0000
@@ -112,6 +112,7 @@
 /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@//
 /^LIBGPM *=/s/@LIBGPM@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
+/^OLDXMENU *=/s/@OLDXMENU@//
 /^LIBX_OTHER *=/s/@LIBX_OTHER@//
 /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
 /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/

=== modified file 'msdos/sed1x.inp'
--- a/msdos/sed1x.inp   2010-05-15 21:47:58 +0000
+++ b/msdos/sed1x.inp   2010-05-15 22:01:22 +0000
@@ -4,7 +4,7 @@
 s!^    cd \${oldXMenudir}; \${MAKE}.*$!        ${MAKE} -C ${oldXMenudir}.!
 s!^    @true *$!       @rem!
 s/DOC/DOC-X/g
-/^OLDXMENU *=/address@hidden@!${oldXMenudir}libXMenu11.a!
+/^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a!
 /^LIBXMENU *=/address@hidden@!${OLDXMENU}!
 /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!
 /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-15 21:47:58 +0000
+++ b/src/ChangeLog     2010-05-15 22:01:22 +0000
@@ -1,6 +1,6 @@
 2010-05-15  Glenn Morris  <address@hidden>
 
-       * Makefile.in (LIBX_OTHER): Always define.
+       * Makefile.in (OLDXMENU, LIBX_OTHER): Always define.
 
        * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
        (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-15 21:47:58 +0000
+++ b/src/Makefile.in   2010-05-15 22:01:22 +0000
@@ -294,8 +294,12 @@
 #endif
        $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
+/* If !HAVE_X11 || USE_GTK, empty.
+   Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
+   Else ${oldXMenudir}libXMenu11.a.  */
address@hidden@
+
 #ifdef HAVE_X_WINDOWS
address@hidden@
 address@hidden@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)