fix pcmcia submenu (broken by [8520])

[openwrt.git] / include / scan.mk

diff --git a/include/scan.mk b/include/scan.mk
index 01f49ad..53b66f3 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


@@ -20,24 +23,26 @@ endif
 
 define PackageDir
   tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(1)
 
 define PackageDir
   tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(1)

-  tmp/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(1)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(1)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(1)/$(DEP))))
+  tmp/info/.$(SCAN_TARGET)-$(1): $(SCAN_DIR)/$(2)/Makefile $(SCAN_STAMP) $(foreach DEP,$(DEPS_$(SCAN_DIR)/$(1)/Makefile) $(SCAN_DEPS),$(wildcard $(if $(filter /%,$(DEP)),$(DEP),$(SCAN_DIR)/$(1)/$(DEP))))

        { \
        { \

-               $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(1)) \
-               echo Source-Makefile: $(SCAN_DIR)/$(1)/Makefile; \
-               $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $(SCAN_DIR)/$(1) 2>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(1)/Makefile" >&2; \
+               $$(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; \

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

-       find $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (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|KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@

 
 tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
        ( \
                cat $< | awk '{print "$(SCAN_DIR)/" $$0 "/Makefile" }' | xargs grep -HE '^ *SCAN_DEPS *= *' | awk -F: '{ gsub(/^.*DEPS *= */, "", $$2); print "DEPS_" $$1 "=" $$2 }'; \
                awk -v deps="$$DEPS" '{ \
 
 tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST)
        ( \
                cat $< | awk '{print "$(SCAN_DIR)/" $$0 "/Makefile" }' | xargs grep -HE '^ *SCAN_DEPS *= *' | awk -F: '{ gsub(/^.*DEPS *= */, "", $$2); print "DEPS_" $$1 "=" $$2 }'; \
                awk -v deps="$$DEPS" '{ \

-                       print "$$(eval $$(call PackageDir," $$0 "))"; \
+                       info=$$0; \
+                       gsub(/\//, "_", info); \
+                       print "$$(eval $$(call PackageDir," info "," $$0 "))"; \

                } ' < $<; \
                true; \
        ) > $@
                } ' < $<; \
                true; \
        ) > $@


@@ -57,9 +62,10 @@ $(TARGET_STAMP):
 
 tmp/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
        $(call progress,Collecting $(SCAN_NAME) info: merging...)
 
 tmp/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
        $(call progress,Collecting $(SCAN_NAME) info: merging...)

-       cat $(FILELIST) | awk '{print "tmp/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@
+       cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "tmp/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@

        $(call progress,Collecting $(SCAN_NAME) info: done)
        echo
 
 FORCE:
 .PHONY: FORCE
        $(call progress,Collecting $(SCAN_NAME) info: done)
        echo
 
 FORCE:
 .PHONY: FORCE

+.NOTPARALLEL: