diff options
| author |   jsg <jsg@openbsd.org> | 2016-03-31 01:28:00 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2016-03-31 01:28:00 +0000 |
| commit | 92da69a4623aed55bdfd7bffd9c30a997bca079e (patch) | |
| tree | 03b81192d00bd19666ba8d33b906f657bc752e44 | |
| parent | Dump strdup()/free() dance and just use a local buffer to translate help (diff) | |
| download | wireguard-openbsd-92da69a4623aed55bdfd7bffd9c30a997bca079e.tar.xz wireguard-openbsd-92da69a4623aed55bdfd7bffd9c30a997bca079e.zip | |
Simplify MACHINE tests, the only platforms in the tree without wsdisplay
are octeon and hppa64.
| -rw-r--r-- | sbin/kbd/Makefile | 5 | ||||
| -rw-r--r-- | sbin/wsconsctl/Makefile | 13 | ||||
| -rw-r--r-- | usr.sbin/wsconscfg/Makefile | 11 |
3 files changed, 7 insertions, 22 deletions
diff --git a/sbin/kbd/Makefile b/sbin/kbd/Makefile index 3069e27a940..a5c5ab869ec 100644 --- a/sbin/kbd/Makefile +++ b/sbin/kbd/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2015/12/01 07:50:05 deraadt Exp $ +# $OpenBSD: Makefile,v 1.39 2016/03/31 01:28:00 jsg Exp $ # # Be sure to change src/distrib/special/kbd/Makefile as well if you add or # remove architectures on this list! # -.if ${MACHINE} != "hppa64" && \ - ${MACHINE} != "ia64" && ${MACHINE} != "octeon" +.if ${MACHINE} != "hppa64" && ${MACHINE} != "octeon" PROG= kbd diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile index 7d88d050620..a82a8726b2f 100644 --- a/sbin/wsconsctl/Makefile +++ b/sbin/wsconsctl/Makefile @@ -1,13 +1,6 @@ -# $OpenBSD: Makefile,v 1.39 2016/03/09 16:28:47 deraadt Exp $ - -.if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \ - ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \ - ${MACHINE} == "hppa" || ${MACHINE} == "hppa64" || \ - ${MACHINE} == "i386" || ${MACHINE} == "landisk" || \ - ${MACHINE} == "loongson" || ${MACHINE} == "luna88k" || \ - ${MACHINE} == "macppc" || ${MACHINE} == "sgi" || \ - ${MACHINE} == "socppc" || ${MACHINE} == "sparc" || \ - ${MACHINE} == "sparc64" || ${MACHINE} == "zaurus" +# $OpenBSD: Makefile,v 1.40 2016/03/31 01:28:01 jsg Exp $ + +.if ${MACHINE} != "hppa64" && ${MACHINE} != "octeon" PROG= wsconsctl SRCS= display.c keyboard.c keysym.c map_parse.y map_scan.l \ diff --git a/usr.sbin/wsconscfg/Makefile b/usr.sbin/wsconscfg/Makefile index d78595c6deb..d9492091b83 100644 --- a/usr.sbin/wsconscfg/Makefile +++ b/usr.sbin/wsconscfg/Makefile @@ -1,13 +1,6 @@ -# $OpenBSD: Makefile,v 1.36 2016/03/09 16:28:50 deraadt Exp $ +# $OpenBSD: Makefile,v 1.37 2016/03/31 01:28:01 jsg Exp $ -.if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \ - ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \ - ${MACHINE} == "hppa" || ${MACHINE} == "hppa64" || \ - ${MACHINE} == "i386" || ${MACHINE} == "landisk" || \ - ${MACHINE} == "loongson" || ${MACHINE} == "luna88k" || \ - ${MACHINE} == "macppc" || ${MACHINE} == "sgi" || \ - ${MACHINE} == "socppc" || ${MACHINE} == "sparc" || \ - ${MACHINE} == "sparc64" || ${MACHINE} == "zaurus" +.if ${MACHINE} != "hppa64" && ${MACHINE} != "octeon" PROG= wsconscfg SRCS= wsconscfg.c |