From e58626a0cd696c901d58d8afeaebc92127c77471 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Thu, 26 Nov 2009 22:53:50 +0000
Subject: [PATCH] Move app/xtsscale build after drivers, since it requires a
 header installed by driver/xf86-input-ws. Problem noticed by jdixon@

---
 Makefile     | 5 +++--
 app/Makefile | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cfc53e0ef..788d2d233 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2009/10/01 19:48:31 matthieu Exp $
+# $OpenBSD: Makefile,v 1.32 2009/11/26 22:53:50 matthieu Exp $
 .include <bsd.own.mk>
 
 LOCALAPPD=/usr/local/lib/X11/app-defaults
@@ -15,7 +15,8 @@ XSERVER= xserver
 XSERVER+= kdrive
 .endif
 
-SUBDIR= proto data/bitmaps lib app data/xkbdata ${XSERVER} driver util doc
+SUBDIR= proto font/util data/bitmaps lib app data/xkbdata \
+	${XSERVER} driver app/xtsscale util doc
 .ifndef NOFONTS
 SUBDIR+= font
 .endif
diff --git a/app/Makefile b/app/Makefile
index d0e386448..1bc958ec4 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2009/10/04 15:01:49 matthieu Exp $
+# $OpenBSD: Makefile,v 1.24 2009/11/26 22:53:50 matthieu Exp $
 .include <bsd.xconf.mk>
 
 SUBDIR= bdftopcf mkfontscale mkfontdir \
@@ -31,7 +31,7 @@ SUBDIR +=   xdriinfo glxgears glxinfo
 
 # extras
 SUBDIR += cwm fvwm ssh-askpass xterm xidle xlockmore xsystrace \
-	  xtsscale xvctl
+	  xvctl
 
 .include <bsd.subdir.mk>