From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 21 Nov 2013 17:26:55 +0000 (-0800)
Subject: Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~757
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e8b693819c766e3c5c66096f500802559d9e124;p=emacs.git

Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.

This simplifies the previous change to configure.ac and src/Makefile.in.
---

diff --git a/ChangeLog b/ChangeLog
index 6ebc48fadd8..0c9dedf1b42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
diff --git a/configure.ac b/configure.ac
index f01fa4c079a..3e4e17e9d50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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,
diff --git a/src/ChangeLog b/src/ChangeLog
index 1a8ac2190a3..769b4ca6e64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/Makefile.in b/src/Makefile.in
index c110f3158d9..dd641e0eb19 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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.