summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-12-01 21:36:53 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-12-01 21:36:53 +0000
commitf00723619f36a772efb0f7bd82fca8e053d4be6e (patch)
treecc5cc0771b9687fb344854e015b3c2a6796d4c78
parentd9995c0af063640258a9d410e636136d51764616 (diff)
Move back build of xtsscale with other apps. It doesn't require
an installed header anymore.
-rw-r--r--Makefile4
-rw-r--r--app/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 788d2d233..5efc5b539 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2009/11/26 22:53:50 matthieu Exp $
+# $OpenBSD: Makefile,v 1.33 2009/12/01 21:36:52 matthieu Exp $
.include <bsd.own.mk>
LOCALAPPD=/usr/local/lib/X11/app-defaults
@@ -16,7 +16,7 @@ XSERVER+= kdrive
.endif
SUBDIR= proto font/util data/bitmaps lib app data/xkbdata \
- ${XSERVER} driver app/xtsscale util doc
+ ${XSERVER} driver util doc
.ifndef NOFONTS
SUBDIR+= font
.endif
diff --git a/app/Makefile b/app/Makefile
index 1bc958ec4..3d538371f 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2009/11/26 22:53:50 matthieu Exp $
+# $OpenBSD: Makefile,v 1.25 2009/12/01 21:36:52 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 \
- xvctl
+ xtsscale xvctl
.include <bsd.subdir.mk>