Browse Source

make pkgmaker and depmaker less verbose, fix build

Waldemar Brodkorb 14 years ago
parent
commit
9183b983ea
4 changed files with 7 additions and 2 deletions
  1. 3 0
      package/depmaker
  2. 1 1
      package/grub-bin/Makefile
  3. 3 0
      package/pkgmaker
  4. 0 1
      rules.mk

+ 3 - 0
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
 

+ 1 - 1
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
 

+ 3 - 0
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
 

+ 0 - 1
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: