fix install of in-tree modules ipkgs

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 96dd2e0..40b4efc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ endif
 endif
 export OPENWRTVERSION
 
 endif
 export OPENWRTVERSION
 

-all:
+all: world

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


@@ -61,23 +61,36 @@ scripts/config/mconf: .config.in
 scripts/config/conf: .config.in
        $(MAKE) -C scripts/config conf
 
 scripts/config/conf: .config.in
        $(MAKE) -C scripts/config conf
 

-menuconfig: scripts/config/mconf
+config: scripts/config/conf

        $< Config.in
 
        $< Config.in
 

-config: scripts/config/conf
+defdconfig: scripts/config/conf
+       $< -d Config.in
+
+oldconfig: scripts/config/conf
+       $< -o Config.in
+
+menuconfig: scripts/config/mconf

        $< Config.in
 
 config-clean:
        $(MAKE) -C scripts/config clean
 
        $< Config.in
 
 config-clean:
        $(MAKE) -C scripts/config clean
 

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

 
 

-target/%:
-       $(MAKE) -C toolchain $(patsubst target/%,%,$@)
+target/%: .pkginfo
+       $(MAKE) -C target $(patsubst target/%,%,$@)

 
 toolchain/%:
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 
 toolchain/%:
        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 

+world:
+       $(MAKE) toolchain/install
+       $(MAKE) target/compile
+       $(MAKE) package/compile
+       $(MAKE) package/install
+       $(MAKE) target/install
+

 .PHONY: FORCE
 FORCE:
 .PHONY: FORCE
 FORCE: