fix previous commit

[openwrt.git] / include / scan.mk

diff --git a/include/scan.mk b/include/scan.mk
index 04add40..dfe80fa 100644 (file)
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -1,7 +1,10 @@
 include $(TOPDIR)/include/verbose.mk
 include $(TOPDIR)/include/verbose.mk

+TMP_DIR:=$(TOPDIR)/tmp

 
 all: tmp/.$(SCAN_TARGET)
 
 
 all: tmp/.$(SCAN_TARGET)
 

+include $(TOPDIR)/include/host.mk
+

 SCAN_TARGET ?= packageinfo
 SCAN_NAME ?= package
 SCAN_DIR ?= package
 SCAN_TARGET ?= packageinfo
 SCAN_NAME ?= package
 SCAN_DIR ?= package


@@ -24,14 +27,14 @@ define PackageDir
        { \
                $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
                echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
        { \
                $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
                echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \

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

                echo; \
        } > $$@ || true
 endef
 
 $(FILELIST):
        rm -f tmp/info/.files-$(SCAN_TARGET)-*
                echo; \
        } > $$@ || true
 endef
 
 $(FILELIST):
        rm -f tmp/info/.files-$(SCAN_TARGET)-*

-       find -follow $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@
+       $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|Build(Package|Target)|.+Package)' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@

 
 tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
        ( \
 
 tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
        ( \


@@ -65,3 +68,4 @@ tmp/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
 
 FORCE:
 .PHONY: FORCE
 
 FORCE:
 .PHONY: FORCE

+.NOTPARALLEL: