aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-05-15 17:02:13 -0700
committerGlenn Morris2010-05-15 17:02:13 -0700
commit676b630493f1298ded115d1a2762221c72e09cdc (patch)
tree1bede160c3dfcc33a78a62dc0a0ff180ff0287b8 /src
parent1dea46ded2dc826b3d28473426cc8654c2f9df8f (diff)
downloademacs-676b630493f1298ded115d1a2762221c72e09cdc.tar.gz
emacs-676b630493f1298ded115d1a2762221c72e09cdc.zip
* src/Makefile.in (LIBXT): Always define.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f64e82689e9..90d089db9cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-05-16 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (LIBXT): Always define.
4
12010-05-15 Glenn Morris <rgm@gnu.org> 52010-05-15 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (OLDXMENU, LIBXMENU, LIBX_OTHER): Always define. 7 * Makefile.in (OLDXMENU, LIBXMENU, LIBX_OTHER): Always define.
diff --git a/src/Makefile.in b/src/Makefile.in
index 477336a929d..6031e159da8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -187,6 +187,9 @@ XOBJ=@XOBJ@
187 187
188TOOLKIT_LIBW=@TOOLKIT_LIBW@ 188TOOLKIT_LIBW=@TOOLKIT_LIBW@
189 189
190## Only used if HAVE_X11, in LIBX_OTHER.
191LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
192
190LIBSOUND= @LIBSOUND@ 193LIBSOUND= @LIBSOUND@
191CFLAGS_SOUND= @CFLAGS_SOUND@ 194CFLAGS_SOUND= @CFLAGS_SOUND@
192 195
@@ -305,7 +308,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
305 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< 308 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
306 309
307#ifdef HAVE_X_WINDOWS 310#ifdef HAVE_X_WINDOWS
308LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
309LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) 311LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
310#endif /* HAVE_X_WINDOWS */ 312#endif /* HAVE_X_WINDOWS */
311 313