From 96401545d66910d84b3ea771934e370756d07fd9 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
Date: Tue, 14 Jul 2009 20:42:48 +0200
Subject: Packages: Allow build of gdb and rework way that host and target
 packages are built

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
---
 Kconfig        |  9 ++++++---
 mk/packages.mk | 46 +++++++++++++++++++++++++++++++++++++++++-----
 mk/rootfs.mk   | 18 ++----------------
 3 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/Kconfig b/Kconfig
index 7c23064..c8cc544 100644
--- a/Kconfig
+++ b/Kconfig
@@ -64,6 +64,11 @@ endmenu
 
 endmenu
 
+menu "Debugging system"
+source "kconfig/gdb.kconfig"
+endmenu
+
+menu "Root filesystem components and build options"
 config EMBTK_HAVE_ROOTFS
 	help
 	 If you want to build a root filesystem, you must say yes here
@@ -71,8 +76,6 @@ config EMBTK_HAVE_ROOTFS
 	bool "Build a root filesystem"
 
 if EMBTK_HAVE_ROOTFS
-menu "Packages selection"
 source "kconfig/packages.kconfig"
-endmenu
 endif
-
+endmenu
diff --git a/mk/packages.mk b/mk/packages.mk
index 97ba59f..3b28e3a 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -1,4 +1,4 @@
-#########################################################################################
+################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
 #
@@ -14,16 +14,15 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#########################################################################################
+################################################################################
 #
 # \file         packages.mk
 # \brief	packages.mk of Embtoolkit
 # \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
 # \date         May 2009
-#########################################################################################
+################################################################################
 
-ROOTFS_COMPONENTS := makedevs_install fakeroot_install
-ROOTFS_COMPONENTS_CLEAN :=
+#Packages for target
 
 #Busybox
 ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_BB),y)
@@ -31,9 +30,46 @@ include $(EMBTK_ROOT)/packages/busybox/busybox.mk
 ROOTFS_COMPONENTS += busybox_install
 endif
 
+ifeq ($(CONFIG_EMBTK_HAVE_GDB_ON_TARGET),y)
+ROOTFS_COMPONENTS += gdb_target_install
+endif
+
+ifeq ($(CONFIG_EMBTK_HAVE_GDBSERVER_ON_TARGET),y)
+ROOTFS_COMPONENTS += gdbserver_target_install
+endif
+
 #mtd-utils
 ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS),y)
 ROOTFS_COMPONENTS += mtd-utils_target_install
 ROOTFS_COMPONENTS_CLEAN += mtd-utils_target_clean
 endif
 
+#Packages for host
+
+#fakeroot
+ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
+include $(EMBTK_ROOT)/mk/fakeroot.mk
+include $(EMBTK_ROOT)/mk/makedevs.mk
+HOSTTOOLS_COMPONENTS := makedevs_install fakeroot_install
+endif
+
+#gdb
+ifeq ($(CONFIG_EMBTK_HAVE_GDB),y)
+include $(EMBTK_ROOT)/mk/termcap.mk
+include $(EMBTK_ROOT)/mk/gdb.mk
+ifeq ($(CONFIG_EMBTK_HAVE_GDB_ON_HOST),y)
+HOSTTOOLS_COMPONENTS += gdb_host_install
+endif
+endif
+
+#lzo
+include $(EMBTK_ROOT)/mk/lzo.mk
+
+#mtd-utils
+ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
+include $(EMBTK_ROOT)/mk/mtd-utils.mk
+endif
+
+#zlib
+include $(EMBTK_ROOT)/mk/zlib.mk
+
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index e996d3d..97623b6 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -23,20 +23,6 @@
 ################################################################################
 
 ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
-#makedevs
-include $(EMBTK_ROOT)/mk/makedevs.mk
-
-#fakeroot
-include $(EMBTK_ROOT)/mk/fakeroot.mk
-
-#lzo
-include $(EMBTK_ROOT)/mk/lzo.mk
-
-#zlib
-include $(EMBTK_ROOT)/mk/zlib.mk
-
-#mtd-utils
-include $(EMBTK_ROOT)/mk/mtd-utils.mk
 
 ifeq ($(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2),y)
 HOSTTOOLS_COMPONENTS += mtd-utils_host_install
@@ -85,7 +71,7 @@ rootfs_clean: $(HOSTTOOLS_COMPONENTS_CLEAN) $(ROOTFS_COMPONENTS_CLEAN)
 	@rm -rf rootfs-*
 
 else
-rootfs_build:
-rootfs_clean:
+rootfs_build: $(HOSTTOOLS_COMPONENTS)
+rootfs_clean: $(HOSTTOOLS_COMPONENTS_CLEAN)
 
 endif
-- 
cgit v1.2.3