From 02d4ac0e26631fa0b9fd41d1bf039cd34c4ae8b0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 May 2010 14:47:58 -0700 Subject: [PATCH] Always define LIBX_OTHER in src/Makefile.in. * src/Makefile.in (LIBX_OTHER): Always define. * msdos/sed1v2.inp (LIBX_OTHER): Edit to empty. * msdos/sed1x.inp (LIBX_OTHER): Expect empty initial value. --- msdos/sed1v2.inp | 1 + msdos/sed1x.inp | 2 +- src/ChangeLog | 2 ++ src/Makefile.in | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 3a10a8ada11..899af98ef67 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -112,6 +112,7 @@ s/\.h\.in/.h-in/ /^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// /^LIBGPM *=/s/@LIBGPM@// /^EXEEXT *=/s/@EXEEXT@/.exe/ +/^LIBX_OTHER *=/s/@LIBX_OTHER@// /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/ diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index cb86d0251cb..1eca4e819cb 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -6,7 +6,7 @@ s!^ @true *$! @rem! s/DOC/DOC-X/g /^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! -/^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}! +/^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}! /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! diff --git a/src/ChangeLog b/src/ChangeLog index 76b4e70c7bc..75fc5532904 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-05-15 Glenn Morris + * Makefile.in (LIBX_OTHER): Always define. + * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ. (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ. diff --git a/src/Makefile.in b/src/Makefile.in index ede7d722543..cfb057a4085 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -299,9 +299,10 @@ OLDXMENU=@OLDXMENU@ LIBXMENU=@LIBXMENU@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) -LIBX_OTHER=@LIBX_OTHER@ #endif /* HAVE_X_WINDOWS */ +/* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. */ +LIBX_OTHER=@LIBX_OTHER@ /* A macro which other sections of Makefile can redefine to munge the flags before they are passed to LD. This is helpful if you have -- 2.39.5