From 9183b983ea3f2b20359eaa7cf3a8776af301c059 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 21 Dec 2009 12:50:59 +0100 Subject: make pkgmaker and depmaker less verbose, fix build --- package/depmaker | 3 +++ package/grub-bin/Makefile | 2 +- package/pkgmaker | 3 +++ rules.mk | 1 - 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/depmaker b/package/depmaker index edbacc6f1..da3923554 100644 --- a/package/depmaker +++ b/package/depmaker @@ -1,3 +1,5 @@ +unset MAKEFLAGS +export MAKEFLAGS=s cd "$(dirname "$0")" export TOPDIR=$(realpath ..) if gmake --help >/dev/null 2>&1; then @@ -5,6 +7,7 @@ if gmake --help >/dev/null 2>&1; then else export GMAKE=make fi +GMAKE="$GMAKE --no-print-directory" (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) typeset -L$x_cols pbar diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 260a29393..30a956818 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -13,7 +13,7 @@ PKG_DESCR:= GRUB bootloader PKG_SECTION:= sys PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix1d +PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d include ${TOPDIR}/mk/package.mk diff --git a/package/pkgmaker b/package/pkgmaker index f00285192..d9c928579 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -1,3 +1,5 @@ +unset MAKEFLAGS +export MAKEFLAGS=s cd "$(dirname "$0")" export TOPDIR=$(realpath ..) if gmake --help >/dev/null 2>&1; then @@ -5,6 +7,7 @@ if gmake --help >/dev/null 2>&1; then else export GMAKE=make fi +GMAKE="$GMAKE --no-print-directory" (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) typeset -L$x_cols pbar diff --git a/rules.mk b/rules.mk index 9703704a9..684206815 100644 --- a/rules.mk +++ b/rules.mk @@ -43,7 +43,6 @@ TARGET_CFLAGS:= $(strip -fwrapv -fno-ident ${TARGET_CFLAGS}) TARGET_CC:= $(strip ${TARGET_CC}) TARGET_CXX:= $(strip ${TARGET_CXX}) -# I hate GNU make! --mirabilos ifneq (${show},) .DEFAULT_GOAL:= show show: -- cgit v1.2.3