diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-05-31 16:59:44 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-05-31 16:59:44 +0000 |
| commit | f5c2fca63aab777ef4698e5230a19966e7133d11 (patch) | |
| tree | be84e614d69234545a4c911ab985a22715132c8f /mk | |
| parent | 465adc06fa3a7b76aac9bca32ddd030a22e7503b (diff) | |
| download | pkgsrc-f5c2fca63aab777ef4698e5230a19966e7133d11.tar.gz | |
* Move the clean-depends target near the clear target
* some whitespace change to enhance readability
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 70f55935aad..9eefb952400 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.445 2000/05/31 02:08:04 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.446 2000/05/31 16:59:44 hubertf Exp $ # # This file is in the public domain. # @@ -1966,15 +1966,33 @@ clean: pre-clean .endif .endif + +.if !target(clean-depends) +clean-depends: +.if defined(BUILD_DEPENDS) || defined(DEPENDS) || defined(RUN_DEPENDS) + ${_PKG_SILENT}${_PKG_DEBUG}\ + for dir in `${ECHO} ${BUILD_DEPENDS:C/^[^:]*://:C/:.*//} \ + ${DEPENDS:C/^[^:]*://:C/:.*//} \ + ${RUN_DEPENDS:C/^[^:]*://:C/:.*//} | sort -u`; do \ + if [ -d $$dir ] ; then \ + (cd $$dir && ${MAKE} CLEANDEPENDS=${CLEANDEPENDS} clean ); \ + fi \ + done +.endif +.endif + + .if !target(pre-distclean) pre-distclean: @${DO_NADA} .endif + .if !target(cleandir) cleandir: clean .endif + .if !target(distclean) distclean: pre-distclean clean ${_PKG_SILENT}${ECHO_MSG} "${_PKGSRC_IN}> Dist cleaning for ${PKGNAME}" @@ -2208,11 +2226,11 @@ package-depends: else \ (cd $$dir && ${MAKE} package-name PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \ fi; \ - if ${PACKAGE_DEPENDS_QUICK} ; then \ + if ${PACKAGE_DEPENDS_QUICK} ; then \ ${PKG_INFO} -qf "$$pkg" | ${GREP} '^@pkgdep' | ${AWK} '{print $$2}' ; \ - else \ + else \ (cd $$dir && ${MAKE} package-depends PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \ - fi ; \ + fi ; \ else \ ${ECHO_MSG} "Warning: \"$$dir\" non-existent -- @pkgdep registration incomplete" >&2; \ fi @@ -2226,11 +2244,11 @@ package-depends: else \ (cd $$dir && ${MAKE} package-name PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \ fi; \ - if ${PACKAGE_DEPENDS_QUICK} ; then \ + if ${PACKAGE_DEPENDS_QUICK} ; then \ ${PKG_INFO} -qf "$$pkg" | grep ^@pkgdep | awk '{print $$2}' ; \ - else \ + else \ (cd $$dir && ${MAKE} package-depends PACKAGE_NAME_TYPE=${PACKAGE_NAME_TYPE}); \ - fi ; \ + fi ; \ else \ ${ECHO_MSG} "Warning: \"$$dir\" non-existent -- @pkgdep registration incomplete" >&2; \ fi @@ -2382,20 +2400,6 @@ check-depends: .endif .endif -.if !target(clean-depends) -clean-depends: -.if defined(BUILD_DEPENDS) || defined(DEPENDS) || defined(RUN_DEPENDS) - ${_PKG_SILENT}${_PKG_DEBUG}\ - for dir in `${ECHO} ${BUILD_DEPENDS:C/^[^:]*://:C/:.*//} \ - ${DEPENDS:C/^[^:]*://:C/:.*//} \ - ${RUN_DEPENDS:C/^[^:]*://:C/:.*//} | sort -u`; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && ${MAKE} CLEANDEPENDS=${CLEANDEPENDS} clean ); \ - fi \ - done -.endif -.endif - .if !target(depends-list) depends-list: .for dir in ${BUILD_DEPENDS} ${DEPENDS} |