fix bmon compile

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 90bc5de..facebe6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,14 @@ RELEASE:=Kamikaze
 
 all: world
 
 
 all: world
 

+SHELL:=/usr/bin/env bash
+export LC_ALL=C
+export LANG=C

 export TOPDIR=${shell pwd}
 include $(TOPDIR)/include/verbose.mk
 export TOPDIR=${shell pwd}
 include $(TOPDIR)/include/verbose.mk

+ifeq ($(KBUILD_VERBOSE),99)
+  MAKE:=3>/dev/null $(MAKE)
+endif

 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)


@@ -44,7 +50,7 @@ endif
        @echo Collecting package info...
        @-for dir in package/*/; do \
                echo Source-Makefile: $${dir}Makefile; \
        @echo Collecting package info...
        @-for dir in package/*/; do \
                echo Source-Makefile: $${dir}Makefile; \

-               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || echo "ERROR: please fix package/$${dir}Makefile" >&2; \
+               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 3>/dev/null || echo "ERROR: please fix $${dir}Makefile" >&2; \

        done > $@
 
 pkginfo-clean: FORCE
        done > $@
 
 pkginfo-clean: FORCE


@@ -53,7 +59,7 @@ pkginfo-clean: FORCE
 .config.in: .pkginfo
        @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
 
 .config.in: .pkginfo
        @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
 

-.config: ./scripts/config/conf
+.config: ./scripts/config/conf .config.in

        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 
        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 


@@ -85,14 +91,19 @@ package/%: .pkginfo FORCE
 target/%: .pkginfo FORCE
        $(MAKE) -C target $(patsubst target/%,%,$@)
 
 target/%: .pkginfo FORCE
        $(MAKE) -C target $(patsubst target/%,%,$@)
 

+tools/%: FORCE
+       $(MAKE) -C tools $(patsubst tools/%,%,$@)
+

 toolchain/%: FORCE
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 .prereq-build: include/prereq-build.mk
        @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
 toolchain/%: FORCE
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 .prereq-build: include/prereq-build.mk
        @$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
                echo "Prerequisite check failed. Use FORCE=1 to override."; \

+               rm -rf $(TOPDIR)/tmp; \

                false; \
        }
                false; \
        }

+       @rm -rf $(TOPDIR)/tmp

        @touch $@
 
 .prereq-packages: include/prereq.mk .pkginfo .config
        @touch $@
 
 .prereq-packages: include/prereq.mk .pkginfo .config


@@ -100,16 +111,19 @@ toolchain/%: FORCE
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }

+       @rm -rf "$(TOPDIR)/tmp"

        @touch $@
        
 prereq: .prereq-build .prereq-packages FORCE
 
 download: .config FORCE
        @touch $@
        
 prereq: .prereq-build .prereq-packages FORCE
 
 download: .config FORCE

+       $(MAKE) tools/download

        $(MAKE) toolchain/download
        $(MAKE) package/download
        $(MAKE) target/download
 
 world: .config FORCE
        $(MAKE) toolchain/download
        $(MAKE) package/download
        $(MAKE) target/download
 
 world: .config FORCE

+       $(MAKE) tools/install

        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile
        $(MAKE) toolchain/install
        $(MAKE) target/compile
        $(MAKE) package/compile


@@ -121,10 +135,10 @@ clean: FORCE
        rm -rf build_* bin
 
 dirclean: clean
        rm -rf build_* bin
 
 dirclean: clean

-       rm -rf staging_dir_* toolchain_build_*
+       rm -rf staging_dir_* toolchain_build_* tool_build

 
 distclean: dirclean config-clean
 
 distclean: dirclean config-clean

-       rm -rf dl .*config* .pkg* .prereq
+       rm -rf dl .*config* .pkg* .prereq 

 
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;
 
 .SILENT: clean dirclean distclean config-clean download world
 FORCE: ;