Commit 4235ca47 authored by Glenn Morris's avatar Glenn Morris

Always define LIBXMENU in src/Makefile.in.

* configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.

* src/Makefile.in (LIBXMENU): Always define.

* msdos/sed1v2.inp (LIBXMENU): Edit to empty.
* msdos/sed1x.inp (LIBXMENU): Expect empty initial value.
parent c0b0aed5
2010-05-15 Glenn Morris <rgm@gnu.org>
* configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.
* configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.
2010-05-15 Ken Raeburn <raeburn@raeburn.org>
......
......@@ -3152,7 +3152,12 @@ if test "${HAVE_X11}" = "yes" ; then
LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
else
OLDXMENU=
LIBXMENU="-lXMenu"
## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?).
if test "${HAVE_X_WINDOWS}" = "yes"; then
LIBXMENU="-lXMenu"
else
LIBXMENU=
fi
LIBX_OTHER=
fi
......
2010-05-15 Glenn Morris <rgm@gnu.org>
* sed1v2.inp (LIBXMENU): Edit to empty.
* sed1x.inp (LIBXMENU): Expect empty initial value.
* sed1v2.inp (OLDXMENU): Edit to empty.
* sed1x.inp (OLDXMENU): Expect empty initial value.
......
......@@ -113,6 +113,7 @@ s/\.h\.in/.h-in/
/^LIBGPM *=/s/@LIBGPM@//
/^EXEEXT *=/s/@EXEEXT@/.exe/
/^OLDXMENU *=/s/@OLDXMENU@//
/^LIBXMENU *=/s/@LIBXMENU@//
/^LIBX_OTHER *=/s/@LIBX_OTHER@//
/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
......
......@@ -5,7 +5,7 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.!
s!^ @true *$! @rem!
s/DOC/DOC-X/g
/^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a!
/^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}!
/^LIBXMENU *=/s!= *!= ${OLDXMENU}!
/^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!
/^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!
/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
......
2010-05-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (OLDXMENU, LIBX_OTHER): Always define.
* Makefile.in (OLDXMENU, LIBXMENU, LIBX_OTHER): Always define.
* Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
......
......@@ -177,6 +177,11 @@ OLDXMENU_TARGET=@OLDXMENU_TARGET@
## Else ${oldXMenudir}libXMenu11.a.
OLDXMENU=@OLDXMENU@
## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible).
## Else if !HAVE_X11 || USE_GTK, empty.
## Else $(OLDXMENU).
LIBXMENU=@LIBXMENU@
XMENU_OBJ=@XMENU_OBJ@
XOBJ=@XOBJ@
......@@ -300,7 +305,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
#ifdef HAVE_X_WINDOWS
LIBXMENU=@LIBXMENU@
LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
#endif /* HAVE_X_WINDOWS */
......
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