diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 7 | ||||
| -rw-r--r-- | mk/tools/imake.mk | 15 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 30 |
3 files changed, 10 insertions, 42 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index adebfc9b2d6..9bab4f26cd0 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.56 2013/09/09 16:35:40 joerg Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.57 2014/10/01 19:14:21 joerg Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -46,11 +46,8 @@ PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX:Q} PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q} .endif -.if defined(USE_IMAKE) && empty(USE_TOOLS:Mitools) -USE_X11BASE?= implied -.endif - .if defined(USE_IMAKE) +USE_X11BASE?= implied MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk index 39c8af1c473..569d24d532f 100644 --- a/mk/tools/imake.mk +++ b/mk/tools/imake.mk @@ -1,4 +1,4 @@ -# $NetBSD: imake.mk,v 1.19 2007/09/10 06:36:25 rillig Exp $ +# $NetBSD: imake.mk,v 1.20 2014/10/01 19:14:21 joerg Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -75,11 +75,6 @@ _PSU_VARS.imake= IMAKE_MAN_SOURCE_PATH IMAKE_MAN_DIR IMAKE_LIBMAN_DIR \ USE_TOOLS+= imake xmkmf .endif -# itools implies all of the imake tools -.if !empty(USE_TOOLS:Mitools) -USE_TOOLS+= imake makedepend mkdirhier xmkmf -.endif - # imake and xmkmf imply each other .if !empty(USE_TOOLS:Mimake) || !empty(USE_TOOLS:Mxmkmf) USE_TOOLS+= imake xmkmf @@ -90,14 +85,6 @@ USE_TOOLS+= imake xmkmf USE_TOOLS+= ${IMAKE_TOOLS:Nimake} .endif -# Ensure that the correct commands are used when using nbitools. -.if !empty(USE_TOOLS:Mitools) -CONFIGURE_ENV+= IMAKE_CMD=imake -MAKE_ENV+= IMAKE_CMD=imake -SCRIPTS_ENV+= IMAKE_CMD=imake -TOOLS_ARGS.imake+= -DImakeCmd=imake -.endif - TOOLS_ARGS.imake+= ${IMAKEOPTS} TOOLS_ARGS.xmkmf+= ${XMKMF_FLAGS} diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 2b9d864d2d4..57b517be13e 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.271 2014/10/01 19:04:56 joerg Exp $ +# $NetBSD: replace.mk,v 1.272 2014/10/01 19:14:21 joerg Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1330,40 +1330,24 @@ TOOLS_PATH.xmessage= ${TOOLS_PREFIX.xmessage}/bin/xmessage _TOOLS.x11-imake= imake mkdirhier xmkmf .for _t_ in ${_TOOLS.x11-imake} -. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) -. if !empty(PKGPATH:Mdevel/nbitools) -MAKEFLAGS+= TOOLS_IGNORE.${_t_}= -. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) +. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) && \ + !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) TOOLS_CREATE+= ${_t_} -. if !empty(_USE_TOOLS:Mitools) -TOOLS_DEPENDS.${_t_}?= nbitools>=6.3nb4:../../devel/nbitools -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=nbitools -TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/libexec/itools/${_t_} -. else TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} -. endif -. endif . endif .endfor -.if !defined(TOOLS_IGNORE.makedepend) && !empty(_USE_TOOLS:Mmakedepend) -. if !empty(PKGPATH:Mdevel/nbitools) -MAKEFLAGS+= TOOLS_IGNORE.makedepend= -. elif !empty(_TOOLS_USE_PKGSRC.makedepend:M[yY][eE][sS]) +.if !defined(TOOLS_IGNORE.makedepend) && !empty(_USE_TOOLS:Mmakedepend) && \ + !empty(_TOOLS_USE_PKGSRC.makedepend:M[yY][eE][sS]) TOOLS_CREATE+= makedepend -. if !empty(_USE_TOOLS:Mitools) -TOOLS_DEPENDS.makedepend?= nbitools>=6.3nb4:../../devel/nbitools -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makedepend=nbitools -TOOLS_PATH.makedepend= ${TOOLS_PREFIX.makedepend}/libexec/itools/makedepend -. elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular) +. if defined(X11_TYPE) && !empty(X11_TYPE:Mmodular) TOOLS_DEPENDS.makedepend?= makedepend-[0-9]*:../../devel/makedepend TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makedepend=makedepend TOOLS_PATH.makedepend= ${TOOLS_PREFIX.makedepend}/bin/makedepend -. else # !empty(X11_TYPE:Mnative) +. else # !empty(X11_TYPE:Mnative) TOOLS_PATH.makedepend= ${X11BASE}/bin/makedepend -. endif . endif .endif |