From: Glenn Morris Date: Sun, 16 May 2010 00:02:13 +0000 (-0700) Subject: * src/Makefile.in (LIBXT): Always define. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~208^2~34 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=676b630493f1298ded115d1a2762221c72e09cdc;p=emacs.git * src/Makefile.in (LIBXT): Always define. --- diff --git a/src/ChangeLog b/src/ChangeLog index f64e82689e9..90d089db9cd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-16 Glenn Morris + + * Makefile.in (LIBXT): Always define. + 2010-05-15 Glenn Morris * 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@ TOOLKIT_LIBW=@TOOLKIT_LIBW@ +## Only used if HAVE_X11, in LIBX_OTHER. +LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -305,7 +308,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< #ifdef HAVE_X_WINDOWS -LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) #endif /* HAVE_X_WINDOWS */