KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tidy up Makefiles

Browse source 
SVN-Revision: 6857
This commit is contained in:
Mike Baker 2007-04-03 23:03:56 +00:00
parent da8174507a
commit 23efe5fc83
5 changed files with 40 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Config.in
View file

@ -123,5 +123,5 @@ source "target/linux/*/image/Config.in"
endmenu endmenu
source "tmp/.config.in" source "tmp/.config-package.in"

70
Makefile
View file

@ -41,27 +41,27 @@ export OPENWRTVERSION
ifeq ($(FORCE),) ifeq ($(FORCE),)
.config scripts/config/conf scripts/config/mconf: tmp/.prereq-build .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 endif
tmp/.pkginfo: FORCE package/%/Makefile: ;
@mkdir -p tmp/info target/%/Makefile: ;
@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="pkginfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(shell ls include/package*.mk) include/kernel.mk" SCAN_EXTRA=""
tmp/.targetinfo: FORCE 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 @mkdir -p tmp/info
@$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="$(shell ls include/kernel*.mk)" SCAN_EXTRA="" @$(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 tmpinfo-clean: FORCE
@-rm -rf tmp/.pkginfo tmp/.targetinfo @-rm -rf tmp/.*info
tmp/.config.in: tmp/.pkginfo tmp/.config-%.in: tmp/.%info
@./scripts/metadata.pl package_config < $< > $@ || rm -f $@ @./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 @[ -f .config ] || $(NO_TRACE_MAKE) menuconfig
@$< -D .config Config.in &> /dev/null @$< -D .config Config.in &> /dev/null
@ -71,42 +71,34 @@ scripts/config/mconf:
scripts/config/conf: scripts/config/conf:
@$(MAKE) -C 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.in
config-clean: FORCE config-clean: FORCE
$(NO_TRACE_MAKE) -C scripts/config clean $(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 touch .config
$< -D .config Config.in $< -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 $< -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 $< Config.in
kernel_menuconfig: .config FORCE kernel_menuconfig: .config FORCE
-$(MAKE) target/linux-prepare -$(MAKE) target/linux-prepare
$(NO_TRACE_MAKE) -C target/linux menuconfig $(NO_TRACE_MAKE) -C target/linux menuconfig
scan_packages:
@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
package/% target/%: tmp/.packageinfo
toolchain/% package/% target/%: tmp/.targetinfo
package/% target/% tools/% toolchain/%: FORCE
$(MAKE) -C $(patsubst %/$*,%,$@) $*
package/%: scan_packages
$(MAKE) -C package $(patsubst package/%,%,$@)
target/%: scan_packages
@$(NO_TRACE_MAKE) -s tmp/.pkginfo tmp/.targetinfo
$(MAKE) -C target $(patsubst target/%,%,$@)
tools/%: FORCE
$(MAKE) -C tools $(patsubst tools/%,%,$@)
toolchain/%: tmp/.targetinfo FORCE
$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
tmp/.prereq-build: include/prereq-build.mk tmp/.prereq-build: include/prereq-build.mk
@mkdir -p tmp @mkdir -p tmp
@ -117,25 +109,16 @@ tmp/.prereq-build: include/prereq-build.mk
} }
@touch $@ @touch $@
tmp/.prereq-packages: include/prereq.mk tmp/.pkginfo .config tmp/.prereq-%: include/prereq.mk tmp/.%info .config
@mkdir -p tmp @mkdir -p tmp
@rm -f tmp/.host.mk @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."; \ echo "Prerequisite check failed. Use FORCE=1 to override."; \
false; \ false; \
} }
@touch $@ @touch $@
tmp/.prereq-target: include/prereq.mk tmp/.targetinfo .config prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target FORCE
@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
download: .config FORCE download: .config FORCE
$(MAKE) tools/download $(MAKE) tools/download
@ -173,7 +156,6 @@ docclean:
symlinkclean: symlinkclean:
find package -type l -exec rm -f {} + find package -type l -exec rm -f {} +
.SILENT: clean dirclean distclean symlinkclean config-clean download world .SILENT: clean dirclean distclean symlinkclean config-clean download world help
FORCE: ; FORCE: ;
.PHONY: FORCE help .PHONY: FORCE help
%: ;

8
include/scan.mk
View file

@ -1,6 +1,6 @@
include $(TOPDIR)/include/verbose.mk include $(TOPDIR)/include/verbose.mk
SCAN_TARGET ?= pkginfo SCAN_TARGET ?= packageinfo
SCAN_NAME ?= package SCAN_NAME ?= package
SCAN_DIR ?= package SCAN_DIR ?= package
SCAN_DEPS ?= include/package.mk SCAN_DEPS ?= include/package.mk
@ -15,7 +15,7 @@ else
endef endef
endif endif
SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(shell ls $(SCAN_DIR)/*/Makefile)) SCAN = $(patsubst $(SCAN_DIR)/%/Makefile,%,$(wildcard $(SCAN_DIR)/*/Makefile))
tmp/.$(SCAN_TARGET): tmp/.$(SCAN_TARGET):
@($(call progress,Collecting $(SCAN_NAME) info: merging...)) @($(call progress,Collecting $(SCAN_NAME) info: merging...))
for file in $(SCAN); do \ for file in $(SCAN); do \
@ -32,8 +32,8 @@ $(SCAN_STAMP):
endif endif
# FIXME: generate this dynamically? # FIXME: generate this dynamically?
ifeq ($(SCAN_TARGET),pkginfo) ifeq ($(SCAN_TARGET),packageinfo)
tmp/info/.pkginfo-kernel: $(shell ls package/kernel/modules/*.mk) tmp/info/.packageinfo-kernel: $(wildcard package/kernel/modules/*.mk)
endif endif
define scanfiles define scanfiles

23
package/Makefile
View file

@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host.mk
all: compile all: compile
include $(TMP_DIR)/.pkgdeps include $(TMP_DIR)/.packagedeps
PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m)) PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m)) DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
@ -22,25 +22,14 @@ INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
$(STAMP_DIR) $(TARGET_DIR): $(STAMP_DIR) $(TARGET_DIR):
mkdir -p $@ mkdir -p $@
%-prereq %-download %-clean %-compile %-install: FORCE
$(MAKE) -C $* $(patsubst $*-%,%,$@)
%-prereq: $(STAMP_DIR) $(TARGET_DIR) %-prereq: $(STAMP_DIR) $(TARGET_DIR)
$(MAKE) -C $(patsubst %-prereq,%,$@) prereq %-prepare: $(TARGET_DIR)
%-download: FORCE
$(MAKE) -C $(patsubst %-download,%,$@) download
%-prepare: $(TARGET_DIR) FORCE
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
%-compile: %-prepare %-compile: %-prepare
$(MAKE) -C $(patsubst %-compile,%,$@) compile
%-install: $(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
$(MAKE) -C $(patsubst %-install,%,$@) install
%-clean: FORCE
$(MAKE) -C $(patsubst %-clean,%,$@) clean
$(TMP_DIR)/.pkgdeps: $(TMP_DIR)/.pkginfo
@$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@ @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@
preconfig: preconfig:

14
rules.mk
View file

@ -135,20 +135,12 @@ endef
# Parameters: # Parameters:
# 1: dependencies for the prepare step # 1: dependencies for the prepare step
define default_subtargets define default_subtargets
%-download: FORCE %-download %-prepare %-compile %-install %-clean: FORCE
$$(MAKE) -C $$(patsubst %-download,%,$$@) download $$(MAKE) -C $$* $$(patsubst $$*-%,%,$$@)
%-prepare: $(1) FORCE
$$(MAKE) -C $$(patsubst %-prepare,%,$$@) prepare
%-compile: %-prepare %-compile: %-prepare
$$(MAKE) -C $$(patsubst %-compile,%,$$@) compile
%-install: %-compile %-install: %-compile
$$(MAKE) -C $$(patsubst %-install,%,$$@) install .SILENT: %-clean
%-clean: FORCE
@$$(MAKE) -C $$(patsubst %-clean,%,$$@) clean
endef endef