diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-04 21:59:24 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-10-04 21:59:24 +0200 |
| commit | 2ad9504c38a81fac1501e7284ddf28d652bc5181 (patch) | |
| tree | ddfb1b06cca34c1907916f5af38bde5906914f31 /mk | |
| parent | 06edb6cad2a4ad11a27810ae850ee8eaaddf5abb (diff) | |
| download | embtoolkit-2ad9504c38a81fac1501e7284ddf28d652bc5181.tar.gz embtoolkit-2ad9504c38a81fac1501e7284ddf28d652bc5181.tar.bz2 embtoolkit-2ad9504c38a81fac1501e7284ddf28d652bc5181.tar.xz | |
Build system: replace EMBTK_GENERATED -> embtk_generated
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildsystem.mk | 4 | ||||
| -rw-r--r-- | mk/fs.mk | 2 | ||||
| -rw-r--r-- | mk/rootfs.mk | 8 | ||||
| -rw-r--r-- | mk/toolchain.mk | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index ea3cc67..074d6dd 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -77,7 +77,7 @@ clean: toolchain_clean rmallpath distclean: clean $(Q)rm -rf dl/* src/*.git src/*.svn .config.old - $(Q)rm -rf $(EMBTK_GENERATED) + $(Q)rm -rf $(embtk_generated) define __embtk_mk_pwarning_restartbuild $(call embtk_pwarning,"Wrong make target - Use correct make target") @@ -175,5 +175,5 @@ endef rmallpath: $(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(embtk_tools)* $(embtk_toolsb)* - $(Q)rm -rf $(embtk_sysroot)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-* + $(Q)rm -rf $(embtk_sysroot)* $(HOSTTOOLS)* $(embtk_generated)/rootfs-* $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch) @@ -33,7 +33,7 @@ define embtk_rootfs_mktarbz2 cd $(__embtk_tarbz2_rootdir); \ $(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \ tar cjf $(__embtk_tarbz2_rootfs) *; \ - mv $(__embtk_tarbz2_rootfs) $(EMBTK_GENERATED)/ + mv $(__embtk_tarbz2_rootfs) $(embtk_generated)/ endef # diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 3adeddf..4409676 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -27,10 +27,10 @@ ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y) # Include various filesystems macros include $(EMBTK_ROOT)/mk/fs.mk -ROOTFS_JFFS2 := $(EMBTK_GENERATED)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).jffs2 +ROOTFS_JFFS2 := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).jffs2 ROOTFS_TARBZ2 := rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).tar.bz2 -ROOTFS_SQUASHFS := $(EMBTK_GENERATED)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).squashfs -ROOTFS_INITRAMFS := $(EMBTK_GENERATED)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).initramfs +ROOTFS_SQUASHFS := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).squashfs +ROOTFS_INITRAMFS := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(__embtk_toolchain_clib).initramfs HOSTTOOLS_COMPONENTS-y += makedevs_install fakeroot_install HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2) += mtdutils_host_install @@ -95,7 +95,7 @@ endef define __embtk_rootfs_cleanup $(foreach pkg-n,$(__embtk_rootfs_pkgs-n), $(call __embtk_cleanup_pkg,$(pkg-n));) - rm -rf $(EMBTK_GENERATED)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)* + rm -rf $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)* endef define __embtk_rootfs_mkinitpath diff --git a/mk/toolchain.mk b/mk/toolchain.mk index e6f4271..253bf70 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -95,7 +95,7 @@ AUTOTOOLS_INSTALL += automake_install __embtk_toolchain_clib = $(if $(CONFIG_EMBTK_CLIB_EGLIBC),eglibc,uclibc) TOOLCHAIN_NAME := toolchain TOOLCHAIN_PACKAGE := toolchain-$(GNU_TARGET)-$(__embtk_toolchain_clib)-$(EMBTK_MCU_FLAG).tar.bz2 -TOOLCHAIN_DIR := $(EMBTK_GENERATED)/toolchain-$(GNU_TARGET)-$(__embtk_toolchain_clib)-$(EMBTK_MCU_FLAG) +TOOLCHAIN_DIR := $(embtk_generated)/toolchain-$(GNU_TARGET)-$(__embtk_toolchain_clib)-$(EMBTK_MCU_FLAG) TOOLCHAIN_BUILD_DIR := $(TOOLCHAIN_DIR) TOOLCHAIN_PRE_DEPS-y := ccache_install $(AUTOTOOLS_INSTALL) |