summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-11-04 13:04:16 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-11-04 13:04:16 +0100
commit0c516dda2ac54777be23eb5999b3eae88788aa4f (patch)
tree0449e56f1a6ff0458acaad5d3f89ce3a6c8e7254 /mk
parentfe2b13f422584c6de678285b30c8b5718c6f098d (diff)
downloadembtoolkit-0c516dda2ac54777be23eb5999b3eae88788aa4f.tar.gz
embtoolkit-0c516dda2ac54777be23eb5999b3eae88788aa4f.tar.bz2
embtoolkit-0c516dda2ac54777be23eb5999b3eae88788aa4f.tar.xz
Build system: avoid adding EMBTK_ROOT while including .mk files
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/packages.mk40
-rw-r--r--mk/rootfs.mk2
-rw-r--r--mk/toolchain.mk26
3 files changed, 34 insertions, 34 deletions
diff --git a/mk/packages.mk b/mk/packages.mk
index b6589b4..30836cc 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -30,25 +30,25 @@ HOSTTOOLS_COMPONENTS-y := mkimage_install pkgconfig_install
#
# fakeroot
-include $(EMBTK_ROOT)/mk/fakeroot.mk
+include mk/fakeroot.mk
# gperf
-include $(EMBTK_ROOT)/mk/gperf_host.mk
+include mk/gperf_host.mk
HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GPERF) += gperf_host_install
# libelf
-include $(EMBTK_ROOT)/packages/misc/libelf/libelf.mk
+include packages/misc/libelf/libelf.mk
ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBELF) += libelf_install
HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_LIBELF) += libelf_host_install
-include $(EMBTK_ROOT)/mk/makedevs.mk
-include $(EMBTK_ROOT)/mk/mkimage.mk
-include $(EMBTK_ROOT)/mk/mtd-utils.mk
-include $(EMBTK_ROOT)/mk/pkgconfig.mk
-include $(EMBTK_ROOT)/mk/squashfs.mk
+include mk/makedevs.mk
+include mk/mkimage.mk
+include mk/mtd-utils.mk
+include mk/pkgconfig.mk
+include mk/squashfs.mk
# zlib_host
-include $(EMBTK_ROOT)/mk/zlib_host.mk
+include mk/zlib_host.mk
HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_ZLIB) += zlib_host_install
@@ -61,38 +61,38 @@ HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_ZLIB) += zlib_host_install
ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_MTDUTILS) += mtdutils_install
# Compression packages
-include $(EMBTK_ROOT)/packages/compression/compression.mk
+include packages/compression/compression.mk
# Database packages/libraries
-include $(EMBTK_ROOT)/packages/database/database.mk
+include packages/database/database.mk
# Development libraries/packages
-include $(EMBTK_ROOT)/packages/development/development.mk
+include packages/development/development.mk
# Graphics packages
-include $(EMBTK_ROOT)/packages/graphics/graphics.mk
+include packages/graphics/graphics.mk
# Networking packages
-include $(EMBTK_ROOT)/packages/net/net.mk
+include packages/net/net.mk
# Scripting languages
-include $(EMBTK_ROOT)/packages/scripting-languages/scripting-languages.mk
+include packages/scripting-languages/scripting-languages.mk
# Security packages
-include $(EMBTK_ROOT)/packages/security/security.mk
+include packages/security/security.mk
# System packages
-include $(EMBTK_ROOT)/packages/system/system.mk
+include packages/system/system.mk
# X window system packages
-include $(EMBTK_ROOT)/packages/x11/x11.mk
+include packages/x11/x11.mk
# Miscellaneous packages
-include $(EMBTK_ROOT)/packages/misc/misc.mk
+include packages/misc/misc.mk
# Busybox
ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_BB) += bb_install
-include $(EMBTK_ROOT)/packages/busybox/busybox.mk
+include packages/busybox/busybox.mk
#
# Targets for host machine
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index f8042a2..cec4340 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -26,7 +26,7 @@
ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
# Include various filesystems macros
-include $(EMBTK_ROOT)/mk/fs.mk
+include mk/fs.mk
ROOTFS_JFFS2 := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).jffs2
ROOTFS_TARBZ2 := rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).tar.bz2
ROOTFS_SQUASHFS := $(embtk_generated)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)-$(embtk_clib).squashfs
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 8123f27..41031a6 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -54,41 +54,41 @@ LIBDIR := $(if $(CONFIG_EMBTK_64BITS_FS_COMPAT32),lib32,lib)
export LIBDIR
# ccache
-include $(EMBTK_ROOT)/mk/ccache.mk
+include mk/ccache.mk
# GMP
-include $(EMBTK_ROOT)/mk/gmp.mk
+include mk/gmp.mk
# MPFR
-include $(EMBTK_ROOT)/mk/mpfr.mk
+include mk/mpfr.mk
# MPC
-include $(EMBTK_ROOT)/mk/mpc.mk
+include mk/mpc.mk
# binutils
-include $(EMBTK_ROOT)/mk/binutils.mk
+include mk/binutils.mk
# GCC
-include $(EMBTK_ROOT)/mk/gcc.mk
+include mk/gcc.mk
# linux kernel headers
-include $(EMBTK_ROOT)/mk/linux.mk
+include mk/linux.mk
# toolchain addon: strace
-include $(EMBTK_ROOT)/mk/strace.mk
+include mk/strace.mk
TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install
# toolchain addon: gdb
-include $(EMBTK_ROOT)/packages/development/gdb/gdb.mk
+include packages/development/gdb/gdb.mk
TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDB) += gdbfull_install
TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install
# Autotools
-include $(EMBTK_ROOT)/mk/libtool.mk
-include $(EMBTK_ROOT)/mk/autoconf.mk
-include $(EMBTK_ROOT)/mk/automake.mk
-include $(EMBTK_ROOT)/mk/m4.mk
+include mk/libtool.mk
+include mk/autoconf.mk
+include mk/automake.mk
+include mk/m4.mk
AUTOTOOLS_INSTALL := m4_install libtool_install autoconf_install
AUTOTOOLS_INSTALL += automake_install