diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | core/mk/arch/arm/arm.mk (renamed from mk/arch/arm/arm.mk) | 0 | ||||
| -rw-r--r-- | core/mk/arch/mips/mips.mk (renamed from mk/arch/mips/mips.mk) | 0 | ||||
| -rw-r--r-- | core/mk/autoconf.mk (renamed from mk/autoconf.mk) | 0 | ||||
| -rw-r--r-- | core/mk/automake.mk (renamed from mk/automake.mk) | 0 | ||||
| -rw-r--r-- | core/mk/bmake.mk (renamed from mk/bmake.mk) | 0 | ||||
| -rw-r--r-- | core/mk/buildsystem.mk (renamed from mk/buildsystem.mk) | 0 | ||||
| -rw-r--r-- | core/mk/eglibc.mk (renamed from mk/eglibc.mk) | 2 | ||||
| l--------- | core/mk/eglibc/eglibc-2.17-options.mk (renamed from mk/eglibc/eglibc-2.17-options.mk) | 0 | ||||
| -rw-r--r-- | core/mk/eglibc/eglibc-trunk-options.mk (renamed from mk/eglibc/eglibc-trunk-options.mk) | 0 | ||||
| -rw-r--r-- | core/mk/glibc.mk (renamed from mk/glibc.mk) | 0 | ||||
| -rw-r--r-- | core/mk/gmake.mk (renamed from mk/gmake.mk) | 0 | ||||
| -rw-r--r-- | core/mk/gmp.mk (renamed from mk/gmp.mk) | 0 | ||||
| -rw-r--r-- | core/mk/gperf_host.mk (renamed from mk/gperf_host.mk) | 0 | ||||
| -rw-r--r-- | core/mk/gsed.mk (renamed from mk/gsed.mk) | 0 | ||||
| -rw-r--r-- | core/mk/help.mk (renamed from mk/help.mk) | 0 | ||||
| -rw-r--r-- | core/mk/libtool.mk (renamed from mk/libtool.mk) | 0 | ||||
| -rw-r--r-- | core/mk/linux.mk (renamed from mk/linux.mk) | 0 | ||||
| -rw-r--r-- | core/mk/m4.mk (renamed from mk/m4.mk) | 0 | ||||
| -rw-r--r-- | core/mk/macros.mk (renamed from mk/macros.mk) | 16 | ||||
| -rw-r--r-- | core/mk/makedevs.mk (renamed from mk/makedevs.mk) | 0 | ||||
| -rw-r--r-- | core/mk/mkimage.mk (renamed from mk/mkimage.mk) | 0 | ||||
| -rw-r--r-- | core/mk/mpc.mk (renamed from mk/mpc.mk) | 0 | ||||
| -rw-r--r-- | core/mk/mpfr.mk (renamed from mk/mpfr.mk) | 0 | ||||
| -rw-r--r-- | core/mk/musl.mk (renamed from mk/musl.mk) | 0 | ||||
| -rw-r--r-- | core/mk/packages.mk (renamed from mk/packages.mk) | 8 | ||||
| -rw-r--r-- | core/mk/pkg-macros/clean.mk (renamed from mk/pkg-macros/clean.mk) | 0 | ||||
| -rw-r--r-- | core/mk/pkg-macros/configure.mk (renamed from mk/pkg-macros/configure.mk) | 0 | ||||
| -rw-r--r-- | core/mk/pkg-macros/download.mk (renamed from mk/pkg-macros/download.mk) | 0 | ||||
| -rw-r--r-- | core/mk/pkg-macros/incl.mk (renamed from mk/pkg-macros/incl.mk) | 0 | ||||
| -rw-r--r-- | core/mk/pkg-macros/install.mk (renamed from mk/pkg-macros/install.mk) | 0 | ||||
| -rw-r--r-- | core/mk/pkg-macros/libtool.mk (renamed from mk/pkg-macros/libtool.mk) | 0 | ||||
| -rw-r--r-- | core/mk/pkg-macros/pkg-config.mk (renamed from mk/pkg-macros/pkg-config.mk) | 0 | ||||
| -rw-r--r-- | core/mk/pkg-macros/vars.mk (renamed from mk/pkg-macros/vars.mk) | 0 | ||||
| -rw-r--r-- | core/mk/rootfs/README.busybox.inittab (renamed from mk/rootfs/README.busybox.inittab) | 0 | ||||
| -rw-r--r-- | core/mk/rootfs/fs.mk (renamed from mk/rootfs/fs.mk) | 0 | ||||
| -rw-r--r-- | core/mk/rootfs/rootfs.mk (renamed from mk/rootfs/rootfs.mk) | 2 | ||||
| -rw-r--r-- | core/mk/squashfs.mk (renamed from mk/squashfs.mk) | 0 | ||||
| -rw-r--r-- | core/mk/strace.mk (renamed from mk/strace.mk) | 0 | ||||
| -rw-r--r-- | core/mk/target-mcu.mk (renamed from mk/target-mcu.mk) | 4 | ||||
| -rw-r--r-- | core/mk/targetsys.mk (renamed from mk/targetsys.mk) | 0 | ||||
| -rwxr-xr-x | core/mk/uclibc.mk (renamed from mk/uclibc.mk) | 0 | ||||
| -rw-r--r-- | toolchain/toolchain.mk | 26 |
43 files changed, 36 insertions, 36 deletions
@@ -121,12 +121,12 @@ EMBTK_BUILD := $(if $(CONFIG_EMBTK_DOTCONFIG),startbuild,xconfig) All: $(EMBTK_BUILD) -include mk/macros.mk -include mk/targetsys.mk -include mk/target-mcu.mk -include mk/buildsystem.mk +include core/mk/macros.mk +include core/mk/targetsys.mk +include core/mk/target-mcu.mk +include core/mk/buildsystem.mk include toolchain/toolchain.mk -include mk/packages.mk +include core/mk/packages.mk include packages/htools/hosttools-buildopts.mk -include mk/rootfs/rootfs.mk -include mk/help.mk +include core/mk/rootfs/rootfs.mk +include core/mk/help.mk diff --git a/mk/arch/arm/arm.mk b/core/mk/arch/arm/arm.mk index f3a3e48..f3a3e48 100644 --- a/mk/arch/arm/arm.mk +++ b/core/mk/arch/arm/arm.mk diff --git a/mk/arch/mips/mips.mk b/core/mk/arch/mips/mips.mk index 6914579..6914579 100644 --- a/mk/arch/mips/mips.mk +++ b/core/mk/arch/mips/mips.mk diff --git a/mk/autoconf.mk b/core/mk/autoconf.mk index d4bd6c7..d4bd6c7 100644 --- a/mk/autoconf.mk +++ b/core/mk/autoconf.mk diff --git a/mk/automake.mk b/core/mk/automake.mk index 3d3f1a2..3d3f1a2 100644 --- a/mk/automake.mk +++ b/core/mk/automake.mk diff --git a/mk/bmake.mk b/core/mk/bmake.mk index 4dccf83..4dccf83 100644 --- a/mk/bmake.mk +++ b/core/mk/bmake.mk diff --git a/mk/buildsystem.mk b/core/mk/buildsystem.mk index 8bada7e..8bada7e 100644 --- a/mk/buildsystem.mk +++ b/core/mk/buildsystem.mk diff --git a/mk/eglibc.mk b/core/mk/eglibc.mk index d23a057..959283d 100644 --- a/mk/eglibc.mk +++ b/core/mk/eglibc.mk @@ -45,7 +45,7 @@ embtk_eglibc_versioning-$(CONFIG_EMBTK_EGLIBC_DISABLE_VERSIONING) := \ embtk_eglibc-sunrpc-$(CONFIG_KEMBTK_EGLIBC_OPTION_EGLIBC_SUNRPC) := \ --enable-obsolete-rpc=yes -embtk_eglibc_optgroups_f := $(EMBTK_ROOT)/mk/eglibc/eglibc-$(EGLIBC_VERSION)-options.mk +embtk_eglibc_optgroups_f := $(EMBTK_ROOT)/core/mk/eglibc/eglibc-$(EGLIBC_VERSION)-options.mk eglibc_optgroups_f := $(EGLIBC_BUILD_DIR)/option-groups.config ifeq ($(embtk_buildhost_os_type),bsd) diff --git a/mk/eglibc/eglibc-2.17-options.mk b/core/mk/eglibc/eglibc-2.17-options.mk index 5604f57..5604f57 120000 --- a/mk/eglibc/eglibc-2.17-options.mk +++ b/core/mk/eglibc/eglibc-2.17-options.mk diff --git a/mk/eglibc/eglibc-trunk-options.mk b/core/mk/eglibc/eglibc-trunk-options.mk index 9c3c7eb..9c3c7eb 100644 --- a/mk/eglibc/eglibc-trunk-options.mk +++ b/core/mk/eglibc/eglibc-trunk-options.mk diff --git a/mk/glibc.mk b/core/mk/glibc.mk index ad72875..ad72875 100644 --- a/mk/glibc.mk +++ b/core/mk/glibc.mk diff --git a/mk/gmake.mk b/core/mk/gmake.mk index 2451638..2451638 100644 --- a/mk/gmake.mk +++ b/core/mk/gmake.mk diff --git a/mk/gmp.mk b/core/mk/gmp.mk index aa48721..aa48721 100644 --- a/mk/gmp.mk +++ b/core/mk/gmp.mk diff --git a/mk/gperf_host.mk b/core/mk/gperf_host.mk index f4ab8c9..f4ab8c9 100644 --- a/mk/gperf_host.mk +++ b/core/mk/gperf_host.mk diff --git a/mk/gsed.mk b/core/mk/gsed.mk index d028c9a..d028c9a 100644 --- a/mk/gsed.mk +++ b/core/mk/gsed.mk diff --git a/mk/help.mk b/core/mk/help.mk index 02ccd6a..02ccd6a 100644 --- a/mk/help.mk +++ b/core/mk/help.mk diff --git a/mk/libtool.mk b/core/mk/libtool.mk index cdcd29e..cdcd29e 100644 --- a/mk/libtool.mk +++ b/core/mk/libtool.mk diff --git a/mk/linux.mk b/core/mk/linux.mk index b9a08ff..b9a08ff 100644 --- a/mk/linux.mk +++ b/core/mk/linux.mk diff --git a/mk/macros.mk b/core/mk/macros.mk index 7d93325..f0e44cf 100644 --- a/mk/macros.mk +++ b/core/mk/macros.mk @@ -122,11 +122,11 @@ endef # # Packages management macros -include mk/pkg-macros/vars.mk -include mk/pkg-macros/incl.mk -include mk/pkg-macros/pkg-config.mk -include mk/pkg-macros/libtool.mk -include mk/pkg-macros/download.mk -include mk/pkg-macros/configure.mk -include mk/pkg-macros/install.mk -include mk/pkg-macros/clean.mk +include core/mk/pkg-macros/vars.mk +include core/mk/pkg-macros/incl.mk +include core/mk/pkg-macros/pkg-config.mk +include core/mk/pkg-macros/libtool.mk +include core/mk/pkg-macros/download.mk +include core/mk/pkg-macros/configure.mk +include core/mk/pkg-macros/install.mk +include core/mk/pkg-macros/clean.mk diff --git a/mk/makedevs.mk b/core/mk/makedevs.mk index ebee7ad..ebee7ad 100644 --- a/mk/makedevs.mk +++ b/core/mk/makedevs.mk diff --git a/mk/mkimage.mk b/core/mk/mkimage.mk index a83e42e..a83e42e 100644 --- a/mk/mkimage.mk +++ b/core/mk/mkimage.mk diff --git a/mk/mpc.mk b/core/mk/mpc.mk index 8f465ba..8f465ba 100644 --- a/mk/mpc.mk +++ b/core/mk/mpc.mk diff --git a/mk/mpfr.mk b/core/mk/mpfr.mk index fc242f6..fc242f6 100644 --- a/mk/mpfr.mk +++ b/core/mk/mpfr.mk diff --git a/mk/musl.mk b/core/mk/musl.mk index e2f1377..e2f1377 100644 --- a/mk/musl.mk +++ b/core/mk/musl.mk diff --git a/mk/packages.mk b/core/mk/packages.mk index 56fb111..9268d30 100644 --- a/mk/packages.mk +++ b/core/mk/packages.mk @@ -30,7 +30,7 @@ HOSTTOOLS_COMPONENTS-y := mkimage_install # # gperf -include mk/gperf_host.mk +include core/mk/gperf_host.mk HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GPERF) += gperf_host_install # libelf @@ -38,9 +38,9 @@ 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 mk/makedevs.mk -include mk/mkimage.mk -include mk/squashfs.mk +include core/mk/makedevs.mk +include core/mk/mkimage.mk +include core/mk/squashfs.mk # Install various tools in case of FreeBSD host development machine ifeq ($(embtk_buildhost_os_type),bsd) diff --git a/mk/pkg-macros/clean.mk b/core/mk/pkg-macros/clean.mk index b9b76a5..b9b76a5 100644 --- a/mk/pkg-macros/clean.mk +++ b/core/mk/pkg-macros/clean.mk diff --git a/mk/pkg-macros/configure.mk b/core/mk/pkg-macros/configure.mk index b6f095b..b6f095b 100644 --- a/mk/pkg-macros/configure.mk +++ b/core/mk/pkg-macros/configure.mk diff --git a/mk/pkg-macros/download.mk b/core/mk/pkg-macros/download.mk index 6300f4f..6300f4f 100644 --- a/mk/pkg-macros/download.mk +++ b/core/mk/pkg-macros/download.mk diff --git a/mk/pkg-macros/incl.mk b/core/mk/pkg-macros/incl.mk index 3a8cc5a..3a8cc5a 100644 --- a/mk/pkg-macros/incl.mk +++ b/core/mk/pkg-macros/incl.mk diff --git a/mk/pkg-macros/install.mk b/core/mk/pkg-macros/install.mk index b80caca..b80caca 100644 --- a/mk/pkg-macros/install.mk +++ b/core/mk/pkg-macros/install.mk diff --git a/mk/pkg-macros/libtool.mk b/core/mk/pkg-macros/libtool.mk index 029d934..029d934 100644 --- a/mk/pkg-macros/libtool.mk +++ b/core/mk/pkg-macros/libtool.mk diff --git a/mk/pkg-macros/pkg-config.mk b/core/mk/pkg-macros/pkg-config.mk index 8fe591d..8fe591d 100644 --- a/mk/pkg-macros/pkg-config.mk +++ b/core/mk/pkg-macros/pkg-config.mk diff --git a/mk/pkg-macros/vars.mk b/core/mk/pkg-macros/vars.mk index e7e1a6e..e7e1a6e 100644 --- a/mk/pkg-macros/vars.mk +++ b/core/mk/pkg-macros/vars.mk diff --git a/mk/rootfs/README.busybox.inittab b/core/mk/rootfs/README.busybox.inittab index b9eb1e9..b9eb1e9 100644 --- a/mk/rootfs/README.busybox.inittab +++ b/core/mk/rootfs/README.busybox.inittab diff --git a/mk/rootfs/fs.mk b/core/mk/rootfs/fs.mk index e1500e3..e1500e3 100644 --- a/mk/rootfs/fs.mk +++ b/core/mk/rootfs/fs.mk diff --git a/mk/rootfs/rootfs.mk b/core/mk/rootfs/rootfs.mk index ed8f9b8..255e0b3 100644 --- a/mk/rootfs/rootfs.mk +++ b/core/mk/rootfs/rootfs.mk @@ -26,7 +26,7 @@ ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y) # Include various filesystems macros -include mk/rootfs/fs.mk +include core/mk/rootfs/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 diff --git a/mk/squashfs.mk b/core/mk/squashfs.mk index 6b046bf..6b046bf 100644 --- a/mk/squashfs.mk +++ b/core/mk/squashfs.mk diff --git a/mk/strace.mk b/core/mk/strace.mk index b2d57cc..b2d57cc 100644 --- a/mk/strace.mk +++ b/core/mk/strace.mk diff --git a/mk/target-mcu.mk b/core/mk/target-mcu.mk index e440e16..7e7ace4 100644 --- a/mk/target-mcu.mk +++ b/core/mk/target-mcu.mk @@ -24,10 +24,10 @@ # ARM ifeq ($(CONFIG_EMBTK_ARCH_ARM),y) -include mk/arch/arm/arm.mk +include core/mk/arch/arm/arm.mk endif # MIPS ifeq ($(CONFIG_EMBTK_ARCH_MIPS),y) -include mk/arch/mips/mips.mk +include core/mk/arch/mips/mips.mk endif diff --git a/mk/targetsys.mk b/core/mk/targetsys.mk index 093fb7b..093fb7b 100644 --- a/mk/targetsys.mk +++ b/core/mk/targetsys.mk diff --git a/mk/uclibc.mk b/core/mk/uclibc.mk index 2aa63ab..2aa63ab 100755 --- a/mk/uclibc.mk +++ b/core/mk/uclibc.mk diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk index 127bdf1..ebd9dcb 100644 --- a/toolchain/toolchain.mk +++ b/toolchain/toolchain.mk @@ -31,13 +31,13 @@ include toolchain/vars.mk include packages/htools/ccache/vars.mk # GMP -include mk/gmp.mk +include core/mk/gmp.mk # MPFR -include mk/mpfr.mk +include core/mk/mpfr.mk # MPC -include mk/mpc.mk +include core/mk/mpc.mk # # binutils @@ -61,12 +61,12 @@ include toolchain/llvm/libc++/libcxx.mk # # linux kernel headers # -include mk/linux.mk +include core/mk/linux.mk # # toolchain addon: strace # -include mk/strace.mk +include core/mk/strace.mk TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install # @@ -80,21 +80,21 @@ TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install # # Autotools # -include mk/libtool.mk -include mk/autoconf.mk -include mk/automake.mk -include mk/m4.mk +include core/mk/libtool.mk +include core/mk/autoconf.mk +include core/mk/automake.mk +include core/mk/m4.mk AUTOTOOLS_INSTALL := m4_install libtool_install autoconf_install AUTOTOOLS_INSTALL += automake_install # GNU sed -include mk/gsed.mk +include core/mk/gsed.mk # BSD make -include mk/bmake.mk +include core/mk/bmake.mk # GNU make -include mk/gmake.mk +include core/mk/gmake.mk # # Toolchain virtual package internals @@ -150,7 +150,7 @@ TOOLCHAIN_ADDONS_DEPS := $(TOOLCHAIN_ADDONS-y) TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain_addons TOOLCHAIN_ADDONS_SRC_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain_addons --include mk/$(embtk_clib).mk +-include core/mk/$(embtk_clib).mk define __embtk_toolchain_mkinitdirs mkdir -p $(embtk_generated) |