summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2010-08-21 15:27:36 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2010-08-21 15:27:36 +0200
commit4d4894930a92e5101a0f045dc20be4f6ccb21e1f (patch)
treea2384fcfb6a574d431c3534e02d4edfd5334e4a8 /mk
parent4e055660c077d387c1d9dcecfbeb2f65301d9903 (diff)
downloadembtoolkit-4d4894930a92e5101a0f045dc20be4f6ccb21e1f.tar.gz
embtoolkit-4d4894930a92e5101a0f045dc20be4f6ccb21e1f.tar.bz2
embtoolkit-4d4894930a92e5101a0f045dc20be4f6ccb21e1f.tar.xz
Rootfs: only clean not selected packages
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/gdb.mk3
-rw-r--r--mk/packages.mk8
-rw-r--r--mk/zlib.mk117
3 files changed, 7 insertions, 121 deletions
diff --git a/mk/gdb.mk b/mk/gdb.mk
index e678de3..449056e 100644
--- a/mk/gdb.mk
+++ b/mk/gdb.mk
@@ -57,6 +57,9 @@ $(GDB_TARGET_BUILD_DIR)/.configured:
--target=$(STRICT_GNU_TARGET) --prefix=$(SYSROOT)/usr --disable-werror
@touch $@
+gdb_target_clean:
+ $(call EMBTK_GENERIC_MESSAGE,"Clean gdb for target if necessary...")
+
#gdb for host
$(GDB_HOST_BUILD_DIR)/.installed: download_gdb decompress_gdb \
$(GDB_HOST_BUILD_DIR)/.configured
diff --git a/mk/packages.mk b/mk/packages.mk
index c128bef..0506fda 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -28,8 +28,6 @@ HOSTTOOLS_COMPONENTS-y :=
################################################################################
#################### Common include for target and host ########################
################################################################################
-
-include $(EMBTK_ROOT)/mk/zlib.mk
include $(EMBTK_ROOT)/mk/lzo.mk
include $(EMBTK_ROOT)/mk/mtd-utils.mk
include $(EMBTK_ROOT)/mk/termcap.mk
@@ -55,10 +53,9 @@ include $(EMBTK_ROOT)/mk/strace.mk
# Flash manipulation tools: mtd-utils
ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS) += mtdutils_target_install
-ROOTFS_COMPONENTS_CLEAN += mtdutils_target_clean
#Compression packages
-ROOTFS_COMPONENTS_CLEAN += zlib_target_clean
+include $(EMBTK_ROOT)/packages/compression/compression.mk
# Graphics packages
include $(EMBTK_ROOT)/packages/graphics/graphics.mk
@@ -84,6 +81,9 @@ include $(EMBTK_ROOT)/packages/misc/misc.mk
ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_BB) += busybox_install
include $(EMBTK_ROOT)/packages/busybox/busybox.mk
+#Clean for all unselected packages
+ROOTFS_COMPONENTS_CLEAN := $(subst install,clean,$(ROOTFS_COMPONENTS-))
+
################################################################################
########################## Packages for HOST MACHINE ###########################
################################################################################
diff --git a/mk/zlib.mk b/mk/zlib.mk
deleted file mode 100644
index ebbea26..0000000
--- a/mk/zlib.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-################################################################################
-# Embtoolkit
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
-#
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# 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 zlib.mk
-# \brief zlib.mk of Embtoolkit.
-# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# \date June 2009
-################################################################################
-
-ZLIB_VERSION := 1.2.5
-ZLIB_SITE := http://www.gzip.org/zlib
-ZLIB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/zlib/patches
-ZLIB_PACKAGE := zlib-$(ZLIB_VERSION).tar.bz2
-ZLIB_HOST_BUILD_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION)
-ZLIB_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)
-
-zlib_host_install: $(ZLIB_HOST_BUILD_DIR)/.installed
-
-ZLIB_TARGET_BINS =
-ZLIB_TARGET_SBINS =
-ZLIB_TARGET_INCLUDES = zconf.h zlib.h
-ZLIB_TARGET_LIBS = libz.*
-ZLIB_TARGET_PKGCONFIGS = zlib.pc
-
-ifeq ($(CONFIG_EMBTK_64BITS_FS),y)
-ZLIB_TARGET_LINUX_ARCH := --64
-endif
-zlib_target_install: $(ZLIB_TARGET_BUILD_DIR)/.installed
-
-#zlib on host machine
-$(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \
- $(ZLIB_HOST_BUILD_DIR)/.decompressed $(ZLIB_HOST_BUILD_DIR)/.configured
- @$(MAKE) -C $(ZLIB_HOST_BUILD_DIR)
- @$(MAKE) -C $(ZLIB_HOST_BUILD_DIR) install
- @touch $@
-
-$(ZLIB_HOST_BUILD_DIR)/.decompressed:
- $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(ZLIB_PACKAGE)...")
- @tar -C $(TOOLS_BUILD) -xjf $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE)
- @touch $@
-
-$(ZLIB_HOST_BUILD_DIR)/.configured:
- $(call EMBTK_GENERIC_MESSAGE,"Configuring \
- zlib-$(ZLIB_VERSION) for your development machine...")
- @cd $(ZLIB_HOST_BUILD_DIR); \
- ./configure --prefix=$(HOSTTOOLS)/usr
- @touch $@
-
-#zlib on target machine
-$(ZLIB_TARGET_BUILD_DIR)/.installed: download_zlib \
- $(ZLIB_TARGET_BUILD_DIR)/.decompressed \
- $(ZLIB_TARGET_BUILD_DIR)/.configured
- $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
- zlib-$(ZLIB_VERSION) in your root filesystem...")
- $(Q)$(MAKE) -C $(ZLIB_TARGET_BUILD_DIR)
- $(Q)$(MAKE) -C $(ZLIB_TARGET_BUILD_DIR) DESTDIR=$(SYSROOT) install
- $(Q)$(MAKE) libtool_files_adapt
- $(Q)$(MAKE) pkgconfig_files_adapt
- @touch $@
-
-$(ZLIB_TARGET_BUILD_DIR)/.decompressed:
- $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(ZLIB_PACKAGE)...")
- @tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE)
- @touch $@
-
-$(ZLIB_TARGET_BUILD_DIR)/.configured:
- $(Q)cd $(ZLIB_TARGET_BUILD_DIR); \
- CC=$(TARGETCC_CACHED) \
- CXX=$(TARGETCXX_CACHED) \
- AR=$(TARGETAR) \
- RANLIB=$(TARGETRANLIB) \
- AS=$(CROSS_COMPILE)as \
- LD=$(TARGETLD) \
- NM=$(TARGETNM) \
- STRIP=$(TARGETSTRIP) \
- OBJDUMP=$(TARGETOBJDUMP) \
- OBJCOPY=$(TARGETOBJCOPY) \
- CFLAGS="$(TARGET_CFLAGS)" \
- CXXFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
- CPPFLGAS="-I$(SYSROOT)/usr/include" \
- PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
- ./configure \
- --libdir=/usr/$(LIBDIR) --prefix=/usr
- @touch $@
-
-zlib_target_clean:
- $(call EMBTK_GENERIC_MESSAGE,"cleanup zlib-$(ZLIB_VERSION)...")
- $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(ZLIB_TARGET_BINS)
- $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(ZLIB_TARGET_SBINS)
- $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(ZLIB_TARGET_INCLUDES)
- $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(ZLIB_TARGET_LIBS)
- $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(ZLIB_TARGET_PKGCONFIGS)
-
-
-#zlib download
-download_zlib:
- $(call EMBTK_GENERIC_MESSAGE,"Downloading $(ZLIB_PACKAGE) if necessary...")
- @test -e $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE) || \
- wget -O $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE) $(ZLIB_SITE)/$(ZLIB_PACKAGE)
-