From 8a95f0e78ca60d58d41aa3224b6912393a98ca1f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 May 2010 17:21:58 -0700 Subject: [PATCH] * src/Makefile.in (LIBX_OTHER): Move out of cpp section. --- src/ChangeLog | 2 ++ src/Makefile.in | 6 +++--- 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 @@ 2010-05-16 Glenn Morris + * Makefile.in (LIBX_OTHER): Move out of cpp section. + * Makefile.in (LIBXT): Always define. 2010-05-15 Glenn Morris 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@ ## 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 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) 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". -- 2.39.5