[BACK]Return to bsd.own.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/share/mk/bsd.own.mk between version 1.542 and 1.542.2.13

version 1.542, 2008/10/29 23:46:52 version 1.542.2.13, 2010/11/25 00:27:19
Line 125  USETOOLS?= no
Line 125  USETOOLS?= no
 .if !defined(HOST_OSTYPE)  .if !defined(HOST_OSTYPE)
 _HOST_OSNAME!=  uname -s  _HOST_OSNAME!=  uname -s
 _HOST_OSREL!=   uname -r  _HOST_OSREL!=   uname -r
 _HOST_ARCH!=    uname -p 2>/dev/null || uname -m  # For _HOST_ARCH, if uname -p fails, or prints "unknown", or prints
   # something that does not look like an identifier, then use uname -m.
   _HOST_ARCH!=    uname -p 2>/dev/null
   _HOST_ARCH:=    ${HOST_ARCH:tW:C/.*[^-_A-Za-z0-9].*//:S/unknown//}
   .if empty(_HOST_ARCH)
   _HOST_ARCH!=    uname -m
   .endif
 HOST_OSTYPE:=   ${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//g:[*]:C/ /_/g}-${_HOST_ARCH:C/\([^\)]*\)//g:[*]:C/ /_/g}  HOST_OSTYPE:=   ${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//g:[*]:C/ /_/g}-${_HOST_ARCH:C/\([^\)]*\)//g:[*]:C/ /_/g}
 .MAKEOVERRIDES+= HOST_OSTYPE  .MAKEOVERRIDES+= HOST_OSTYPE
 .endif  .endif # !defined(HOST_OSTYPE)
   
 .if ${USETOOLS} == "yes"                                                # {  .if ${USETOOLS} == "yes"                                                # {
   
Line 649  MKCOMPAT:= no
Line 655  MKCOMPAT:= no
         MKOBJ \          MKOBJ \
         MKPAM \          MKPAM \
         MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \          MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
         MKPUFFS \  
         MKSHARE MKSKEY MKSTATICLIB \          MKSHARE MKSKEY MKSTATICLIB \
         MKYP          MKYP
 ${var}?=        yes  ${var}?=        yes
Line 663  ${var}?= yes
Line 668  ${var}?= yes
         MKMANZ MKMODULAR MKOBJDIRS \          MKMANZ MKMODULAR MKOBJDIRS \
         MKPCC MKPCCCMDS \          MKPCC MKPCCCMDS \
         MKSOFTFLOAT MKSTRIPIDENT \          MKSOFTFLOAT MKSTRIPIDENT \
         MKUNPRIVED MKUPDATE MKX11 MKXORG          MKUNPRIVED MKUPDATE MKX11
 ${var}?=no  ${var}?=no
 .endfor  .endfor
   
 #  #
   # Do we default to XFree86 or Xorg for this platform?
   #
   .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \
       ${MACHINE} == "macppc" || ${MACHINE} == "sgimips" || \
       ${MACHINE} == "shark" || ${MACHINE} == "sparc64"
   X11FLAVOUR?=    Xorg
   .else
   X11FLAVOUR?=    XFree86
   .endif
   
   #
 # Force some options off if their dependencies are off.  # Force some options off if their dependencies are off.
 #  #
   
Line 786  ${var}?= yes
Line 802  ${var}?= yes
 X11SRCDIR?=             /usr/xsrc  X11SRCDIR?=             /usr/xsrc
 X11SRCDIR.xc?=          ${X11SRCDIR}/xfree/xc  X11SRCDIR.xc?=          ${X11SRCDIR}/xfree/xc
 X11SRCDIR.local?=       ${X11SRCDIR}/local  X11SRCDIR.local?=       ${X11SRCDIR}/local
 .if ${MKXORG} != "no"  .if ${X11FLAVOUR} == "Xorg"
 X11ROOTDIR?=            /usr/X11R7  X11ROOTDIR?=            /usr/X11R7
 .else  .else
 X11ROOTDIR?=            /usr/X11R6  X11ROOTDIR?=            /usr/X11R6
Line 807  X11SRCDIRMIT?=  ${X11SRCDIR}/external/mi
Line 823  X11SRCDIRMIT?=  ${X11SRCDIR}/external/mi
         FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \          FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
         Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xp Xpm XprintUtil \          Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xp Xpm XprintUtil \
         Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \          Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
         fontenc xkbfile xkbui Xaw lbxutil Xfontcache XprintAppUtil          fontenc xkbfile xkbui Xaw lbxutil Xfontcache XprintAppUtil \
           pciaccess
 X11SRCDIR.${_lib}?=             ${X11SRCDIRMIT}/lib${_lib}/dist  X11SRCDIR.${_lib}?=             ${X11SRCDIRMIT}/lib${_lib}/dist
 .endfor  .endfor
   
 .for _proto in \  .for _proto in \
         xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \          xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
         xinerama print render resource record video xf86dga xf86misc \          xinerama print render resource record video xf86dga xf86misc \
         xf86vidmode composite damage trap gl randr fontcache xf86dri          xf86vidmode composite damage trap gl randr fontcache xf86dri \
           dri2
 X11SRCDIR.${_proto}proto?=              ${X11SRCDIRMIT}/${_proto}proto/dist  X11SRCDIR.${_proto}proto?=              ${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor  .endfor
   
Line 823  X11SRCDIR.${_proto}proto?=  ${X11SRCDIRM
Line 841  X11SRCDIR.${_proto}proto?=  ${X11SRCDIRM
         xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata \          xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata \
         xbitmaps appres xeyes xev xedit sessreg pixman \          xbitmaps appres xeyes xev xedit sessreg pixman \
         beforelight bitmap editres makedepend fonttosfnt fslsfonts \          beforelight bitmap editres makedepend fonttosfnt fslsfonts \
         fstobdf MesaDemos MesaLib ico iceauth lbxproxy listres lndir \          fstobdf MesaDemos MesaGLUT MesaLib ico iceauth lbxproxy listres lndir \
         luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \          luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
         setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \          setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \
         xclock xcmsdb xconsole xcutsel xditview xdpyinfo xdriinfo xdm \          xclock xcmsdb xconsole xcutsel xditview xdpyinfo xdriinfo xdm \
Line 842  X11SRCDIR.${_proto}proto?=  ${X11SRCDIRM
Line 860  X11SRCDIR.${_proto}proto?=  ${X11SRCDIRM
         font-bitstream-100dpi font-bitstream-75dpi font-bitstream-type1 \          font-bitstream-100dpi font-bitstream-75dpi font-bitstream-type1 \
         font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 \          font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 \
         font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \          font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \
         font-util ttf-bitstream-vera encodings          font-sony-misc font-util ttf-bitstream-vera encodings
 X11SRCDIR.${_dir}?=             ${X11SRCDIRMIT}/${_dir}/dist  X11SRCDIR.${_dir}?=             ${X11SRCDIRMIT}/${_dir}/dist
 .endfor  .endfor
   
Line 852  X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
Line 870  X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
 .endfor  .endfor
   
 .for _v in \  .for _v in \
         apm ark ast ati chips cirrus cyrix glint i128 i740 imstt intel \          ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \
         mach64 mga neomagic nsc nv nvxbox r128 radeonhd rendition \          intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \
         s3 s3virge savage \          rendition s3 s3virge savage siliconmotion sis sunffb suncg6 sunleo \
         siliconmotion sis sunffb suncg6 tdfx tga trident tseng vesa vga via \          suntcx tdfx tga trident tseng vesa vga via vmware wsfb
         vmware wsfb  
 X11SRCDIR.xf86-video-${_v}?=    ${X11SRCDIRMIT}/xf86-video-${_v}/dist  X11SRCDIR.xf86-video-${_v}?=    ${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor  .endfor
   
 # Default to no old Xserver builds for now  .if ${X11FLAVOUR} == "Xorg"
 MKXORG_WITH_XSRC_XSERVER?=      no  
   
 .if ${MKXORG} != no  
 X11DRI?=                        yes  X11DRI?=                        yes
 .endif  .endif
   
Legend:
Removed from v.1.542  
changed lines
  Added in v.1.542.2.13
CVSweb <webmaster@jp.NetBSD.org>