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

use $(curdir) again

Browse source 
SVN-Revision: 8208
This commit is contained in:
Felix Fietkau 2007-07-28 13:44:04 +00:00
parent e143bed1f1
commit d6a0242404
2 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
toolchain/Makefile
View file

@ -6,25 +6,27 @@
# #
# Main makefile for the toolchain # Main makefile for the toolchain
# #
file:=${lastword ${MAKEFILE_LIST}}
curdir:=$(patsubst %/Makefile,%,${file})
# subdirectories to descend into # subdirectories to descend into
toolchain/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc) $(curdir)/builddirs := kernel-headers $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_NATIVE_TOOLCHAIN),,binutils gcc uClibc)
# builddir dependencies # builddir dependencies
toolchain/uClibc/prepare:=toolchain/kernel-headers/prepare $(curdir)/uClibc/prepare:=$(curdir)/kernel-headers/prepare
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
toolchain/binutils/prepare:=toolchain/uClibc/prepare $(curdir)/binutils/prepare:=$(curdir)/uClibc/prepare
toolchain/gcc/prepare:=toolchain/binutils/install $(curdir)/gcc/prepare:=$(curdir)/binutils/install
toolchain/uClibc/compile:=toolchain/gcc/compile $(curdir)/uClibc/compile:=$(curdir)/gcc/compile
endif endif
toolchain/gcc/install:=toolchain/uClibc/install $(curdir)/gcc/install:=$(curdir)/uClibc/install
# prerequisites for the individual targets # prerequisites for the individual targets
toolchain/ := .config $(tools/stamp) $(curdir)/ := .config $(tools/stamp)
toolchain//prepare = $(STAGING_DIR)/include-host/.done $(curdir)//prepare = $(STAGING_DIR)/include-host/.done
toolchain//compile = $(1)/prepare $(curdir)//compile = $(1)/prepare
toolchain//install = $(1)/compile $(curdir)//install = $(1)/compile
$(eval $(call stampfile,toolchain,toolchain)) $(eval $(call stampfile,$(curdir),toolchain))
$(eval $(call subdir,toolchain)) $(eval $(call subdir,$(curdir)))

28
tools/Makefile
View file

@ -7,25 +7,29 @@
# Main makefile for the host tools # Main makefile for the host tools
# #
curdir:=tools file:=${lastword ${MAKEFILE_LIST}}
curdir:=$(patsubst %/Makefile,%,${file})
# subdirectories to descend into # subdirectories to descend into
tools/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache) $(curdir)/builddirs := sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage firmware-utils patch-cmdline $(if $(CONFIG_CCACHE),ccache)
# builddir dependencies # builddir dependencies
tools/squashfs/compile := tools/lzma/install $(curdir)/squashfs/compile := $(curdir)/lzma/install
# preparatory work # preparatory work
define copy_include
$(STAGING_DIR)/include-host/.done: $(STAGING_DIR)/include-host/.done:
@mkdir -p $$(dirname $@) @mkdir -p $$$$(dirname $$@)
@cp tools/include/*.h $$(dirname $@)/ @cp $(1)/include/*.h $$$$(dirname $$@)/
@touch $@ @touch $$@
$(curdir)//prepare = $(STAGING_DIR)/include-host/.done
endef
$(eval $(call copy_include,$(curdir)))
# prerequisites for the individual targets # prerequisites for the individual targets
tools/ := .config $(curdir)/ := .config
tools//prepare = $(STAGING_DIR)/include-host/.done $(curdir)//compile = $(1)/prepare
tools//compile = $(1)/prepare $(curdir)//install = $(1)/compile
tools//install = $(1)/compile
$(eval $(call stampfile,tools,tools)) $(eval $(call stampfile,$(curdir),tools))
$(eval $(call subdir,tools)) $(eval $(call subdir,$(curdir)))