From 9beab9ced31b55d5f7fbed0c3651d10c64ae8af2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 May 2010 17:30:14 -0700 Subject: [PATCH] * src/Makefile.in (LIBX_BASE): Always define. --- src/ChangeLog | 2 ++ src/Makefile.in | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3ead531896c..6847afcb9d6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris + * Makefile.in (LIBX_BASE): Always define. + * Makefile.in (LIBX_OTHER): Move out of cpp section. * Makefile.in (LIBXT): Always define. diff --git a/src/Makefile.in b/src/Makefile.in index 61e2fbb671c..a55fd6ed058 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -193,6 +193,12 @@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) ## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. LIBX_OTHER=@LIBX_OTHER@ +## LIBXMENU is nil if !HAVE_X_WINDOWS. +## LD_SWITCH_X_SITE should not be used if not using X, but nothing +## sets it at present, and if something ever does, it should be +## configure, which should set it to nil in non-X builds. +LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -310,9 +316,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) #endif $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< -#ifdef HAVE_X_WINDOWS -LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) -#endif /* HAVE_X_WINDOWS */ /* 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 -- 2.39.5