# HG changeset patch # User Glenn Morris # Date 1273969318 25200 # Node ID c82cd792792dbd2a78e200bdcfb05fe976954f49 # Parent f710179e77abc662d2b17468ab92b5262ddab071 * src/Makefile.in (LIBX_OTHER): Move out of cpp section. diff -r f710179e77ab -r c82cd792792d src/ChangeLog --- a/src/ChangeLog Sat May 15 17:02:13 2010 -0700 +++ b/src/ChangeLog Sat May 15 17:21:58 2010 -0700 @@ -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 -r f710179e77ab -r c82cd792792d src/Makefile.in --- a/src/Makefile.in Sat May 15 17:02:13 2010 -0700 +++ b/src/Makefile.in Sat May 15 17:21:58 2010 -0700 @@ -190,6 +190,9 @@ ## 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 @@ 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".