Remove ldd/ldconfig for the moment (#1551)

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index 25f2f4e..414a152 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,46 +41,27 @@ export OPENWRTVERSION
 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
-  world: tmp/.prereq-packages tmp/.prereq-target
+  world: tmp/.prereq-package tmp/.prereq-target
 endif
 
-define stamp
-tmp/info/.stamp-$(1)-$(shell ls $(2)/*/Makefile | (md5sum || md5) 2>/dev/null | cut -d' ' -f1)
-endef
+package/%/Makefile: ;
+target/%/Makefile: ;
 
-STAMP_pkginfo=$(call stamp,pkginfo,package)
-STAMP_targetinfo=$(call stamp,targetinfo,target/linux)
-define scan_info
-
-$(STAMP_$(1)):
+tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) 
+tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)
+tmp/.%info:
        @mkdir -p tmp/info
-       @rm -f tmp/info/.stamp-$(1)*
-       @touch $$@
-
-$(foreach FILE,$(shell ls $(2)/*/Makefile),
-tmp/.$(1): $(FILE)
-$(FILE):
-)
-
-tmp/.$(1): $(STAMP_$(1)) $(4)
-       @echo -n Collecting $(3) info... 
-       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$(1)" SCAN_DIR="$(2)" SCAN_NAME="$(3)" SCAN_DEPS="$(4)"
-
-endef
-
-$(eval $(call scan_info,pkginfo,package,package,include/package.mk))
-$(eval $(call scan_info,targetinfo,target/linux,target,include/kernel-build.mk include/kernel-version.mk))
+       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$^" SCAN_EXTRA=""
 
 tmpinfo-clean: FORCE
-       @-rm -rf tmp/.pkginfo tmp/.targetinfo
+       @-rm -rf tmp/.*info
 
-tmp/.config.in: tmp/.pkginfo
-       @./scripts/metadata.pl package_config < $< > $@ || rm -f $@
+tmp/.config-%.in: tmp/.%info
+       @./scripts/metadata.pl $*_config < $< > $@ || rm -f $@
 
-tmp/.config-target.in: tmp/.targetinfo
-       @./scripts/metadata.pl target_config < $< > $@ || rm -f $@
 
-.config: ./scripts/config/conf tmp/.config.in tmp/.config-target.in
+
+.config: ./scripts/config/conf tmp/.config-target.in tmp/.config-package.in
        @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
        @$< -D .config Config.in &> /dev/null
 
@@ -90,39 +71,34 @@ scripts/config/mconf:
 scripts/config/conf:
        @$(MAKE) -C scripts/config conf
 
-config: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+
+
+config: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
        $< Config.in
 
 config-clean: FORCE
        $(NO_TRACE_MAKE) -C scripts/config clean
 
-defconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+defconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
        touch .config
        $< -D .config Config.in
 
-oldconfig: scripts/config/conf tmp/.config.in tmp/.config-target.in FORCE
+oldconfig: scripts/config/conf tmp/.config-target.in tmp/.config-package.in FORCE
        $< -o Config.in
 
-menuconfig: scripts/config/mconf tmp/.config.in tmp/.config-target.in FORCE
+menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FORCE
        $< Config.in
 
 kernel_menuconfig: .config FORCE
        -$(MAKE) target/linux-prepare
        $(NO_TRACE_MAKE) -C target/linux menuconfig
 
-package/%: 
-       @$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
-       $(MAKE) -C package $(patsubst package/%,%,$@)
-
-target/%:
-       @$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
-       $(MAKE) -C target $(patsubst target/%,%,$@)
 
-tools/%: FORCE
-       $(MAKE) -C tools $(patsubst tools/%,%,$@)
+package/% target/%: tmp/.packageinfo
+toolchain/% package/% target/%: tmp/.targetinfo
+package/% target/% tools/% toolchain/%: FORCE
+       $(MAKE) -C $(patsubst %/$*,%,$@) $*
 
-toolchain/%: tmp/.targetinfo FORCE
-       $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 tmp/.prereq-build: include/prereq-build.mk
        @mkdir -p tmp
@@ -133,25 +109,16 @@ tmp/.prereq-build: include/prereq-build.mk
        }
        @touch $@
 
-tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config
+tmp/.prereq-%: include/prereq.mk tmp/.%info .config
        @mkdir -p tmp
        @rm -f tmp/.host.mk
-       @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
+       @$(NO_TRACE_MAKE) -s -C $* prereq 2>/dev/null || { \
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
        @touch $@
 
-tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config
-       @mkdir -p tmp
-       @rm -f tmp/.host.mk
-       @$(NO_TRACE_MAKE) -s -C target prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
-       @touch $@
-
-prereq: tmp/.prereq-build tmp/.prereq-packages tmp/.prereq-target FORCE
+prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
 
 download: .config FORCE
        $(MAKE) tools/download
@@ -174,7 +141,7 @@ clean: FORCE
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 
-distclean: dirclean config-clean
+distclean: dirclean config-clean symlinkclean docclean
        rm -rf dl
 
 help:
@@ -186,7 +153,9 @@ doc:
 docclean:
        $(MAKE) -C docs/ clean
 
-.SILENT: clean dirclean distclean config-clean download world
+symlinkclean:
+       find package -type l -exec rm -f {} +
+
+.SILENT: clean dirclean distclean symlinkclean config-clean download world help
 FORCE: ;
 .PHONY: FORCE help
-%: ;