* src/Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a):

Fully revert earlier dumbness.

diff --git a/src/ChangeLog b/src/ChangeLog
index d96af32..d9f3919 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,7 @@
 2014-06-28  Glenn Morris  <rgm@gnu.org>
 
-       * 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  <schwab@linux-m68k.org>
 

diff --git a/src/Makefile.in b/src/Makefile.in
index ae16f02..4d280c1 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -498,12 +498,12 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
 
 ## 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 $?."