Mercurial > emacs
changeset 108610:4cbe9b411630
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 15 May 2010 15:01:22 -0700 |
| parents | cd68e3a31ac4 |
| children | a32b146e01b5 |
| files | msdos/ChangeLog msdos/sed1v2.inp msdos/sed1x.inp src/ChangeLog src/Makefile.in |
| diffstat | 5 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Sat May 15 14:51:12 2010 -0700 +++ b/msdos/ChangeLog Sat May 15 15:01:22 2010 -0700 @@ -1,5 +1,8 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * 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.
--- a/msdos/sed1v2.inp Sat May 15 14:51:12 2010 -0700 +++ b/msdos/sed1v2.inp Sat May 15 15:01:22 2010 -0700 @@ -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)/
--- a/msdos/sed1x.inp Sat May 15 14:51:12 2010 -0700 +++ b/msdos/sed1x.inp Sat May 15 15:01:22 2010 -0700 @@ -4,7 +4,7 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! s!^ @true *$! @rem! s/DOC/DOC-X/g -/^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! +/^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a! /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}! /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!
--- a/src/ChangeLog Sat May 15 14:51:12 2010 -0700 +++ b/src/ChangeLog Sat May 15 15:01:22 2010 -0700 @@ -1,6 +1,6 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> - * 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.
--- a/src/Makefile.in Sat May 15 14:51:12 2010 -0700 +++ b/src/Makefile.in Sat May 15 15:01:22 2010 -0700 @@ -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. */ +OLDXMENU=@OLDXMENU@ + #ifdef HAVE_X_WINDOWS -OLDXMENU=@OLDXMENU@ LIBXMENU=@LIBXMENU@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)