From 81ec90969f0ed3f109fc3851d51c078ee1731b3c Mon Sep 17 00:00:00 2001
From: rtr <rtr@NetBSD.org>
Date: Sat, 7 Feb 2004 05:47:19 +0000
Subject: [PATCH] Re add ${MAKESTRS} and ${GENMATYPES} targets with updated
 paths into objdir.

---
 x11/lib/OSmesa/Makefile | 7 +++++--
 x11/lib/Xt/Makefile     | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/x11/lib/OSmesa/Makefile b/x11/lib/OSmesa/Makefile
index 7b1d7e524d7f..41571aa14877 100644
--- a/x11/lib/OSmesa/Makefile
+++ b/x11/lib/OSmesa/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2004/02/07 04:19:29 rtr Exp $
+#	$NetBSD: Makefile,v 1.9 2004/02/07 05:47:19 rtr Exp $
 
 NOLINT=		1	# XTODO: 3dnow.ln barfs on src/math/m_vertices.h
 
@@ -74,7 +74,10 @@ AFLAGS+=	-DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/SPARC
 GENMATYPESDIR!=	cd ${NETBSDSRCDIR}/x11/tools/gen_matypes && ${PRINTOBJDIR}
 GENMATYPES=	${GENMATYPESDIR}/gen_matypes
 
-matypes.h:
+${GENMATYPES}:
+	(cd ${NETBSDSRCDIR}/x11/tools/gen_matypes && ${MAKE})
+
+matypes.h: ${GENMATYPES}
 	${_MKTARGET_CREATE}
 	rm -f ${.TARGET}
 	${GENMATYPES} > ${.TARGET}
diff --git a/x11/lib/Xt/Makefile b/x11/lib/Xt/Makefile
index 98fdef34bc20..4379cc82079e 100644
--- a/x11/lib/Xt/Makefile
+++ b/x11/lib/Xt/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2004/02/07 04:15:33 rtr Exp $
+#	$NetBSD: Makefile,v 1.7 2004/02/07 05:47:19 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -35,11 +35,14 @@ DPADD+=	${LIBX11} ${LIBSM} ${LIBICE}
 MAKESTRSDIR!=	cd ${NETBSDSRCDIR}/x11/tools/makestrs && ${PRINTOBJDIR}
 MAKESTRS=	${MAKESTRSDIR}/makestrs
 
+${MAKESTRS}:
+	(cd ${NETBSDSRCDIR}/x11/tools/makestrs && ${MAKE})
+
 STRINGS_FILES=	StringDefs.c StringDefs.h Shell.h
 STRINGS_TMPLS=	util/StrDefs.ct util/StrDefs.ht util/Shell.ht
 STRINGS_LIST=	util/string.list
 
-${STRINGS_FILES}: ${STRINGS_LIST} ${STRINGS_TMPLS}
+${STRINGS_FILES}: ${MAKESTRS} ${STRINGS_LIST} ${STRINGS_TMPLS}
 	${_MKTARGET_CREATE}
 	rm -f ${.TARGET} util
 	ln -s ${X11SRCDIR.xc}/lib/${LIB}/util util