Changed autoboot timeout in dfboot

[openwrt.git] / include / scan.mk

diff --git a/include/scan.mk b/include/scan.mk
index 3229523..976eb38 100644 (file)
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -1,6 +1,6 @@
 include $(TOPDIR)/include/verbose.mk
 
 include $(TOPDIR)/include/verbose.mk
 

-SCAN_TARGET ?= pkginfo
+SCAN_TARGET ?= packageinfo

 SCAN_NAME ?= package
 SCAN_DIR ?= package
 SCAN_DEPS ?= include/package.mk
 SCAN_NAME ?= package
 SCAN_DIR ?= package
 SCAN_DEPS ?= include/package.mk


@@ -15,7 +15,7 @@ else
   endef
 endif
 
   endef
 endif
 

-SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(shell ls $(SCAN_DIR)/*/Makefile))
+SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(wildcard $(SCAN_DIR)/*/Makefile))

 tmp/.$(SCAN_TARGET):
        @($(call progress,Collecting $(SCAN_NAME) info: merging...))
        for file in $(SCAN); do \
 tmp/.$(SCAN_TARGET):
        @($(call progress,Collecting $(SCAN_NAME) info: merging...))
        for file in $(SCAN); do \


@@ -32,20 +32,20 @@ $(SCAN_STAMP):
 endif
 
 # FIXME: generate this dynamically?
 endif
 
 # FIXME: generate this dynamically?

-ifeq ($(SCAN_TARGET),pkginfo)
-tmp/info/.pkginfo-kernel: $(shell ls package/kernel/modules/*.mk)
+ifeq ($(SCAN_TARGET),packageinfo)
+tmp/info/.packageinfo-kernel: $(wildcard package/kernel/modules/*.mk)

 endif
 
 define scanfiles
 $(foreach FILE,$(SCAN),
 endif
 
 define scanfiles
 $(foreach FILE,$(SCAN),

-  tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) FORCE
-  tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DEPS) $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP)
-       { \
+  tmp/.$(SCAN_TARGET): tmp/info/.$(SCAN_TARGET)-$(FILE) $(SCAN_TARGET_DEPS) $(SCAN_DEPS)
+  tmp/info/.$(SCAN_TARGET)-$(FILE): $(SCAN_DIR)/$(FILE)/Makefile $(SCAN_STAMP) $(SCAN_TARGET_DEPS)
+       grep -E 'include (\$$$$\(INCLUDE_DIR\)|\$$$$\(TOPDIR\)/include)/' $(SCAN_DIR)/$(FILE)/Makefile >/dev/null && { \

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

-       } > $$@
+       } > $$@ || true

 )
 
 endef
 )
 
 endef