summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-16 23:11:22 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-09-16 23:19:17 +0200
commit93d493cf2f8a83d6c4f43d17e2234bba2693a1fe (patch)
treec14cce23804db05612bb5e72688681ddc38ee607
parent281a270809b62030e60b964c6c4945199a32e25b (diff)
downloadembtoolkit-93d493cf2f8a83d6c4f43d17e2234bba2693a1fe.tar.gz
embtoolkit-93d493cf2f8a83d6c4f43d17e2234bba2693a1fe.tar.bz2
embtoolkit-93d493cf2f8a83d6c4f43d17e2234bba2693a1fe.tar.xz
Toolchain: move strace among addons
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--Kconfig2
-rw-r--r--core/toolchain/addons.mk28
-rw-r--r--core/toolchain/addons/strace/strace.kconfig (renamed from core/kconfig/strace.kconfig)0
-rw-r--r--core/toolchain/addons/strace/strace.mk (renamed from core/mk/strace.mk)0
4 files changed, 13 insertions, 17 deletions
diff --git a/Kconfig b/Kconfig
index 3d81376..8c1d623 100644
--- a/Kconfig
+++ b/Kconfig
@@ -67,7 +67,7 @@ endmenu
menu "Toolchain Addons - Debugging systems"
source "packages/development/gdb/gdb.kconfig"
source "packages/misc/ncurses/ncurses.kconfig"
-source "core/kconfig/strace.kconfig"
+source "core/toolchain/addons/strace/strace.kconfig"
endmenu
menu "Target build options"
diff --git a/core/toolchain/addons.mk b/core/toolchain/addons.mk
index 898a02f..cf1bd42 100644
--- a/core/toolchain/addons.mk
+++ b/core/toolchain/addons.mk
@@ -30,20 +30,6 @@ TOOLCHAIN_ADDONS_BUILD_DIR := $(TOOLCHAIN_DIR)/.embtk-toolchain_addons
# Include .kconfig symbols if any
-include $(call __embtk_pkg_dotkconfig_f,toolchain_addons)
-#
-# Addon: strace
-#
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install
-
-#
-# Addon: gdb
-#
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDB) += gdb_install
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
-EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install
-
-TOOLCHAIN_ADDONS_DEPS := $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y)
-
#
# Toolchain addons build recipe
@@ -81,7 +67,17 @@ define __embtk_toolchain_addons_build
endef
#
-# Addons Makefile
+# Toolchain addons dependencies
#
-include core/mk/strace.mk
+embtk_pkgincdir := core/toolchain/addons
+
+# strace
+$(call embtk_include_xtoolpkg,strace,toolchain_addons)
+
+# Addon: gdb
+EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDB) += gdb_install
+EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
+EMBTK_TOOLCHAIN_ADDONS_DEPS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install
include packages/development/gdb/gdb.mk
+
+TOOLCHAIN_ADDONS_DEPS := $(EMBTK_TOOLCHAIN_ADDONS_DEPS-y)
diff --git a/core/kconfig/strace.kconfig b/core/toolchain/addons/strace/strace.kconfig
index 866ab59..866ab59 100644
--- a/core/kconfig/strace.kconfig
+++ b/core/toolchain/addons/strace/strace.kconfig
diff --git a/core/mk/strace.mk b/core/toolchain/addons/strace/strace.mk
index c075799..c075799 100644
--- a/core/mk/strace.mk
+++ b/core/toolchain/addons/strace/strace.mk