Mercurial > emacs
changeset 108615:c82cd792792d
* src/Makefile.in (LIBX_OTHER): Move out of cpp section.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 15 May 2010 17:21:58 -0700 |
| parents | f710179e77ab |
| children | 2ac105f2b2ac |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat May 15 17:02:13 2010 -0700 +++ b/src/ChangeLog Sat May 15 17:21:58 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris <rgm@gnu.org> + * Makefile.in (LIBX_OTHER): Move out of cpp section. + * Makefile.in (LIBXT): Always define. 2010-05-15 Glenn Morris <rgm@gnu.org>
--- a/src/Makefile.in Sat May 15 17:02:13 2010 -0700 +++ b/src/Makefile.in Sat May 15 17:21:58 2010 -0700 @@ -190,6 +190,9 @@ ## Only used if HAVE_X11, in LIBX_OTHER. LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) +## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. +LIBX_OTHER=@LIBX_OTHER@ + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -311,9 +314,6 @@ LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) #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 redefined LD to something odd, like "gcc".