[scripts] metadata.pl: filter direct recursive depends like "select PACKAGE_kmod...

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 7be906f..4d5d788 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,8 @@ ifneq ($(OPENWRT_BUILD),1)
 
   override OPENWRT_BUILD=1
   export OPENWRT_BUILD
 
   override OPENWRT_BUILD=1
   export OPENWRT_BUILD

+  GREP_OPTIONS=
+  export GREP_OPTIONS

   include $(TOPDIR)/include/debug.mk
   include $(TOPDIR)/include/depends.mk
   include $(TOPDIR)/include/toplevel.mk
   include $(TOPDIR)/include/debug.mk
   include $(TOPDIR)/include/depends.mk
   include $(TOPDIR)/include/toplevel.mk


@@ -44,18 +46,24 @@ $(package/stamp-install): $(package/stamp-compile)
 $(package/stamp-rootfs-prepare): $(package/stamp-install)
 $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare)
 
 $(package/stamp-rootfs-prepare): $(package/stamp-install)
 $(target/stamp-install): $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare)
 

-$(BUILD_DIR)/.prepared: Makefile
-       @mkdir -p $$(dirname $@)
-       @touch $@
+printdb:
+       @true
+
+prepare: $(target/stamp-compile)

 
 clean: FORCE
 
 clean: FORCE

-       rm -rf $(BUILD_DIR) $(BIN_DIR)

        $(_SINGLE)$(SUBMAKE) target/linux/clean
        $(_SINGLE)$(SUBMAKE) target/linux/clean

+       rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR)

 
 dirclean: clean
 
 dirclean: clean

-       rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST)
+       rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)

        rm -rf $(TMP_DIR)
 
        rm -rf $(TMP_DIR)
 

+ifndef DUMP_TARGET_DB
+$(BUILD_DIR)/.prepared: Makefile
+       @mkdir -p $$(dirname $@)
+       @touch $@
+

 tmp/.prereq_packages: .config
        unset ERROR; \
        for package in $(sort $(prereq-y) $(prereq-m)); do \
 tmp/.prereq_packages: .config
        unset ERROR; \
        for package in $(sort $(prereq-y) $(prereq-m)); do \


@@ -66,13 +74,14 @@ tmp/.prereq_packages: .config
                false; \
        fi
        touch $@
                false; \
        fi
        touch $@

+endif

 
 # check prerequisites before starting to build
 prereq: $(target/stamp-prereq) tmp/.prereq_packages
 
 prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
 world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE
 
 # check prerequisites before starting to build
 prereq: $(target/stamp-prereq) tmp/.prereq_packages
 
 prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
 world: prepare $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE

-       $(_SINGLE)$(SUBMAKE) package/index
+       $(_SINGLE)$(SUBMAKE) -r package/index

 
 # update all feeds, re-create index files, install symlinks
 package/symlinks:
 
 # update all feeds, re-create index files, install symlinks
 package/symlinks: