emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r115174: Use just LIBXMENU, not LIBXMENU_DIR and LIB


From: Paul Eggert
Subject: [Emacs-diffs] trunk r115174: Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.
Date: Thu, 21 Nov 2013 17:26:59 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115174
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-11-21 09:26:55 -0800
message:
  Use just LIBXMENU, not LIBXMENU_DIR and LIBXMENU_BASE.
  
  This simplifies the previous change to configure.ac and src/Makefile.in.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-11-21 07:50:57 +0000
+++ b/ChangeLog 2013-11-21 17:26:55 +0000
@@ -1,9 +1,10 @@
 2013-11-21  Paul Eggert  <address@hidden>
 
        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  <address@hidden>
 

=== modified file 'configure.ac'
--- a/configure.ac      2013-11-21 07:50:57 +0000
+++ b/configure.ac      2013-11-21 17:26:55 +0000
@@ -4615,17 +4615,13 @@
 
 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,

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-21 07:50:57 +0000
+++ b/src/ChangeLog     2013-11-21 17:26:55 +0000
@@ -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.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2013-11-21 07:50:57 +0000
+++ b/src/Makefile.in   2013-11-21 17:26:55 +0000
@@ -181,11 +181,7 @@
 ## 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.
address@hidden@
address@hidden@
-LIBXMENU=$(LIBXMENU_DIR)$(LIBXMENU_BASE)
address@hidden@
 
 ## xmenu.o if HAVE_X_WINDOWS, else empty.
 address@hidden@
@@ -204,7 +200,7 @@
 ## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
 address@hidden@
 
-## 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]