diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-06-26 03:12:38 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-06-26 03:12:38 +0000 |
| commit | 3140386b565a9d9dc824f0d8436c13e1d1c8f3ef (patch) | |
| tree | 5d56d70d1b78811dce9d52e18249dcf0685c8bc8 /share/mk | |
| parent | 634da6becd9b6641bee51d87d26cfda2fa8ab124 (diff) | |
remove extraneous brackets and list the architecures in alphabetic order.
no objection from miod@ and krw@
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 10 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 6590c18e5bf..74107af8b5c 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.55 2006/02/03 19:24:52 bernd Exp $ +# $OpenBSD: bsd.lib.mk,v 1.56 2006/06/26 03:12:37 brad Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -147,7 +147,7 @@ CXXFLAGS+= ${CXXDIAGFLAGS} CFLAGS+= ${COPTS} CXXFLAGS+= ${CXXOPTS} -.if (${MACHINE} != "zaurus") && (${MACHINE} != "hp300") +.if ${MACHINE} != "hp300" && ${MACHINE} != "zaurus" DEBUG?= -g .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 602c6b799d8..bf49c844c3d 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.94 2005/11/23 18:34:33 deraadt Exp $ +# $OpenBSD: bsd.own.mk,v 1.95 2006/06/26 03:12:37 brad Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -117,12 +117,12 @@ STATIC?= -static # don't try to generate PIC versions of libraries on machines # which don't support PIC. -.if (${MACHINE_ARCH} == "vax") || (${MACHINE_ARCH} == "m88k") +.if ${MACHINE_ARCH} == "m88k" || ${MACHINE_ARCH} == "vax" NOPIC= .endif # pic relocation flags. -.if (${MACHINE_ARCH} == "sparc64") +.if ${MACHINE_ARCH} == "sparc64" PICFLAG=-fPIC .else PICFLAG=-fpic @@ -135,9 +135,9 @@ PICFLAG+=-fno-function-cse . endif .endif -.if (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "sparc") +.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" ASPICFLAG=-KPIC -.elif (${ELF_TOOLCHAIN:L} == "no") +.elif ${ELF_TOOLCHAIN:L} == "no" ASPICFLAG=-k .endif diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index f12afd74d7f..db65970914d 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.prog.mk,v 1.47 2006/05/27 23:01:21 deraadt Exp $ +# $OpenBSD: bsd.prog.mk,v 1.48 2006/06/26 03:12:37 brad Exp $ # $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 @@ -17,7 +17,7 @@ CXXFLAGS+= ${CXXDIAGFLAGS} CFLAGS+= ${COPTS} CXXFLAGS+= ${CXXOPTS} -.if (${ELF_TOOLCHAIN:L} == "yes") +.if ${ELF_TOOLCHAIN:L} == "yes" CRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o CRTEND?= ${DESTDIR}/usr/lib/crtend.o .endif @@ -63,8 +63,8 @@ LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a LIBY?= ${DESTDIR}/usr/lib/liby.a LIBZ?= ${DESTDIR}/usr/lib/libz.a -.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \ - ${MACHINE_ARCH} == "i386") +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_ARCH} == "i386" LIBARCH?= ${DESTDIR}/usr/lib/lib${MACHINE_ARCH}.a .else LIBARCH?= |