[Emacs-diffs] trunk r117439: * src/Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):

[Glenn Morris]

------------------------------------------------------------
revno: 117439
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-06-28 16:35:17 -0700
message:
  * src/Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):
  Fully revert earlier dumbness.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-28 23:19:04 +0000
+++ b/src/ChangeLog     2014-06-28 23:35:17 +0000
@@ -1,9 +1,7 @@
 2014-06-28  Glenn Morris  <address@hidden>
 
-       * Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):
-       Remove prerequisites, sub-makes will figure it out.
-       (FORCE): Remove.
-       (mostlyclean): There are no libXMenu11.a, liblw.a in this directory.
+       * Makefile.in (mostlyclean): There are no libXMenu11.a,
+       liblw.a in this directory.
 
 2014-06-28  Andreas Schwab  <address@hidden>
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2014-06-28 23:29:06 +0000
+++ b/src/Makefile.in   2014-06-28 23:35:17 +0000
@@ -498,12 +498,12 @@
 
 ## The following oldxmenu-related rules are only (possibly) used if
 ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
-
-## This one needs globals.h to exist, eg for Vinstallation_directory.
-$(lwlibdir)/liblw.a: globals.h
+$(lwlibdir)/liblw.a: $(config_h) globals.h lisp.h FORCE
        $(MAKE) -C $(lwlibdir) liblw.a
-$(oldXMenudir)/libXMenu11.a:
+$(oldXMenudir)/libXMenu11.a: FORCE
        $(MAKE) -C $(oldXMenudir) libXMenu11.a
+FORCE:
+.PHONY: FORCE
 
 ../config.status: config.in epaths.in
        @echo "The file ${?:.in=.h} needs to be set up from $?."