Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 09:14:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Always define LIBX_OTHER in src/Makefile.in.

Browse source 
* src/Makefile.in (LIBX_OTHER): Always define.

* msdos/sed1v2.inp (LIBX_OTHER): Edit to empty.
* msdos/sed1x.inp (LIBX_OTHER): Expect empty initial value.
This commit is contained in:
Glenn Morris 2010-05-15 14:47:58 -07:00
parent 5929fbe766
commit 02d4ac0e26
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
msdos/sed1v2.inp
View file

@ -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/

2
msdos/sed1x.inp
View file

@ -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!

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
2010-05-15 Glenn Morris <rgm@gnu.org>
* Makefile.in (LIBX_OTHER): Always define.
* Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.

3
src/Makefile.in
View file

@ -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