add missing dependancy

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 5c218f1..6df34ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,60 +14,71 @@ RELEASE:=Kamikaze
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------

-TOPDIR=${shell pwd}
-export TOPDIR
+
+all: world
+
+export TOPDIR=${shell pwd}

 include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)
 include $(TOPDIR)/include/verbose.mk
 
 OPENWRTVERSION:=$(RELEASE)
 ifneq ($(VERSION),)

-OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))

 else
 else

-REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-ifneq ($(REV),)
-OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-endif
+  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
+  ifneq ($(REV),)
+    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
+  endif

 endif
 export OPENWRTVERSION
 
 endif
 export OPENWRTVERSION
 

-all: world
-
-.pkginfo: FORCE

 ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
 ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)

+  .pkginfo .config: FORCE
+endif
+
+ifeq ($(FORCE),)
+  .config scripts/config/conf scripts/config/mconf: .prereq-build
+  world: .prereq-packages
+endif
+
+.pkginfo:

        @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>&- || true; \
+               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir || echo "ERROR: please fix $${dir}Makefile" >&2; \

        done > $@
        done > $@

-endif
-
-.config.in: .pkginfo
-       ./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@

 
 pkginfo-clean: FORCE
        -rm -f .pkginfo .config.in
 
 
 pkginfo-clean: FORCE
        -rm -f .pkginfo .config.in
 

-./scripts/config/mconf: .config.in
-       $(MAKE) -C scripts/config all
+.config.in: .pkginfo
+       @./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@
+
+.config: ./scripts/config/conf .config.in
+       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
+       @$< -D .config Config.in &> /dev/null
+
+scripts/config/mconf:
+       @$(MAKE) -C scripts/config all

 
 

-./scripts/config/conf: .config.in
-       $(MAKE) -C scripts/config conf
+scripts/config/conf:
+       @$(MAKE) -C scripts/config conf

 
 

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

        $< Config.in
 
        $< Config.in
 

-defconfig: ./scripts/config/conf FORCE
+config-clean: FORCE
+       $(NO_TRACE_MAKE) -C scripts/config clean
+
+defconfig: scripts/config/conf .config.in FORCE

        touch .config
        $< -D .config Config.in
 
        touch .config
        $< -D .config Config.in
 

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

        $< -o Config.in
 
        $< -o Config.in
 

-menuconfig: ./scripts/config/mconf FORCE
+menuconfig: scripts/config/mconf .config.in FORCE

        $< Config.in
 
        $< Config.in
 

-config-clean: FORCE
-       $(MAKE) -C scripts/config clean
-

 package/%: .pkginfo FORCE
        $(MAKE) -C package $(patsubst package/%,%,$@)
 
 package/%: .pkginfo FORCE
        $(MAKE) -C package $(patsubst package/%,%,$@)
 


@@ -77,9 +88,22 @@ target/%: .pkginfo FORCE
 toolchain/%: FORCE
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 toolchain/%: FORCE
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 

-.config: ./scripts/config/conf FORCE
-       @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
-       $< -D .config Config.in >/dev/null 2>/dev/null
+.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."; \
+               false; \
+       }
+       @touch $@
+
+.prereq-packages: include/prereq.mk .pkginfo .config
+       @$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
+               echo "Prerequisite check failed. Use FORCE=1 to override."; \
+               false; \
+       }
+       @rm -rf "$(TOPDIR)/tmp"
+       @touch $@
+       
+prereq: .prereq-build .prereq-packages FORCE

 
 download: .config FORCE
        $(MAKE) toolchain/download
 
 download: .config FORCE
        $(MAKE) toolchain/download


@@ -92,6 +116,7 @@ world: .config FORCE
        $(MAKE) package/compile
        $(MAKE) package/install
        $(MAKE) target/install
        $(MAKE) package/compile
        $(MAKE) package/install
        $(MAKE) target/install

+       $(MAKE) package/index

 
 clean: FORCE
        rm -rf build_* bin
 
 clean: FORCE
        rm -rf build_* bin


@@ -100,7 +125,9 @@ dirclean: clean
        rm -rf staging_dir_* toolchain_build_*
 
 distclean: dirclean config-clean
        rm -rf staging_dir_* toolchain_build_*
 
 distclean: dirclean config-clean

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

 
 

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

 .PHONY: FORCE
 .PHONY: FORCE

-FORCE:
+%: ;