From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 21 Jan 1997 05:26:30 +0000 (+0000)
Subject: (stamp-oldxmenu): New target.
X-Git-Tag: emacs-20.1~3032
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=084f76ff7ff28d6a111740a7c5ad197a91f15b52;p=emacs.git

(stamp-oldxmenu): New target.
(temacs): Depend on stamp-oldxmenu, not on ${OLDXMENU}.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 15f87f643bc..cb13ecfc7fa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -760,7 +760,7 @@ ${libsrc}make-docfile:
 #define MAKE_PARALLEL
 #endif
 
-temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) $(OLDXMENU) ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args
+temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args
 	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES}
@@ -807,6 +807,13 @@ shortnames:
 
 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
 
+/* We use stamp-xmenu with these two deps
+   to both ensure that lwlib gets remade based on its dependencies
+   in its own makefile,
+   and remake temacs if lwlib gets changed by this.  */
+stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) 
+	touch stamp-oldxmenu
+
 #ifdef USE_X_TOOLKIT
 $(OLDXMENU): really-lwlib