Commit 3545021d authored by Glenn Morris's avatar Glenn Morris

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.
parent 9fad8b97
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.
......
......@@ -112,6 +112,7 @@ s/\.h\.in/.h-in/
/^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)/
......
......@@ -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!
......
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.
......
......@@ -294,8 +294,12 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
#endif
$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
#ifdef HAVE_X_WINDOWS
/* If !HAVE_X11 || USE_GTK, empty.
Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
Else ${oldXMenudir}libXMenu11.a. */
OLDXMENU=@OLDXMENU@
#ifdef HAVE_X_WINDOWS
LIBXMENU=@LIBXMENU@
LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment