procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/Makefile.in (LIBX_BASE): Always define.

Browse source
This commit is contained in:
Glenn Morris 2010-05-15 17:30:14 -07:00
parent 8a95f0e78c
commit 9beab9ced3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
2010-05-16 Glenn Morris <rgm@gnu.org>
* Makefile.in (LIBX_BASE): Always define.
* Makefile.in (LIBX_OTHER): Move out of cpp section.
* Makefile.in (LIBXT): Always define.

9
src/Makefile.in
View file

@ -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