fix install of in-tree modules ipkgs

[openwrt.git] / Makefile

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

-ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package)
-.pkginfo: pkginfo-clean
-endif
+all: world

 
 

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

        @echo Collecting package info...
        @echo Collecting package info...

-       @-for makefile in package/*/Makefile; do \
-               echo Source-Makefile: $$makefile; \
-               $(MAKE) DUMP=1 -f $$makefile 2>&- || true; \
+       @-for dir in package/*/; do \
+               echo Source-Makefile: $${dir}Makefile; \
+               $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \

        done > $@
        done > $@

-       
+endif
+

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

-pkginfo-clean:
+pkginfo-clean: FORCE

        -rm -f .pkginfo .config.in
 
 scripts/config/mconf: .config.in
        -rm -f .pkginfo .config.in
 
 scripts/config/mconf: .config.in


@@ -61,15 +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
 

-.PHONY: pkginfo-clean
+package/%: .pkginfo
+       $(MAKE) -C package $(patsubst package/%,%,$@)
+
+target/%: .pkginfo
+       $(MAKE) -C target $(patsubst target/%,%,$@)
+
+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: