aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-15 17:21:58 -0700
committerGlenn Morris2010-05-15 17:21:58 -0700
commit8a95f0e78ca60d58d41aa3224b6912393a98ca1f (patch)
treed7d2b35635538cbee6efef909cd97f095aa85823
parent676b630493f1298ded115d1a2762221c72e09cdc (diff)
downloademacs-8a95f0e78ca60d58d41aa3224b6912393a98ca1f.tar.gz
emacs-8a95f0e78ca60d58d41aa3224b6912393a98ca1f.zip
* src/Makefile.in (LIBX_OTHER): Move out of cpp section.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/Makefile.in6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 90d089db9cd..3ead531896c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-05-16 Glenn Morris <rgm@gnu.org> 12010-05-16 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (LIBX_OTHER): Move out of cpp section.
4
3 * Makefile.in (LIBXT): Always define. 5 * Makefile.in (LIBXT): Always define.
4 6
52010-05-15 Glenn Morris <rgm@gnu.org> 72010-05-15 Glenn Morris <rgm@gnu.org>
diff --git a/src/Makefile.in b/src/Makefile.in
index 6031e159da8..61e2fbb671c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -190,6 +190,9 @@ TOOLKIT_LIBW=@TOOLKIT_LIBW@
190## Only used if HAVE_X11, in LIBX_OTHER. 190## Only used if HAVE_X11, in LIBX_OTHER.
191LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) 191LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
192 192
193## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
194LIBX_OTHER=@LIBX_OTHER@
195
193LIBSOUND= @LIBSOUND@ 196LIBSOUND= @LIBSOUND@
194CFLAGS_SOUND= @CFLAGS_SOUND@ 197CFLAGS_SOUND= @CFLAGS_SOUND@
195 198
@@ -311,9 +314,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
311LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) 314LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
312#endif /* HAVE_X_WINDOWS */ 315#endif /* HAVE_X_WINDOWS */
313 316
314/* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. */
315LIBX_OTHER=@LIBX_OTHER@
316
317/* A macro which other sections of Makefile can redefine to munge the 317/* A macro which other sections of Makefile can redefine to munge the
318 flags before they are passed to LD. This is helpful if you have 318 flags before they are passed to LD. This is helpful if you have
319 redefined LD to something odd, like "gcc". 319 redefined LD to something odd, like "gcc".