From 78cc32a19125350a7fc40623f93320b5718f1eb7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 28 Jun 2014 16:35:17 -0700 Subject: [PATCH] * src/Makefile.in ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a): Fully revert earlier dumbness. --- src/ChangeLog | 6 ++---- src/Makefile.in | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d96af327e47..d9f391982e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,7 @@ 2014-06-28 Glenn Morris - * 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 diff --git a/src/Makefile.in b/src/Makefile.in index ae16f023105..4d280c11da4 100644 --- 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 $?." -- 2.39.2