| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | # $NetBSD: bsd.own.mk,v 1.636 2010/07/31 12:54:35 tsutsui Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.637 2010/07/31 16:23:15 tsutsui Exp $ |
| 2 | | | 2 | |
| 3 | # This needs to be before bsd.init.mk | | 3 | # This needs to be before bsd.init.mk |
| 4 | .if defined(BSD_MK_COMPAT_FILE) | | 4 | .if defined(BSD_MK_COMPAT_FILE) |
| 5 | .include <${BSD_MK_COMPAT_FILE}> | | 5 | .include <${BSD_MK_COMPAT_FILE}> |
| 6 | .endif | | 6 | .endif |
| 7 | | | 7 | |
| 8 | .if !defined(_BSD_OWN_MK_) | | 8 | .if !defined(_BSD_OWN_MK_) |
| 9 | _BSD_OWN_MK_=1 | | 9 | _BSD_OWN_MK_=1 |
| 10 | | | 10 | |
| 11 | MAKECONF?= /etc/mk.conf | | 11 | MAKECONF?= /etc/mk.conf |
| 12 | .-include "${MAKECONF}" | | 12 | .-include "${MAKECONF}" |
| 13 | | | 13 | |
| 14 | # | | 14 | # |
| @@ -727,32 +727,38 @@ _MKVARS.no= \ | | | @@ -727,32 +727,38 @@ _MKVARS.no= \ |
| 727 | MKDTRACE MKEXTSRC \ | | 727 | MKDTRACE MKEXTSRC \ |
| 728 | MKMANDOC MKMANZ MKOBJDIRS \ | | 728 | MKMANDOC MKMANZ MKOBJDIRS \ |
| 729 | MKPCC MKPCCCMDS \ | | 729 | MKPCC MKPCCCMDS \ |
| 730 | MKPIGZGZIP \ | | 730 | MKPIGZGZIP \ |
| 731 | MKSOFTFLOAT MKSTRIPIDENT \ | | 731 | MKSOFTFLOAT MKSTRIPIDENT \ |
| 732 | MKUNPRIVED MKUPDATE MKX11 MKZFS | | 732 | MKUNPRIVED MKUPDATE MKX11 MKZFS |
| 733 | .for var in ${_MKVARS.no} | | 733 | .for var in ${_MKVARS.no} |
| 734 | ${var}?=no | | 734 | ${var}?=no |
| 735 | .endfor | | 735 | .endfor |
| 736 | | | 736 | |
| 737 | # | | 737 | # |
| 738 | # Do we default to XFree86 or Xorg for this platform? | | 738 | # Do we default to XFree86 or Xorg for this platform? |
| 739 | # | | 739 | # |
| 740 | .if ${MACHINE} == "alpha" || ${MACHINE} == "acorn32" || \ | | 740 | .if \ |
| 741 | ${MACHINE} == "amiga" || ${MACHINE} == "dreamcast" || \ | | 741 | ${MACHINE} == "acorn32" || \ |
| 742 | ${MACHINE} == "ews4800mips" || \ | | 742 | ${MACHINE} == "alpha" || \ |
| 743 | ${MACHINE} == "mac68k" || ${MACHINE} == "newsmips" || \ | | 743 | ${MACHINE} == "amiga" || \ |
| 744 | ${MACHINE} == "ofppc" || ${MACHINE} == "pmax" || \ | | 744 | ${MACHINE} == "dreamcast" || \ |
| 745 | ${MACHINE} == "sun3" || ${MACHINE} == "x68k" | | 745 | ${MACHINE} == "ews4800mips" || \ |
| | | 746 | ${MACHINE} == "mac68k" || \ |
| | | 747 | ${MACHINE} == "newsmips" || \ |
| | | 748 | ${MACHINE} == "ofppc" || \ |
| | | 749 | ${MACHINE} == "pmax" || \ |
| | | 750 | ${MACHINE} == "sun3" || \ |
| | | 751 | ${MACHINE} == "x68k" |
| 746 | X11FLAVOUR?= XFree86 | | 752 | X11FLAVOUR?= XFree86 |
| 747 | .else | | 753 | .else |
| 748 | X11FLAVOUR?= Xorg | | 754 | X11FLAVOUR?= Xorg |
| 749 | .endif | | 755 | .endif |
| 750 | | | 756 | |
| 751 | # | | 757 | # |
| 752 | # Force some options off if their dependencies are off. | | 758 | # Force some options off if their dependencies are off. |
| 753 | # | | 759 | # |
| 754 | | | 760 | |
| 755 | .if ${MKCXX} == "no" | | 761 | .if ${MKCXX} == "no" |
| 756 | MKATF:= no | | 762 | MKATF:= no |
| 757 | MKGROFF:= no | | 763 | MKGROFF:= no |
| 758 | .endif | | 764 | .endif |