diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-30 15:00:27 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-30 15:00:27 +0000 |
| commit | 506d2a0161e0a82f842f2473f66aa22c9985ad9b (patch) | |
| tree | 054b380d615d12eb94a1ab07ed8e293049ce2572 | |
| parent | e692b6f78e25b78e77387abb0b6e90cbc3407303 (diff) | |
fix compile errors with make 3.80
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8230 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/subdir.mk | 9 | ||||
| -rw-r--r-- | toolchain/Makefile | 2 | ||||
| -rw-r--r-- | tools/Makefile | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index b2bc04b357..16e4f4b6c4 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -25,6 +25,11 @@ endef SUBTARGETS:=clean download prepare compile install update refresh prereq +define subtarget + $(call warn_eval,$(1),t,T,$(1)/$(2): $($(1)/) $(foreach bd,$(if $($(1)/builddirs-$(2)),$($(1)/builddirs-$(2)),$($(1)/builddirs)),$(1)/$(bd)/$(2))) + +endef + # Parameters: <subdir> define subdir $(call warn,$(1),d,D $(1)) @@ -38,9 +43,7 @@ define subdir $(call warn_eval,$(1)/$(bd),l,T,$(1)/$(bd)-$(target): $(1)/$(bd)/$(target)) ) ) - $(foreach target,$(SUBTARGETS), - $(call warn_eval,$(1),t,T,$(1)/$(target): $($(1)/) $(foreach bd,$(if $($(1)/builddirs-$(target)),$($(1)/builddirs-$(target)),$($(1)/builddirs)),$(1)/$(bd)/$(target)) ;) - ) + $(foreach target,$(SUBTARGETS),$(call subtarget,$(1),$(target))) endef # Parameters: <subdir> <name> diff --git a/toolchain/Makefile b/toolchain/Makefile index e0af602c2a..e8ee24ff7a 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -7,7 +7,7 @@ # Main makefile for the toolchain # file:=${lastword ${MAKEFILE_LIST}} -curdir:=$(patsubst %/Makefile,%,${file}) +curdir:=toolchain # subdirectories to descend into $(curdir)/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc) diff --git a/tools/Makefile b/tools/Makefile index ea4ce7081a..2c093c0aac 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -8,7 +8,7 @@ # file:=${lastword ${MAKEFILE_LIST}} -curdir:=$(patsubst %/Makefile,%,${file}) +curdir:=tools # subdirectories to descend into $(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache) |