aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-05-15 14:47:58 -0700
committerGlenn Morris2010-05-15 14:47:58 -0700
commit02d4ac0e26631fa0b9fd41d1bf039cd34c4ae8b0 (patch)
tree12531412841909cdd3556cb7394cc653e730e851 /src
parent5929fbe7665a873ba101e3363a9db35f8508efda (diff)
downloademacs-02d4ac0e26631fa0b9fd41d1bf039cd34c4ae8b0.tar.gz
emacs-02d4ac0e26631fa0b9fd41d1bf039cd34c4ae8b0.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/Makefile.in3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 76b4e70c7bc..75fc5532904 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-05-15 Glenn Morris <rgm@gnu.org> 12010-05-15 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (LIBX_OTHER): Always define.
4
3 * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ. 5 * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
4 (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ. 6 (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
5 7
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@
299LIBXMENU=@LIBXMENU@ 299LIBXMENU=@LIBXMENU@
300LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) 300LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
301LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) 301LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
302LIBX_OTHER=@LIBX_OTHER@
303#endif /* HAVE_X_WINDOWS */ 302#endif /* HAVE_X_WINDOWS */
304 303
304/* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. */
305LIBX_OTHER=@LIBX_OTHER@
305 306
306/* A macro which other sections of Makefile can redefine to munge the 307/* A macro which other sections of Makefile can redefine to munge the
307 flags before they are passed to LD. This is helpful if you have 308 flags before they are passed to LD. This is helpful if you have