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

Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.

Browse source 
This simplifies the previous change to configure.ac and src/Makefile.in.
This commit is contained in:
Paul Eggert 2013-11-21 09:26:55 -08:00
parent 06e752b48f
commit 4e8b693819
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,9 +1,10 @@
2013-11-21 Paul Eggert <eggert@cs.ucla.edu>
Fix some dependency problems that cause unnecessary recompiles.
* configure.ac (OLDXMENU_TARGET, OLDXMENU, LIBXMENU, OLDXMENU_DEPS):
* configure.ac (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS):
Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New vars.
(LIBXMENU): Now is always either empty or a file name,
so that it can be used as a dependency.
2013-11-20 Glenn Morris <rgm@gnu.org>

12
configure.ac
View file

@ -4615,17 +4615,13 @@ AC_SUBST(LIBX_OTHER)
if test "$HAVE_GTK" = yes ||
test "$HAVE_MENUS" != yes || test "$HAVE_X11" != yes; then
LIBXMENU_DIR=
LIBXMENU_BASE=
LIBXMENU=
elif test "$USE_X_TOOLKIT" = none; then
LIBXMENU_DIR='$(oldXMenudir)/'
LIBXMENU_BASE='libXMenu11.a'
LIBXMENU='$(oldXMenudir)/libXMenu11.a'
else
LIBXMENU_DIR='$(lwlibdir)/'
LIBXMENU_BASE='liblw.a'
LIBXMENU='$(lwlibdir)/liblw.a'
fi
AC_SUBST(LIBXMENU_DIR)
AC_SUBST(LIBXMENU_BASE)
AC_SUBST(LIBXMENU)
if test "${HAVE_MENUS}" = "yes" ; then
AC_DEFINE(HAVE_MENUS, 1,

2
src/ChangeLog
View file

@ -6,8 +6,6 @@
* Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS)
(really-lwlib, really-oldXMenu, stamp-oldxmenu)
(../src/$(OLDXMENU), $(OLDXMENU)): Remove.
(LIBXMENU_DIR, LIBXMENU_BASE): New macros.
(LIBXMENU): Use them.
(temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
(boostrap-clean): No need to remove stamp-oldxmenu.

8
src/Makefile.in
View file

@ -181,11 +181,7 @@ LIBXT_OTHER=@LIBXT_OTHER@
## If !HAVE_X11 || USE_GTK, empty.
## Else if USE_X_TOOLKIT, $(lwlibdir)/liblw.a.
## Else $(oldXMenudir)/libXMenu11.a.
## LIBXMENU_DIR is the directory part, including any slash;
## LIBXMENU_BASE is the rest.
LIBXMENU_DIR=@LIBXMENU_DIR@
LIBXMENU_BASE=@LIBXMENU_BASE@
LIBXMENU=$(LIBXMENU_DIR)$(LIBXMENU_BASE)
LIBXMENU=@LIBXMENU@
## xmenu.o if HAVE_X_WINDOWS, else empty.
XMENU_OBJ=@XMENU_OBJ@
@ -204,7 +200,7 @@ LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
LIBX_OTHER=@LIBX_OTHER@
## LIBXMENU is nil if !HAVE_X_WINDOWS.
## LIBXMENU is empty 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.