From 4d4894930a92e5101a0f045dc20be4f6ccb21e1f Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sat, 21 Aug 2010 15:27:36 +0200 Subject: Rootfs: only clean not selected packages Signed-off-by: Abdoulaye Walsimou Gaye --- kconfig/mtdutils.kconfig | 1 + kconfig/packages.kconfig | 2 + mk/gdb.mk | 3 + mk/packages.mk | 8 +- mk/zlib.mk | 117 ------------------ packages/compression/compression.kconfig | 27 +++++ packages/compression/compression.mk | 30 +++++ packages/compression/zlib/zlib.kconfig | 50 ++++++++ packages/compression/zlib/zlib.mk | 135 +++++++++++++++++++++ packages/graphics/freetype/freetype.kconfig | 1 + packages/graphics/graphics.mk | 12 -- packages/graphics/libpng/libpng.kconfig | 2 +- packages/misc/glib/glib.kconfig | 1 + packages/misc/misc.mk | 8 -- packages/scripting-languages/perl/perl.mk | 2 + .../scripting-languages/scripting-languages.mk | 1 - packages/security/security.mk | 1 - packages/system/system.mk | 3 +- packages/x11/x11.mk | 38 ------ 19 files changed, 258 insertions(+), 184 deletions(-) delete mode 100644 mk/zlib.mk create mode 100644 packages/compression/compression.kconfig create mode 100644 packages/compression/compression.mk create mode 100644 packages/compression/zlib/zlib.kconfig create mode 100644 packages/compression/zlib/zlib.mk diff --git a/kconfig/mtdutils.kconfig b/kconfig/mtdutils.kconfig index 224356a..3089835 100644 --- a/kconfig/mtdutils.kconfig +++ b/kconfig/mtdutils.kconfig @@ -26,6 +26,7 @@ config EMBTK_HOST_HAVE_MTDUTILS bool select EMBTK_HAVE_UTILLINUXNG + select EMBTK_HOST_HAVE_ZLIB help mtd-utils intented to run on the host development machine. choice diff --git a/kconfig/packages.kconfig b/kconfig/packages.kconfig index 2d2304e..85b79b6 100644 --- a/kconfig/packages.kconfig +++ b/kconfig/packages.kconfig @@ -38,6 +38,7 @@ menu "Flash manipulation tools" #mtd-utils on target config EMBTK_ROOTFS_HAVE_MTDUTILS bool "Have mtd-utils in your target root filesystem" + select EMBTK_HAVE_ZLIB select KEMBTK_UCLIBC_UCLIBC_SUSV3_LEGACY_MACROS if EMBTK_CLIB_UCLIBC help The MTD Utilities are a collection of tools that allow the user to @@ -58,6 +59,7 @@ config EMBTK_ROOTFS_HAVE_MTDUTILS endmenu menu "Compression packages" +source packages/compression/compression.kconfig endmenu menu "Graphics packages" 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, -# \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) - diff --git a/packages/compression/compression.kconfig b/packages/compression/compression.kconfig new file mode 100644 index 0000000..d18ebe0 --- /dev/null +++ b/packages/compression/compression.kconfig @@ -0,0 +1,27 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that 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, see . +# +################################################################################ +# +# \file compression.kconfig +# \brief compression.kconfig of Embtoolkit. +# \author Abdoulaye Walsimou GAYE +# \date August 2010 +################################################################################ + +#zlib +source packages/compression/zlib/zlib.kconfig diff --git a/packages/compression/compression.mk b/packages/compression/compression.mk new file mode 100644 index 0000000..f134dec --- /dev/null +++ b/packages/compression/compression.mk @@ -0,0 +1,30 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that 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, see . +# +################################################################################ +# +# \file compression.mk +# \brief compression.mk of Embtoolkit. +# \author Abdoulaye Walsimou GAYE +# \date August 2010 +################################################################################ + +#zlib for host and target +include $(EMBTK_ROOT)/packages/compression/zlib/zlib.mk +ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_ZLIB) += zlib_target_install +HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_ZLIB) += zlib_host_install + diff --git a/packages/compression/zlib/zlib.kconfig b/packages/compression/zlib/zlib.kconfig new file mode 100644 index 0000000..fb7e366 --- /dev/null +++ b/packages/compression/zlib/zlib.kconfig @@ -0,0 +1,50 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that 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, see . +# +################################################################################ +# +# \file zlib.kconfig +# \brief zlib.kconfig of Embtoolkit. +# \author Abdoulaye Walsimou GAYE +# \date August 2010 +################################################################################ + +config EMBTK_HAVE_ZLIB + bool "Have zlib in target" + help + zlib is a compression library. + +config EMBTK_HOST_HAVE_ZLIB + bool + help + build zlib for the host development machine. +choice + prompt "zlib version used" + depends on EMBTK_HAVE_ZLIB || EMBTK_HOST_HAVE_ZLIB + help + zlib version used + + config EMBTK_ZLIB_VERSION_1_2_5 + bool "zlib-1.2.5" +endchoice + +config EMBTK_ZLIB_NEED_PATCH + bool + +config EMBTK_ZLIB_VERSION_STRING + string + default "1.2.5" if EMBTK_ZLIB_VERSION_1_2_5 diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk new file mode 100644 index 0000000..f3324eb --- /dev/null +++ b/packages/compression/zlib/zlib.mk @@ -0,0 +1,135 @@ +################################################################################ +# Embtoolkit +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that 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, see . +# +################################################################################ +# +# \file zlib.mk +# \brief zlib.mk of Embtoolkit. +# \author Abdoulaye Walsimou GAYE +# \date June 2009 +################################################################################ + +ZLIB_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_ZLIB_VERSION_STRING))) +ZLIB_SITE := http://www.gzip.org/zlib +ZLIB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/zlib/$(ZLIB_VERSION) +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 on host machine # +######################## +zlib_host_install: $(ZLIB_HOST_BUILD_DIR)/.installed + +$(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_host_clean: + +########################## +# zlib on target machine # +########################## +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_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) +ifeq ($(CONFIG_EMBTK_ZLIB_NEED_PATCH),y) + @cd $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION); \ + patch -p1 < $(DOWNLOAD_DIR)/zlib-$(ZLIB_VERSION).patch +endif + @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) + +########## +# Common # +########## + +#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) +ifeq ($(CONFIG_EMBTK_ZLIB_NEED_PATCH),y) + @cd $(PACKAGES_BUILD)/foo-$(ZLIB_VERSION); \ + patch -p1 < $(DOWNLOAD_DIR)/zlib-$(ZLIB_VERSION).patch +endif diff --git a/packages/graphics/freetype/freetype.kconfig b/packages/graphics/freetype/freetype.kconfig index 5091405..7422e90 100644 --- a/packages/graphics/freetype/freetype.kconfig +++ b/packages/graphics/freetype/freetype.kconfig @@ -25,6 +25,7 @@ config EMBTK_HAVE_FREETYPE bool "Have FreeType" + select EMBTK_HAVE_ZLIB help FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing diff --git a/packages/graphics/graphics.mk b/packages/graphics/graphics.mk index 0149441..e2bdc0b 100644 --- a/packages/graphics/graphics.mk +++ b/packages/graphics/graphics.mk @@ -25,61 +25,49 @@ #atk include $(EMBTK_ROOT)/packages/graphics/atk/atk.mk -ROOTFS_COMPONENTS_CLEAN += atk_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_ATK) += atk_install #Cairo include $(EMBTK_ROOT)/packages/graphics/cairo/cairo.mk -ROOTFS_COMPONENTS_CLEAN += cairo_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_CAIRO) += cairo_install #DirectFB include $(EMBTK_ROOT)/packages/graphics/directfb/directfb.mk -ROOTFS_COMPONENTS_CLEAN += directfb_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_DIRECTFB) += directfb_install #fontconfig include $(EMBTK_ROOT)/packages/graphics/fontconfig/fontconfig.mk -ROOTFS_COMPONENTS_CLEAN += fontconfig_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_FONTCONFIG) += fontconfig_install #FreeFont include $(EMBTK_ROOT)/packages/graphics/freefont/freefont.mk -ROOTFS_COMPONENTS_CLEAN += ttmkfdir_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_FREEFONT_TTF) += freefont_ttf_install #FreeType include $(EMBTK_ROOT)/packages/graphics/freetype/freetype.mk -ROOTFS_COMPONENTS_CLEAN += freetype_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_FREETYPE) += freetype_install #gtk+ include $(EMBTK_ROOT)/packages/graphics/gtk/gtk.mk -ROOTFS_COMPONENTS_CLEAN += gtk_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_GTK) += gtk_install #imlib2 include $(EMBTK_ROOT)/packages/graphics/imlib2/imlib2.mk -ROOTFS_COMPONENTS_CLEAN += imlib2_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_IMLIB2) += imlib2_install #libjpeg include $(EMBTK_ROOT)/packages/graphics/libjpeg/libjpeg.mk -ROOTFS_COMPONENTS_CLEAN += libjpeg_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBJPEG) += libjpeg_install #libpng include $(EMBTK_ROOT)/packages/graphics/libpng/libpng.mk -ROOTFS_COMPONENTS_CLEAN += libpng_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBPNG) += libpng_install #libtiff include $(EMBTK_ROOT)/packages/graphics/libtiff/libtiff.mk -ROOTFS_COMPONENTS_CLEAN += libtiff_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBTIFF) += libtiff_install #pixman include $(EMBTK_ROOT)/packages/graphics/pixman/pixman.mk -ROOTFS_COMPONENTS_CLEAN += pixman_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_PIXMAN) += pixman_install diff --git a/packages/graphics/libpng/libpng.kconfig b/packages/graphics/libpng/libpng.kconfig index 777bbdf..47f6448 100644 --- a/packages/graphics/libpng/libpng.kconfig +++ b/packages/graphics/libpng/libpng.kconfig @@ -25,7 +25,7 @@ config EMBTK_HAVE_LIBPNG bool "Have libpng" - select EMBTK_HAVE_ZLIB_TARGET + select EMBTK_HAVE_ZLIB help libpng is the reference library for use in applications that read, create, and manipulate PNG (Portable Network Graphics) raster image diff --git a/packages/misc/glib/glib.kconfig b/packages/misc/glib/glib.kconfig index eca8216..841566e 100644 --- a/packages/misc/glib/glib.kconfig +++ b/packages/misc/glib/glib.kconfig @@ -26,6 +26,7 @@ config EMBTK_HAVE_GLIB bool "Have GLib" select EMBTK_HAVE_GETTEXT + select EMBTK_HAVE_ZLIB select KEMBTK_UCLIBC_DO_C99_MATH if EMBTK_CLIB_UCLIBC select KEMBTK_EGLIBC_OPTION_EGLIBC_INET if EMBTK_CLIB_EGLIBC select KEMBTK_UCLIBC_UCLIBC_HAS_NETWORK_SUPPORT if EMBTK_CLIB_UCLIBC diff --git a/packages/misc/misc.mk b/packages/misc/misc.mk index 2770bfd..89b8956 100644 --- a/packages/misc/misc.mk +++ b/packages/misc/misc.mk @@ -24,41 +24,33 @@ #expat include $(EMBTK_ROOT)/packages/misc/expat/expat.mk -ROOTFS_COMPONENTS_CLEAN += expat_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_EXPAT) += expat_install #gettext include $(EMBTK_ROOT)/packages/misc/gettext/gettext.mk -ROOTFS_COMPONENTS_CLEAN += gettext_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_GETTEXT) += gettext_install #GLib include $(EMBTK_ROOT)/packages/misc/glib/glib.mk -ROOTFS_COMPONENTS_CLEAN += glib_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_GLIB) += glib_install #libelf include $(EMBTK_ROOT)/packages/misc/libelf/libelf.mk -ROOTFS_COMPONENTS_CLEAN += libelf_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBELF) += libelf_install #libxml2 include $(EMBTK_ROOT)/packages/misc/libxml/libxml.mk -ROOTFS_COMPONENTS_CLEAN += libxml2_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXML2) += libxml2_install #ncurses include $(EMBTK_ROOT)/packages/misc/ncurses/ncurses.mk -ROOTFS_COMPONENTS_CLEAN += ncurses_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_NCURSES) += ncurses_install #Pango include $(EMBTK_ROOT)/packages/misc/pango/pango.mk -ROOTFS_COMPONENTS_CLEAN += pango_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_PANGO) += pango_install #tslib include $(EMBTK_ROOT)/packages/misc/tslib/tslib.mk -ROOTFS_COMPONENTS_CLEAN += tslib_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_TSLIB) += tslib_install diff --git a/packages/scripting-languages/perl/perl.mk b/packages/scripting-languages/perl/perl.mk index b45ba2b..950fd5c 100644 --- a/packages/scripting-languages/perl/perl.mk +++ b/packages/scripting-languages/perl/perl.mk @@ -66,3 +66,5 @@ ifeq ($(CONFIG_EMBTK_HAVE_MICROPERL),y) endif @touch $@ +microperl_clean: + $(call EMBTK_GENERIC_MESSAGE,"Clean microperl for target...") diff --git a/packages/scripting-languages/scripting-languages.mk b/packages/scripting-languages/scripting-languages.mk index 8958685..72ecb02 100644 --- a/packages/scripting-languages/scripting-languages.mk +++ b/packages/scripting-languages/scripting-languages.mk @@ -25,7 +25,6 @@ #lua include $(EMBTK_ROOT)/packages/scripting-languages/lua/lua.mk -ROOTFS_COMPONENTS_CLEAN += lua_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LUA) += lua_install #microperl diff --git a/packages/security/security.mk b/packages/security/security.mk index b76c85b..a42f3c7 100644 --- a/packages/security/security.mk +++ b/packages/security/security.mk @@ -24,6 +24,5 @@ #OpenSSL include $(EMBTK_ROOT)/packages/security/openssl/openssl.mk -ROOTFS_COMPONENTS_CLEAN += openssl_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_OPENSSL) += openssl_install diff --git a/packages/system/system.mk b/packages/system/system.mk index d3b7022..621db24 100644 --- a/packages/system/system.mk +++ b/packages/system/system.mk @@ -25,9 +25,8 @@ #dbus include $(EMBTK_ROOT)/packages/system/dbus/dbus.mk -ROOTFS_COMPONENTS_CLEAN += dbus_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_DBUS) += dbus_install #util-linux-ng include $(EMBTK_ROOT)/packages/system/utillinuxng/utillinuxng.mk -ROOTFS_COMPONENTS_CLEAN += utillinuxng_clean +ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_UTILLINUXNG) += utillinuxng_install diff --git a/packages/x11/x11.mk b/packages/x11/x11.mk index b0118e3..3763f01 100644 --- a/packages/x11/x11.mk +++ b/packages/x11/x11.mk @@ -27,12 +27,10 @@ ######### #utilmacros include $(EMBTK_ROOT)/packages/x11/utilmacros/utilmacros.mk -ROOTFS_COMPONENTS_CLEAN += utilmacros_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_UTILMACROS) += utilmacros_install #xcb-util include $(EMBTK_ROOT)/packages/x11/xcbutil/xcbutil.mk -ROOTFS_COMPONENTS_CLEAN += xcbutil_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XCBUTIL) += xcbutil_install ############## @@ -40,82 +38,66 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XCBUTIL) += xcbutil_install ############## #bigreqsproto include $(EMBTK_ROOT)/packages/x11/bigreqsproto/bigreqsproto.mk -ROOTFS_COMPONENTS_CLEAN += bigreqsproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_BIGREQSPROTO) += bigreqsproto_install #compositeproto include $(EMBTK_ROOT)/packages/x11/compositeproto/compositeproto.mk -ROOTFS_COMPONENTS_CLEAN += compositeproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_COMPOSITEPROTO) += compositeproto_install #damageproto include $(EMBTK_ROOT)/packages/x11/damageproto/damageproto.mk -ROOTFS_COMPONENTS_CLEAN += damageproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_DAMAGEPROTO) += damageproto_install #fixesproto include $(EMBTK_ROOT)/packages/x11/fixesproto/fixesproto.mk -ROOTFS_COMPONENTS_CLEAN += fixesproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_FIXESPROTO) += fixesproto_install #fontsproto include $(EMBTK_ROOT)/packages/x11/fontsproto/fontsproto.mk -ROOTFS_COMPONENTS_CLEAN += fontsproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_FONTSPROTO) += fontsproto_install #inputproto include $(EMBTK_ROOT)/packages/x11/inputproto/inputproto.mk -ROOTFS_COMPONENTS_CLEAN += inputproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_INPUTPROTO) += inputproto_install #kbproto include $(EMBTK_ROOT)/packages/x11/kbproto/kbproto.mk -ROOTFS_COMPONENTS_CLEAN += kbproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_INPUTPROTO) += kbproto_install #randrproto include $(EMBTK_ROOT)/packages/x11/randrproto/randrproto.mk -ROOTFS_COMPONENTS_CLEAN += randrproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_RANDRPROTO) += randrproto_install #recordproto include $(EMBTK_ROOT)/packages/x11/recordproto/recordproto.mk -ROOTFS_COMPONENTS_CLEAN += recordproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_RECORDPROTO) += recordproto_install #renderproto include $(EMBTK_ROOT)/packages/x11/renderproto/renderproto.mk -ROOTFS_COMPONENTS_CLEAN += renderproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_RENDERPROTO) += renderproto_install #resourceproto include $(EMBTK_ROOT)/packages/x11/resourceproto/resourceproto.mk -ROOTFS_COMPONENTS_CLEAN += resourceproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_RESOURCEPROTO) += resourceproto_install #videoproto include $(EMBTK_ROOT)/packages/x11/videoproto/videoproto.mk -ROOTFS_COMPONENTS_CLEAN += videoproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_VIDEOPROTO) += videoproto_install #xcbproto include $(EMBTK_ROOT)/packages/x11/xcbproto/xcbproto.mk -ROOTFS_COMPONENTS_CLEAN += xcbproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XCBPROTO) += xcbproto_install #xcmiscproto include $(EMBTK_ROOT)/packages/x11/xcmiscproto/xcmiscproto.mk -ROOTFS_COMPONENTS_CLEAN += xcmiscproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XCMISCPROTO) += xcmiscproto_install #xextcproto include $(EMBTK_ROOT)/packages/x11/xextproto/xextproto.mk -ROOTFS_COMPONENTS_CLEAN += xextproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XEXTPROTO) += xextproto_install #xproto include $(EMBTK_ROOT)/packages/x11/xproto/xproto.mk -ROOTFS_COMPONENTS_CLEAN += xproto_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XPROTO) += xproto_install ##################################### @@ -123,72 +105,58 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XPROTO) += xproto_install ##################################### #libfontenc include $(EMBTK_ROOT)/packages/x11/libfontenc/libfontenc.mk -ROOTFS_COMPONENTS_CLEAN += libfontenc_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBFONTENC) += libfontenc_install #libpthreadstubs include $(EMBTK_ROOT)/packages/x11/libpthreadstubs/libpthreadstubs.mk -ROOTFS_COMPONENTS_CLEAN += libpthreadstubs_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBPTHREADSTUBS) += libpthreadstubs_install #libpciaccess include $(EMBTK_ROOT)/packages/x11/libpciaccess/libpciaccess.mk -ROOTFS_COMPONENTS_CLEAN += libpciaccess_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBPCIACCESS) += libpciaccess_install #libx11 include $(EMBTK_ROOT)/packages/x11/libx11/libx11.mk -ROOTFS_COMPONENTS_CLEAN += libx11_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBX11) += libx11_install #libxau include $(EMBTK_ROOT)/packages/x11/libxau/libxau.mk -ROOTFS_COMPONENTS_CLEAN += libxau_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXAU) += libxau_install #libxcb include $(EMBTK_ROOT)/packages/x11/libxcb/libxcb.mk -ROOTFS_COMPONENTS_CLEAN += libxcb_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXCB) += libxcb_install #libxcomposite include $(EMBTK_ROOT)/packages/x11/libxcomposite/libxcomposite.mk -ROOTFS_COMPONENTS_CLEAN += libxcomposite_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXCOMPOSITE) += libxcomposite_install #libXext include $(EMBTK_ROOT)/packages/x11/libxext/libxext.mk -ROOTFS_COMPONENTS_CLEAN += libxext_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXEXT) += libxext_install #libxfixes include $(EMBTK_ROOT)/packages/x11/libxfixes/libxfixes.mk -ROOTFS_COMPONENTS_CLEAN += libxfixes_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXFIXES) += libxfixes_install #libxfont include $(EMBTK_ROOT)/packages/x11/libxfont/libxfont.mk -ROOTFS_COMPONENTS_CLEAN += libxfont_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXFONT) += libxfont_install #libXft include $(EMBTK_ROOT)/packages/x11/libxft/libxft.mk -ROOTFS_COMPONENTS_CLEAN += libxft_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXFT) += libxft_install #libxkbfile include $(EMBTK_ROOT)/packages/x11/libxkbfile/libxkbfile.mk -ROOTFS_COMPONENTS_CLEAN += libxkbfile_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXKBFILE) += libxkbfile_install #libxrandr include $(EMBTK_ROOT)/packages/x11/libxrandr/libxrandr.mk -ROOTFS_COMPONENTS_CLEAN += libxrandr_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXRANDR) += libxrandr_install #libxrender include $(EMBTK_ROOT)/packages/x11/libxrender/libxrender.mk -ROOTFS_COMPONENTS_CLEAN += libxrender_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXRENDER) += libxrender_install ######################################### @@ -196,17 +164,14 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXRENDER) += libxrender_install ######################################### #xkbcomp include $(EMBTK_ROOT)/packages/x11/xkbcomp/xkbcomp.mk -ROOTFS_COMPONENTS_CLEAN += xkbcomp_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XKBCOMP) += xkbcomp_install #xkeyboard-config include $(EMBTK_ROOT)/packages/x11/xkeyboardconfig/xkeyboardconfig.mk -ROOTFS_COMPONENTS_CLEAN += xkeyboardconfig_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XKEYBOARDCONFIG) += xkeyboardconfig_install #xtrans include $(EMBTK_ROOT)/packages/x11/xtrans/xtrans.mk -ROOTFS_COMPONENTS_CLEAN += xtrans_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XTRANS) += xtrans_install ########## @@ -214,19 +179,16 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XTRANS) += xtrans_install ########## #kdrive and Xorg include $(EMBTK_ROOT)/packages/x11/xserver/xserver.mk -ROOTFS_COMPONENTS_CLEAN += xserver_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XSERVER) += xserver_install # X server input drivers ######################## #xf86inputevdev include $(EMBTK_ROOT)/packages/x11/xf86inputevdev/xf86inputevdev.mk -ROOTFS_COMPONENTS_CLEAN += xf86inputevdev_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XF86INPUTEVDEV) += xf86inputevdev_install # X server video drivers ######################## #xf86videofbdev include $(EMBTK_ROOT)/packages/x11/xf86videofbdev/xf86videofbdev.mk -ROOTFS_COMPONENTS_CLEAN += xf86videofbdev_clean ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XF86VIDEOFBDEV) += xf86videofbdev_install -- cgit v1.2.3