diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-08-22 20:05:12 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-08-22 20:05:12 +0200 |
| commit | dbfc9fdc6085a528fc8178ff5ce9960ad8f6a5cd (patch) | |
| tree | efb0370771ebdf5143a55cd08ce09942cf213208 | |
| parent | 4d4894930a92e5101a0f045dc20be4f6ccb21e1f (diff) | |
| download | embtoolkit-dbfc9fdc6085a528fc8178ff5ce9960ad8f6a5cd.tar.gz embtoolkit-dbfc9fdc6085a528fc8178ff5ce9960ad8f6a5cd.tar.bz2 embtoolkit-dbfc9fdc6085a528fc8178ff5ce9960ad8f6a5cd.tar.xz | |
Embtk: drastically improve packages rebuild duration
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
104 files changed, 699 insertions, 623 deletions
diff --git a/kconfig/arch-variant.kconfig b/kconfig/arch-variant.kconfig index b9e0080..7967803 100644 --- a/kconfig/arch-variant.kconfig +++ b/kconfig/arch-variant.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -19,7 +19,7 @@ # \file arch-variant.kconfig # \brief arch-variant.kconfig of EmbToolkit, here we give users the # \brief ability to choose which variant of CPU to use. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/kconfig/binutils.kconfig b/kconfig/binutils.kconfig index e87ad2c..0909eae 100644 --- a/kconfig/binutils.kconfig +++ b/kconfig/binutils.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file binutils.kconfig # \brief binutils.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/kconfig/fs.kconfig b/kconfig/fs.kconfig index a90554c..1acbdb5 100644 --- a/kconfig/fs.kconfig +++ b/kconfig/fs.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. All rights reserved. # For Copyrright from linux kernel's build/configure system, see their source # code. # @@ -20,7 +20,7 @@ # # \file fs.kconfig # \brief fs.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date August 2009 ################################################################################ diff --git a/kconfig/gmphost.kconfig b/kconfig/gmphost.kconfig index 369472d..42c9d4d 100644 --- a/kconfig/gmphost.kconfig +++ b/kconfig/gmphost.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file gmphost.kconfig # \brief gmphost.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/kconfig/linux.kconfig b/kconfig/linux.kconfig index 380fb23..de5b7cc 100644 --- a/kconfig/linux.kconfig +++ b/kconfig/linux.kconfig @@ -1,6 +1,6 @@ ################################################################################# # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file linux.kconfig # \brief linux.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/kconfig/mpchost.kconfig b/kconfig/mpchost.kconfig index 9718737..78d27ea 100644 --- a/kconfig/mpchost.kconfig +++ b/kconfig/mpchost.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file mpchost.kconfig # \brief mpchost.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date Jan 2010 ################################################################################ diff --git a/kconfig/mpfrhost.kconfig b/kconfig/mpfrhost.kconfig index 5a6fc30..26178e4 100644 --- a/kconfig/mpfrhost.kconfig +++ b/kconfig/mpfrhost.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file mpfrhost.kconfig # \brief mpfrhost.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/kconfig/nls.kconfig b/kconfig/nls.kconfig index 749673b..0eb3718 100644 --- a/kconfig/nls.kconfig +++ b/kconfig/nls.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -17,7 +17,7 @@ # # \file nls.kconfig # \brief nls.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ diff --git a/kconfig/strace.kconfig b/kconfig/strace.kconfig index 08120bc..b90a641 100644 --- a/kconfig/strace.kconfig +++ b/kconfig/strace.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file strace.kconfig # \brief strace.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date August 2009 ################################################################################ diff --git a/kconfig/timez.kconfig b/kconfig/timez.kconfig index 55646c2..4ead191 100644 --- a/kconfig/timez.kconfig +++ b/kconfig/timez.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -17,6 +17,6 @@ # # \file timez.kconfig # \brief timez.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ diff --git a/kconfig/toolchain.kconfig b/kconfig/toolchain.kconfig index cac483f..bd1d544 100644 --- a/kconfig/toolchain.kconfig +++ b/kconfig/toolchain.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file toolchain.kconfig # \brief toolchain.kconfig of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date July 2009 ################################################################################ diff --git a/mk/arm-arch.mk b/mk/arm-arch.mk index b10add1..4051c4c 100644 --- a/mk/arm-arch.mk +++ b/mk/arm-arch.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file arm-arch.mk # \brief arm-arch.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date June 2009 ################################################################################ diff --git a/mk/autoconf.mk b/mk/autoconf.mk index 0cf7dd3..76b66c6 100644 --- a/mk/autoconf.mk +++ b/mk/autoconf.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file autoconf.mk # \brief autoconf.mk of Embtoolkit. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ diff --git a/mk/automake.mk b/mk/automake.mk index e7b9358..65c50ec 100644 --- a/mk/automake.mk +++ b/mk/automake.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file automake.mk # \brief automake.mk of Embtoolkit. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ diff --git a/mk/fakeroot.mk b/mk/fakeroot.mk index 5c936fc..f8143c9 100644 --- a/mk/fakeroot.mk +++ b/mk/fakeroot.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -19,7 +19,7 @@ # \file fakeroot.mk # \brief fakeroot.mk of Embtoolkit. fakeroot helps building root # \brief filesystem, without the need to be root. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date June 2009 ################################################################################ @@ -30,7 +30,9 @@ FAKEROOT_BUILD_DIR := $(TOOLS_BUILD)/fakeroot-build FAKEROOT_DIR := $(HOSTTOOLS)/usr/local/fakeroot FAKEROOT_BIN := $(FAKEROOT_DIR)/bin/fakeroot -fakeroot_install: $(FAKEROOT_BUILD_DIR)/.installed +fakeroot_install: + @test -e $(FAKEROOT_BUILD_DIR)/.installed || \ + $(MAKE) $(FAKEROOT_BUILD_DIR)/.installed $(FAKEROOT_BUILD_DIR)/.installed: download_fakeroot \ $(FAKEROOT_BUILD_DIR)/.decompressed $(FAKEROOT_BUILD_DIR)/.configured @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file fs.mk # \brief fs.mk of Embtoolkit, targets for sereval filesystems build. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date August 2009 ################################################################################ @@ -58,7 +58,9 @@ $(GDB_TARGET_BUILD_DIR)/.configured: @touch $@ gdb_target_clean: - $(call EMBTK_GENERIC_MESSAGE,"Clean gdb for target if necessary...") + $(call EMBTK_GENERIC_MESSAGE,"Cleanup gdb for target...") +gdbserver_target_clean: + $(call EMBTK_GENERIC_MESSAGE,"Cleanup gdbserver for target...") #gdb for host $(GDB_HOST_BUILD_DIR)/.installed: download_gdb decompress_gdb \ diff --git a/mk/initialpath.mk b/mk/initialpath.mk index a6acfd2..ce71029 100644 --- a/mk/initialpath.mk +++ b/mk/initialpath.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -19,7 +19,7 @@ # \file initialpath.mk # \brief initialpath of Embtoolkit. Here we define SYSROOT, TOOLS, # \brief TOOLS_BUILD PACKAGES_BUILD and ROOTFS. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/mk/kernel-headers.mk b/mk/kernel-headers.mk index 2bbff4e..80ad78a 100644 --- a/mk/kernel-headers.mk +++ b/mk/kernel-headers.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file kernel-headers.mk # \brief kernel-headers.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file lzo.mk # \brief lzo.mk of Embtoolkit. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date June 2009 ################################################################################ @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file m4.mk # \brief m4.mk of Embtoolkit. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ diff --git a/mk/macros.mk b/mk/macros.mk index 914b9fa..a6494b7 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file macros.mk # \brief macros.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/mk/makedevs.mk b/mk/makedevs.mk index da11a89..b95963f 100644 --- a/mk/makedevs.mk +++ b/mk/makedevs.mk @@ -1,6 +1,6 @@ ######################################################################################### # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file makedevs.mk # \brief makedevs.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ######################################################################################### diff --git a/mk/mips-arch.mk b/mk/mips-arch.mk index aaa6e56..a0008d4 100644 --- a/mk/mips-arch.mk +++ b/mk/mips-arch.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file mips_arch.mk # \brief mips_arch.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/mk/mpchost.mk b/mk/mpchost.mk index 5871e0b..99e406d 100644 --- a/mk/mpchost.mk +++ b/mk/mpchost.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file mpchost.mk # \brief mpchost.mk of Embtoolkit. To build gcc, we need mpc. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date Jan 2010 ################################################################################ diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk index 942718d..c4e7508 100644 --- a/mk/mtd-utils.mk +++ b/mk/mtd-utils.mk @@ -47,7 +47,9 @@ MTDUTILS_SBINS := bin2nand flash_eraseall flash_unlock mkfs.jffs2 nand2bin \ MTDUTILS_HOST_DEPS := zlib_host_install lzo_host_install \ utillinuxng_host_install -mtdutils_host_install: $(MTDUTILS_HOST_BUILD_DIR)/.installed +mtdutils_host_install: + @test -e $(MTDUTILS_HOST_BUILD_DIR)/.installed || \ + $(MAKE) $(MTDUTILS_HOST_BUILD_DIR)/.installed $(MTDUTILS_HOST_BUILD_DIR)/.installed: $(MTDUTILS_HOST_DEPS) \ download_mtdutils $(MTDUTILS_HOST_BUILD_DIR)/.decompressed @@ -76,7 +78,9 @@ mtdutils_host_clean: MTDUTILS_DEPS := zlib_target_install lzo_target_install utillinuxng_install -mtdutils_target_install: $(MTDUTILS_TARGET_BUILD_DIR)/.installed +mtdutils_target_install: + @test -e $(MTDUTILS_TARGET_BUILD_DIR)/.installed || \ + $(MAKE) $(MTDUTILS_TARGET_BUILD_DIR)/.installed $(MTDUTILS_TARGET_BUILD_DIR)/.installed: $(MTDUTILS_DEPS) download_mtdutils \ $(MTDUTILS_TARGET_BUILD_DIR)/.decompressed @@ -104,6 +108,7 @@ mtdutils_target_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(MTDUTILS_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(MTDUTILS_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(MTDUTILS_PKGCONFIGS) + $(Q)-rm -rf $(MTDUTILS_TARGET_BUILD_DIR) download_mtdutils: $(call EMBTK_GENERIC_MESSAGE,"Downloading $(MTDUTILS_PACKAGE) \ diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index 7c7cef6..2149cd4 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -40,7 +40,9 @@ endif export PKG_CONFIG_PATH -pkgconfig_install: $(PKGCONFIG_BUILD_DIR)/.installed +pkgconfig_install: + @test -e $(PKGCONFIG_BUILD_DIR)/.installed || \ + $(MAKE) $(PKGCONFIG_BUILD_DIR)/.installed $(PKGCONFIG_BUILD_DIR)/.installed: download_pkgconfig \ $(PKGCONFIG_BUILD_DIR)/.decompressed $(PKGCONFIG_BUILD_DIR)/.configured diff --git a/mk/rootfs.mk b/mk/rootfs.mk index ff49940..dd5aeca 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file rootfs.mk # \brief rootfs.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date June 2009 ################################################################################ @@ -93,16 +93,24 @@ endif @cp -R $(SYSROOT)/root $(ROOTFS)/ ifeq ($(CONFIG_EMBTK_TARGET_STRIPPED),y) $(call EMBTK_GENERIC_MESSAGE,"Stripping binaries as specified...") - @-$(TARGETSTRIP) $(ROOTFS)/lib/*.so* - @-$(TARGETSTRIP) $(ROOTFS)/usr/lib/*.so* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/lib/*.so* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/usr/lib/*.so* ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - @-$(TARGETSTRIP) $(ROOTFS)/lib32/*.so* - @-$(TARGETSTRIP) $(ROOTFS)/usr/lib32/*.so* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/lib32/*.so* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/usr/lib32/*.so* endif - @-$(TARGETSTRIP) $(ROOTFS)/bin/* - @-$(TARGETSTRIP) $(ROOTFS)/sbin/* - @-$(TARGETSTRIP) $(ROOTFS)/usr/bin/* - @-$(TARGETSTRIP) $(ROOTFS)/usr/sbin/* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/bin/* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/sbin/* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/usr/bin/* + @-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ + $(TARGETSTRIP) $(ROOTFS)/usr/sbin/* endif mkinitialrootfs: diff --git a/mk/squashfs.mk b/mk/squashfs.mk index 2621772..b11ea40 100644 --- a/mk/squashfs.mk +++ b/mk/squashfs.mk @@ -1,24 +1,25 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. 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 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 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. +# 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 <http://www.gnu.org/licenses/>. # -# 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 squashfs.mk # \brief squashfs.mk of Embtoolkit. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date August 2009 ################################################################################ @@ -28,7 +29,10 @@ SQUASHFS_PACKAGE := squashfs$(SQUASHFS_VERSION).tar.gz SQUASHFS_HOST_BUILD_DIR := $(TOOLS_BUILD)/squashfs-build SQUASHFS_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/squashfs-build -squashfs_host_install: $(SQUASHFS_HOST_BUILD_DIR)/.installed +squashfs_host_install: + @test -e $(SQUASHFS_HOST_BUILD_DIR)/.installed || \ + $(MAKE) $(SQUASHFS_HOST_BUILD_DIR)/.installed + squashfs_target_install: $(SQUASHFS_TARGET_BUILD_DIR)/.installed #squashfs for host diff --git a/mk/strace.mk b/mk/strace.mk index ecbc7a0..f919b2d 100644 --- a/mk/strace.mk +++ b/mk/strace.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file strace.mk # \brief strace.mk of Embtoolkit. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date August 2009 ################################################################################ @@ -74,3 +74,5 @@ $(STRACE_BUILD_DIR)/.configured: CPPFLAGS="-I$(SYSROOT)/usr/include" @touch $@ +strace_clean: + $(call EMBTK_GENERIC_MESSAGE,"Cleanup strace...") diff --git a/mk/target-mcu.mk b/mk/target-mcu.mk index 6c57c23..2fa89a1 100644 --- a/mk/target-mcu.mk +++ b/mk/target-mcu.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -19,7 +19,7 @@ # \file target_mcu.mk # \brief target_mcu.mk of Embtoolkit. Here we define LINUX_ARCH, # \brief GNU_ARCH and GNU_TARGET. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/mk/termcap.mk b/mk/termcap.mk index 3aadafa..43317e7 100644 --- a/mk/termcap.mk +++ b/mk/termcap.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file termcap.mk # \brief termcap.mk of Embtoolkit. -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date July 2009 ################################################################################ diff --git a/mk/toolchain.mk b/mk/toolchain.mk index b5e1773..c03c18c 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -1,6 +1,6 @@ ################################################################################ # Abdoulaye Walsimou GAYE, <awg@embtoolkit.org> -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk index 58a72b3..75b4204 100644 --- a/packages/busybox/busybox.mk +++ b/packages/busybox/busybox.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-1010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009-1010 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 @@ -19,7 +19,7 @@ # # \file busybox.mk # \brief busybox.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date May 2009 ################################################################################ diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk index f3324eb..211e748 100644 --- a/packages/compression/zlib/zlib.mk +++ b/packages/compression/zlib/zlib.mk @@ -33,7 +33,9 @@ ZLIB_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION) ######################## # zlib on host machine # ######################## -zlib_host_install: $(ZLIB_HOST_BUILD_DIR)/.installed +zlib_host_install: + @test -e $(ZLIB_HOST_BUILD_DIR)/.installed || \ + $(MAKE) $(ZLIB_HOST_BUILD_DIR)/.installed $(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \ $(ZLIB_HOST_BUILD_DIR)/.decompressed $(ZLIB_HOST_BUILD_DIR)/.configured @@ -68,7 +70,9 @@ ifeq ($(CONFIG_EMBTK_64BITS_FS),y) ZLIB_TARGET_LINUX_ARCH := --64 endif -zlib_target_install: $(ZLIB_TARGET_BUILD_DIR)/.installed +zlib_target_install: + @test -e $(ZLIB_TARGET_BUILD_DIR)/.installed || \ + $(MAKE) $(ZLIB_TARGET_BUILD_DIR)/.installed $(ZLIB_TARGET_BUILD_DIR)/.installed: download_zlib \ $(ZLIB_TARGET_BUILD_DIR)/.decompressed \ @@ -113,12 +117,13 @@ $(ZLIB_TARGET_BUILD_DIR)/.configured: @touch $@ zlib_target_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup zlib-$(ZLIB_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup zlib...") $(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) + $(Q)-rm -rf $(ZLIB_TARGET_BUILD_DIR) ########## # Common # diff --git a/packages/graphics/atk/atk.mk b/packages/graphics/atk/atk.mk index 9f01ee3..6d066c1 100644 --- a/packages/graphics/atk/atk.mk +++ b/packages/graphics/atk/atk.mk @@ -35,13 +35,9 @@ ATK_INCLUDES = atk-* ATK_LIBS = libatk-* ATK_PKGCONFIGS = atk.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -atk_install: $(ATK_BUILD_DIR)/.installed +atk_install: + @test -e $(ATK_BUILD_DIR)/.installed || \ + $(MAKE) $(ATK_BUILD_DIR)/.installed $(ATK_BUILD_DIR)/.installed: glib_install download_atk \ $(ATK_BUILD_DIR)/.decompressed $(ATK_BUILD_DIR)/.configured @@ -90,10 +86,11 @@ $(ATK_BUILD_DIR)/.configured: @touch $@ atk_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup atk-$(ATK_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup atk...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(ATK_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(ATK_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(ATK_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(ATK_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(ATK_PKGCONFIGS) + $(Q)-rm -rf $(ATK_BUILD_DIR) diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk index e4a1781..05282f3 100644 --- a/packages/graphics/cairo/cairo.mk +++ b/packages/graphics/cairo/cairo.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file cairo.mk # \brief cairo.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ @@ -53,7 +53,9 @@ CAIRO_CONFIG_OPTS-n += --enable-xcb=no CAIRO_CONFIG_OPTS-n += --without-x endif -cairo_install: $(CAIRO_BUILD_DIR)/.installed +cairo_install: + @test -e $(CAIRO_BUILD_DIR)/.installed || \ + $(MAKE) $(CAIRO_BUILD_DIR)/.installed $(CAIRO_BUILD_DIR)/.installed: $(CAIRO_DEPS) download_cairo \ $(CAIRO_BUILD_DIR)/.decompressed $(CAIRO_BUILD_DIR)/.configured @@ -101,14 +103,11 @@ $(CAIRO_BUILD_DIR)/.configured: @touch $@ cairo_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup cairo-$(CAIRO_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup cairo...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(CAIRO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(CAIRO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(CAIRO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(CAIRO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(CAIRO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(CAIRO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(CAIRO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(CAIRO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(CAIRO_PKGCONFIGS) + $(Q)-rm -rf $(CAIRO_BUILD_DIR) diff --git a/packages/graphics/directfb/directfb.mk b/packages/graphics/directfb/directfb.mk index 25ffd67..5e076a3 100644 --- a/packages/graphics/directfb/directfb.mk +++ b/packages/graphics/directfb/directfb.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file directfb.mk # \brief directfb.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date October 2009 ################################################################################ @@ -96,8 +96,10 @@ ifeq ($(CONFIG_EMBTK_DIRECTFB_INPUT_TSLIB),y) DIRECTFB_DEPS += tslib_install endif -directfb_install: $(DIRECTFB_BUILD_DIR)/.installed \ - $(DIRECTFB_BUILD_DIR)/.special +directfb_install: + @test -e $(DIRECTFB_BUILD_DIR)/.installed || \ + $(MAKE) $(DIRECTFB_BUILD_DIR)/.installed + $(MAKE) $(DIRECTFB_BUILD_DIR)/.special $(DIRECTFB_BUILD_DIR)/.installed: $(DIRECTFB_DEPS) download_directfb \ $(DIRECTFB_BUILD_DIR)/.decompressed $(DIRECTFB_BUILD_DIR)/.configured @@ -194,12 +196,10 @@ endif @touch $@ directfb_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup directfb-$(DIRECTFB_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup directfb...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(DIRECTFB_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(DIRECTFB_SBINS) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(DIRECTFB_LIBS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(DIRECTFB_LIBS) -endif $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(DIRECTFB_INCLUDES) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(DIRECTFB_LIBS) + $(Q)-rm -rf $(DIRECTFB_BUILD_DIR) diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk index eae7e70..ba5f1a8 100644 --- a/packages/graphics/fontconfig/fontconfig.mk +++ b/packages/graphics/fontconfig/fontconfig.mk @@ -1,24 +1,25 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. 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 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 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. +# 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 <http://www.gnu.org/licenses/>. # -# 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 fontconfig.mk # \brief fontconfig.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ @@ -39,8 +40,10 @@ else LIBXML2_CFLAGS="-I$(SYSROOT)/usr/include/libxml2 -L$(SYSROOT)/usr/lib" endif -fontconfig_install: $(FONTCONFIG_BUILD_DIR)/.installed \ - $(FONTCONFIG_BUILD_DIR)/.special +fontconfig_install: + @test -e $(FONTCONFIG_BUILD_DIR)/.installed || \ + $(MAKE) $(FONTCONFIG_BUILD_DIR)/.installed + $(MAKE) $(FONTCONFIG_BUILD_DIR)/.special $(FONTCONFIG_BUILD_DIR)/.installed: libxml2_install \ download_fontconfig $(FONTCONFIG_BUILD_DIR)/.decompressed \ @@ -90,16 +93,13 @@ $(FONTCONFIG_BUILD_DIR)/.configured: .PHONY: $(FONTCONFIG_BUILD_DIR)/.special fontconfig_clean fontconfig_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup fontconfig-$(FONTCONFIG_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup fontconfig...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FONTCONFIG_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FONTCONFIG_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FONTCONFIG_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(FONTCONFIG_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(FONTCONFIG_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(FONTCONFIG_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(FONTCONFIG_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FONTCONFIG_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FONTCONFIG_PKGCONFIGS) + $(Q)-rm -rf $(FONTCONFIG_BUILD_DIR) $(FONTCONFIG_BUILD_DIR)/.special: $(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/ diff --git a/packages/graphics/freefont/freefont.mk b/packages/graphics/freefont/freefont.mk index 6bfbf6c..12fe380 100644 --- a/packages/graphics/freefont/freefont.mk +++ b/packages/graphics/freefont/freefont.mk @@ -1,24 +1,25 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 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 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. +# 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 <http://www.gnu.org/licenses/>. # -# 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 freefont.mk # \brief freefont.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date January 2010 ################################################################################ @@ -90,3 +91,5 @@ $(FREEFONT_TTF_BUILD_DIR)/.decompressed: @tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(FREEFONT_TTF_PACKAGE) @touch $@ +freefont_ttf_clean: + $(call EMBTK_GENERIC_MESSAGE,"Cleanup freefont...") diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk index 83555b6..0c7611c 100644 --- a/packages/graphics/freetype/freetype.mk +++ b/packages/graphics/freetype/freetype.mk @@ -34,21 +34,24 @@ FREETYPE_INCLUDES = ft*build.h freetype* FREETYPE_LIBS = libfreetype* FREETYPE_PKGCONFIGS = freetype*.pc -freetype_install: $(FREETYPE_BUILD_DIR)/.installed +FREETYPE_DEPS := zlib_target_install -$(FREETYPE_BUILD_DIR)/.installed: zlib_target_install download_freetype \ +freetype_install: + @test -e $(FREETYPE_BUILD_DIR)/.installed || \ + $(MAKE) $(FREETYPE_BUILD_DIR)/.installed + +$(FREETYPE_BUILD_DIR)/.installed: $(FREETYPE_DEPS) download_freetype \ $(FREETYPE_BUILD_DIR)/.decompressed $(FREETYPE_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ freetype-$(FREETYPE_VERSION) in your root filesystem...") $(call EMBTK_KILL_LT_RPATH, $(FREETYPE_BUILD_DIR)) - $(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) $(J) \ + $(MAKE) -C $(FREETYPE_BUILD_DIR) $(J) \ LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool - $(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) \ + $(MAKE) -C $(FREETYPE_BUILD_DIR) \ LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool \ DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) libtool_files_adapt - $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.freetype-configpatched + $(MAKE) libtool_files_adapt + $(MAKE) pkgconfig_files_adapt @touch $@ download_freetype: @@ -60,7 +63,7 @@ download_freetype: $(FREETYPE_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(FREETYPE_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(FREETYPE_PACKAGE) + @tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(FREETYPE_PACKAGE) @touch $@ $(FREETYPE_BUILD_DIR)/.configured: @@ -83,19 +86,12 @@ $(FREETYPE_BUILD_DIR)/.configured: --prefix=/usr --enable-static=no --libdir=/usr/$(LIBDIR) @touch $@ -$(FREETYPE_BUILD_DIR)/.freetype-configpatched: - $(Q)cd $(ROOTFS)/usr/bin; \ - cat freetype-config | \ - sed -e 's;prefix=/usr;prefix=$(ROOTFS)/usr;' \ - -e 's;includedir=$${prefix}/include;includedir=$(SYSROOT)/usr/include;' \ - > freetype-config.new;\ - cp freetype-config.new freetype-config; rm freetype-config.new - freetype_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup freetype-$(FREETYPE_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup freetype...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FREETYPE_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FREETYPE_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FREETYPE_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FREETYPE_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FREETYPE_PKGCONFIGS) + $(Q)-rm -rf $(FREETYPE_BUILD_DIR) diff --git a/packages/graphics/gtk/gtk.kconfig b/packages/graphics/gtk/gtk.kconfig index bf738ef..4f02c4a 100644 --- a/packages/graphics/gtk/gtk.kconfig +++ b/packages/graphics/gtk/gtk.kconfig @@ -47,16 +47,17 @@ choice depends on EMBTK_HAVE_GTK help Which gtk+ backend to use - config EMBTK_GTK_BACKEND_DIRECTFB - bool "DirectFB" - select EMBTK_HAVE_DIRECTFB - select EMBTK_HAVE_CAIRO_WITH_DIRECTFB + config EMBTK_GTK_BACKEND_XSERVER bool "X windowing system" select EMBTK_HAVE_CAIRO_WITH_LIBXCB select EMBTK_HAVE_LIBX11 select EMBTK_HAVE_LIBXEXT select EMBTK_HAVE_LIBXRENDER + config EMBTK_GTK_BACKEND_DIRECTFB + bool "DirectFB" + select EMBTK_HAVE_DIRECTFB + select EMBTK_HAVE_CAIRO_WITH_DIRECTFB endchoice choice diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk index d7aed95..453e1bb 100644 --- a/packages/graphics/gtk/gtk.mk +++ b/packages/graphics/gtk/gtk.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -46,7 +46,10 @@ GTK_BACKEND := --with-gdktarget=x11 --with-x GTK_DEPS += libx11_install libxext_install libxrender_install endif -gtk_install: $(GTK_BUILD_DIR)/.installed $(GTK_BUILD_DIR)/.special +gtk_install: + @test -e $(GTK_BUILD_DIR)/.installed || \ + $(MAKE) $(GTK_BUILD_DIR)/.installed + $(MAKE) $(GTK_BUILD_DIR)/.special $(GTK_BUILD_DIR)/.installed: $(GTK_DEPS) download_gtk \ $(GTK_BUILD_DIR)/.decompressed $(GTK_BUILD_DIR)/.configured @@ -130,12 +133,7 @@ endif .PHONY: gtk_clean $(GTK_BUILD_DIR)/.special $(GTK_BUILD_DIR)/.special: - $(Q)-cp -R $(SYSROOT)/usr/etc/gtk-* $(ROOTFS)/etc/ -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cp -R $(SYSROOT)/usr/lib32/gtk-* $(ROOTFS)/usr/lib32/ -else - $(Q)-cp -R $(SYSROOT)/usr/lib/gtk-* $(ROOTFS)/usr/lib/ -endif + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ @touch $@ gtk_clean: @@ -145,4 +143,5 @@ gtk_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(GTK_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(GTK_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(GTK_PKGCONFIGS) + $(Q)-rm -rf $(GTK_BUILD_DIR) diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk index 6277e45..6f17e6f 100644 --- a/packages/graphics/imlib2/imlib2.mk +++ b/packages/graphics/imlib2/imlib2.mk @@ -36,9 +36,12 @@ IMLIB2_INCLUDES = Imlib2.h IMLIB2_LIBS = imlib2 libImlib2.* IMLIB2_PKGCONFIGS = imlib2.pc -IMLIB2_DEPS = libpng_install freetype_install libjpeg_install +IMLIB2_DEPS := libpng_install freetype_install libjpeg_install -imlib2_install: $(IMLIB2_BUILD_DIR)/.installed +imlib2_install: + test -e $(IMLIB2_BUILD_DIR)/.installed || \ + $(MAKE) $(IMLIB2_BUILD_DIR)/.installed + $(MAKE) $(IMLIB2_BUILD_DIR)/.special $(IMLIB2_BUILD_DIR)/.installed: $(IMLIB2_DEPS) download_imlib2 \ $(IMLIB2_BUILD_DIR)/.decompressed $(IMLIB2_BUILD_DIR)/.configured @@ -47,9 +50,6 @@ $(IMLIB2_BUILD_DIR)/.installed: $(IMLIB2_DEPS) download_imlib2 \ $(call EMBTK_KILL_LT_RPATH,$(IMLIB2_BUILD_DIR)) $(Q)$(MAKE) -C $(IMLIB2_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(IMLIB2_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR) - $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-cp -R $(SYSROOT)/usr/share/imlib2 $(ROOTFS)/usr/share $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt @touch $@ @@ -99,10 +99,19 @@ $(IMLIB2_BUILD_DIR)/.configured: @touch $@ imlib2_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup imlib2-$(IMLIB2_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup imlib2...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(IMLIB2_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(IMLIB2_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(IMLIB2_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(IMLIB2_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(IMLIB2_PKGCONFIGS) + $(Q)-rm -rf $(IMLIB2_BUILD_DIR) + +.PHONY: $(IMLIB2_BUILD_DIR)/.special +$(IMLIB2_BUILD_DIR)/.special: + $(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR) + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR) + $(Q)-mkdir -p $(ROOTFS)/usr/share + $(Q)-cp -R $(SYSROOT)/usr/share/imlib2 $(ROOTFS)/usr/share + @touch $@ diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk index e6875dc..a6461da 100644 --- a/packages/graphics/libjpeg/libjpeg.mk +++ b/packages/graphics/libjpeg/libjpeg.mk @@ -33,7 +33,9 @@ LIBJPEG_SBINS := LIBJPEG_LIBS := libjpeg* LIBJEPG_INCLUDES := jconfig.h jerror.h jmorecfg.h jpeglib.h -libjpeg_install: $(LIBJPEG_BUILD_DIR)/.installed +libjpeg_install: + @test -e $(LIBJPEG_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBJPEG_BUILD_DIR)/.installed $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \ $(LIBJPEG_BUILD_DIR)/.decompressed $(LIBJPEG_BUILD_DIR)/.configured @@ -86,4 +88,5 @@ libjpeg_clean: $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBJPEG_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBJPEG_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBJPEG_LIBS) + $(Q)-rm -rf $(LIBJPEG_BUILD_DIR) diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk index a6dbcd4..376c9cb 100644 --- a/packages/graphics/libpng/libpng.mk +++ b/packages/graphics/libpng/libpng.mk @@ -34,9 +34,13 @@ LIBPNG_INCLUDES = libpng* png* LIBPNG_LIBS = libpng* LIBPNG_PKGCONFIGS = libpng* -libpng_install: $(LIBPNG_BUILD_DIR)/.installed +LIBPNG_DEPS := zlib_target_install -$(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \ +libpng_install: + @test -e $(LIBPNG_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBPNG_BUILD_DIR)/.installed + +$(LIBPNG_BUILD_DIR)/.installed: $(LIBPNG_DEPS) download_libpng \ $(LIBPNG_BUILD_DIR)/.decompressed $(LIBPNG_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ libpng-$(LIBPNG_VERSION) in your root filesystem...") @@ -45,7 +49,6 @@ $(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \ $(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libpng-configpatched @touch $@ download_libpng: @@ -83,14 +86,6 @@ $(LIBPNG_BUILD_DIR)/.configured: --libdir=/usr/$(LIBDIR) @touch $@ -$(LIBPNG_BUILD_DIR)/.libpng-configpatched: - $(Q)cd $(ROOTFS)/usr/bin; \ - cat libpng-config | \ - sed -e 's;prefix="/usr";prefix="$(ROOTFS)/usr";' \ - -e 's;includedir="$${prefix}/include/libpng12";includedir="$(SYSROOT)/usr/include/libpng12";' \ - > libpng-config.new;\ - cp libpng-config.new libpng-config; rm libpng-config.new - libpng_clean: $(call EMBTK_GENERIC_MESSAGE,"cleanup libpng-$(LIBPNG_VERSION)...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBPNG_BINS) @@ -98,4 +93,5 @@ libpng_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBPNG_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBPNG_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBPNG_PKGCONFIGS) + $(Q)-rm -rf $(LIBPNG_BUILD_DIR) diff --git a/packages/graphics/libtiff/libtiff.mk b/packages/graphics/libtiff/libtiff.mk index f78b4bc..8939d23 100644 --- a/packages/graphics/libtiff/libtiff.mk +++ b/packages/graphics/libtiff/libtiff.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file libtiff.mk # \brief libtiff.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ @@ -36,13 +36,9 @@ LIBTIFF_INCLUDES = tiffconf.h tiff.h tiffio.h tiffio.hxx tiffvers.h LIBTIFF_LIBS = libtiff* LIBTIFF_PKGCONFIGS = -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -libtiff_install: $(LIBTIFF_BUILD_DIR)/.installed +libtiff_install: + @test -e $(LIBTIFF_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBTIFF_BUILD_DIR)/.installed $(LIBTIFF_BUILD_DIR)/.installed: download_libtiff \ $(LIBTIFF_BUILD_DIR)/.decompressed $(LIBTIFF_BUILD_DIR)/.configured @@ -91,14 +87,11 @@ $(LIBTIFF_BUILD_DIR)/.configured: @touch $@ libtiff_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup libtiff-$(LIBTIFF_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup libtiff...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBTIFF_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBTIFF_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBTIFF_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(LIBTIFF_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(LIBTIFF_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(LIBTIFF_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(LIBTIFF_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBTIFF_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBTIFF_PKGCONFIGS) + $(Q)-rm -rf $(LIBTIFF_BUILD_DIR) diff --git a/packages/graphics/pixman/pixman.mk b/packages/graphics/pixman/pixman.mk index a0873ac..be09ac3 100644 --- a/packages/graphics/pixman/pixman.mk +++ b/packages/graphics/pixman/pixman.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file pixman.mk # \brief pixman.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ @@ -34,13 +34,9 @@ PIXMAN_INCLUDES = pixman-* PIXMAN_LIBS = libpixman-* PIXMAN_PKGCONFIGS = pixman-*.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -pixman_install: $(PIXMAN_BUILD_DIR)/.installed +pixman_install: + @test -e $(PIXMAN_BUILD_DIR)/.installed || \ + $(MAKE) $(PIXMAN_BUILD_DIR)/.installed $(PIXMAN_BUILD_DIR)/.installed: download_pixman \ $(PIXMAN_BUILD_DIR)/.decompressed $(PIXMAN_BUILD_DIR)/.configured @@ -93,10 +89,7 @@ pixman_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(PIXMAN_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(PIXMAN_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(PIXMAN_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(PIXMAN_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(PIXMAN_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(PIXMAN_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(PIXMAN_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(PIXMAN_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(PIXMAN_PKGCONFIGS) + $(Q)-rm -rf $(PIXMAN_BUILD_DIR) diff --git a/packages/misc/expat/expat.mk b/packages/misc/expat/expat.mk index 47576b3..e97e9e6 100644 --- a/packages/misc/expat/expat.mk +++ b/packages/misc/expat/expat.mk @@ -37,7 +37,9 @@ EXPAT_PKGCONFIGS = EXPAT_DEPS = -expat_install: $(EXPAT_BUILD_DIR)/.installed +expat_install: + @test -e $(EXPAT_BUILD_DIR)/.installed || \ + $(MAKE) $(EXPAT_BUILD_DIR)/.installed $(EXPAT_BUILD_DIR)/.installed: $(EXPAT_DEPS) download_expat \ $(EXPAT_BUILD_DIR)/.decompressed $(EXPAT_BUILD_DIR)/.configured @@ -94,10 +96,11 @@ $(EXPAT_BUILD_DIR)/.configured: @touch $@ expat_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup expat-$(EXPAT_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup expat...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(EXPAT_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(EXPAT_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(EXPAT_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(EXPAT_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(EXPAT_PKGCONFIGS) + $(Q)-rm -rf $(EXPAT_BUILD_DIR) diff --git a/packages/misc/foo/foo.mk b/packages/misc/foo/foo.mk index a057402..3aba6bd 100644 --- a/packages/misc/foo/foo.mk +++ b/packages/misc/foo/foo.mk @@ -35,9 +35,11 @@ FOO_INCLUDES = FOO_LIBS = FOO_PKGCONFIGS = -FOO_DEPS = +FOO_DEPS := -foo_install: $(FOO_BUILD_DIR)/.installed +foo_install: + @test -e $(FOO_BUILD_DIR)/.installed || \ + $(MAKE) $(FOO_BUILD_DIR)/.installed $(FOO_BUILD_DIR)/.installed: $(FOO_DEPS) download_foo \ $(FOO_BUILD_DIR)/.decompressed $(FOO_BUILD_DIR)/.configured @@ -66,7 +68,7 @@ $(FOO_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(FOO_PACKAGE) ...") @tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(FOO_PACKAGE) ifeq ($(CONFIG_EMBTK_FOO_NEED_PATCH),y) - @cd $(PACKAGES_BUILD)/foo-$(FOO_VERSION); \ + @cd $(FOO_BUILD_DIR); \ patch -p1 < $(DOWNLOAD_DIR)/foo-$(FOO_VERSION).patch endif @touch $@ @@ -95,10 +97,11 @@ $(FOO_BUILD_DIR)/.configured: @touch $@ foo_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup foo-$(FOO_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup foo...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FOO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FOO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FOO_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FOO_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FOO_PKGCONFIGS) + $(Q)-rm -rf $(FOO_BUILD_DIR) diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk index 62e4b33..40c9306 100644 --- a/packages/misc/gettext/gettext.mk +++ b/packages/misc/gettext/gettext.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file gettext.mk # \brief gettext.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ @@ -38,7 +38,9 @@ GETTEXT_PKGCONFIGS = GETTEXT_DEPS = ncurses_install libxml2_install -gettext_install: $(GETTEXT_BUILD_DIR)/.installed +gettext_install: + @test -e $(GETTEXT_BUILD_DIR)/.installed || \ + $(MAKE) $(GETTEXT_BUILD_DIR)/.installed $(GETTEXT_BUILD_DIR)/.installed: $(GETTEXT_DEPS) download_gettext \ $(GETTEXT_BUILD_DIR)/.decompressed $(GETTEXT_BUILD_DIR)/.configured @@ -85,12 +87,9 @@ gettext_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(GETTEXT_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(GETTEXT_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(GETTEXT_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(GETTEXT_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(GETTEXT_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(GETTEXT_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(GETTEXT_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(GETTEXT_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(GETTEXT_PKGCONFIGS) + $(Q)-rm -rf $(GETTEXT_BUILD_DIR) #FIXME: this should be fixed in gettext project $(GETTEXT_BUILD_DIR)/.patchlibtool: diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk index 773dcd6..b72ebdb 100644 --- a/packages/misc/glib/glib.mk +++ b/packages/misc/glib/glib.mk @@ -36,10 +36,14 @@ GLIB_INCLUDES = gio-unix-* glib-* GLIB_LIBS = gio* libgio-* libglib-* libgmodule-* libgobject-* libgthread-* glib-* GLIB_PKGCONFIGS = gio-*.pc glib-*.pc gmodule-*.pc gobject-*.pc gthread-*.pc -glib_install: $(GLIB_BUILD_DIR)/.installed +GLIB_DEPS := zlib_target_install gettext_install -$(GLIB_BUILD_DIR)/.installed: zlib_target_install \ - gettext_install download_glib $(GLIB_BUILD_DIR)/.decompressed \ +glib_install: + @test -e $(GLIB_BUILD_DIR)/.installed || \ + $(MAKE) $(GLIB_BUILD_DIR)/.installed + +$(GLIB_BUILD_DIR)/.installed: $(GLIB_DEPS) \ + download_glib $(GLIB_BUILD_DIR)/.decompressed \ $(GLIB_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ glib-$(GLIB_VERSION) in your root filesystem...") @@ -115,10 +119,11 @@ $(GLIB_BUILD_DIR)/.patchlibtool: mv libgthread-2.0.la.new $(SYSROOT)/usr/$(LIBDIR)/libgthread-2.0.la glib_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup glib-$(GLIB_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup glib...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(GLIB_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(GLIB_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(GLIB_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(GLIB_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(GLIB_PKGCONFIGS) + $(Q)-rm -rf $(GLIB_BUILD_DIR) diff --git a/packages/misc/libelf/libelf.mk b/packages/misc/libelf/libelf.mk index 276e470..2cf5952 100644 --- a/packages/misc/libelf/libelf.mk +++ b/packages/misc/libelf/libelf.mk @@ -1,24 +1,25 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 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 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. +# 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 <http://www.gnu.org/licenses/>. # -# 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 libelf.mk # \brief libelf.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date January 2010 ################################################################################ @@ -34,15 +35,13 @@ LIBELF_INCLUDES = libelf gelf.h libelf.h nlist.h LIBELF_LIBS = libelf.a LIBELF_PKGCONFIGS = libelf.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif +LIBELF_DEPS := gettext_install -libelf_install: $(LIBELF_BUILD_DIR)/.installed +libelf_install: + @test -e $(LIBELF_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBELF_BUILD_DIR)/.installed -$(LIBELF_BUILD_DIR)/.installed: gettext_install download_libelf \ +$(LIBELF_BUILD_DIR)/.installed: $(LIBELF_DEPS) download_libelf \ $(LIBELF_BUILD_DIR)/.decompressed $(LIBELF_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ libelf-$(LIBELF_VERSION) in your root filesystem...") @@ -58,7 +57,7 @@ download_libelf: wget -O $(DOWNLOAD_DIR)/$(LIBELF_PACKAGE) \ $(LIBELF_SITE)/$(LIBELF_PACKAGE) ifeq ($(CONFIG_EMBTK_LIBELF_NEED_PATCH),y) - $(Q)test -e $(DOWNLOAD_DIR)/libelf-$(LIBELF_VERSION).patch || \ + @test -e $(DOWNLOAD_DIR)/libelf-$(LIBELF_VERSION).patch || \ wget -O $(DOWNLOAD_DIR)/libelf-$(LIBELF_VERSION).patch \ $(LIBELF_PATCH_SITE)/libelf-$(LIBELF_VERSION)-*.patch endif @@ -67,7 +66,7 @@ $(LIBELF_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(LIBELF_PACKAGE) ...") @tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(LIBELF_PACKAGE) ifeq ($(CONFIG_EMBTK_LIBELF_NEED_PATCH),y) - cd $(PACKAGES_BUILD)/libelf-$(LIBELF_VERSION); \ + cd $(LIBELF_BUILD_DIR); \ patch -p1 < $(DOWNLOAD_DIR)/libelf-$(LIBELF_VERSION).patch endif @touch $@ @@ -97,14 +96,11 @@ $(LIBELF_BUILD_DIR)/.configured: @touch $@ libelf_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup libelf-$(LIBELF_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup libelf...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBELF_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBELF_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBELF_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(LIBELF_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(LIBELF_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(LIBELF_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(LIBELF_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBELF_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBELF_PKGCONFIGS) + $(Q)-rm -rf $(LIBELF_BUILD_DIR) diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk index c3cbc00..a3b617a 100644 --- a/packages/misc/libxml/libxml.mk +++ b/packages/misc/libxml/libxml.mk @@ -35,7 +35,9 @@ LIBXML2_LIBS = libxml2* xml2Conf.sh LIBXML2_PKGCONFIGS = libxml*.pc LIBXML2_LIBTOOLS = libxml2.la -libxml2_install: $(LIBXML2_BUILD_DIR)/.installed +libxml2_install: + @test -e $(LIBXML2_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXML2_BUILD_DIR)/.installed $(LIBXML2_BUILD_DIR)/.installed: download_libxml2 \ $(LIBXML2_BUILD_DIR)/.decompressed $(LIBXML2_BUILD_DIR)/.configured @@ -91,4 +93,5 @@ libxml2_clean: $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXML2_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXML2_PKGCONFIGS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXML2_LIBTOOLS) + $(Q)-rm -rf $(LIBXML2_BUILD_DIR) diff --git a/packages/misc/misc.mk b/packages/misc/misc.mk index 89b8956..7f91bd9 100644 --- a/packages/misc/misc.mk +++ b/packages/misc/misc.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file misc.mk # \brief misc.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk index 131ebdd..cd622b9 100644 --- a/packages/misc/ncurses/ncurses.mk +++ b/packages/misc/ncurses/ncurses.mk @@ -1,24 +1,25 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 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 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. +# 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 <http://www.gnu.org/licenses/>. # -# 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 ncurses.mk # \brief ncurses.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date January 2010 ################################################################################ @@ -39,13 +40,10 @@ NCURSES_LIBS = libcurses.a libform.a libform_g.a libmenu.a libmenu_g.a \ libpanel_g.a terminfo NCURSES_PKGCONFIGS = -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -ncurses_install: $(NCURSES_BUILD_DIR)/.installed +ncurses_install: + @test -e $(NCURSES_BUILD_DIR)/.installed || \ + $(MAKE) $(NCURSES_BUILD_DIR)/.installed + $(MAKE) $(NCURSES_BUILD_DIR)/.special $(NCURSES_BUILD_DIR)/.installed: download_ncurses \ $(NCURSES_BUILD_DIR)/.decompressed $(NCURSES_BUILD_DIR)/.configured @@ -53,7 +51,6 @@ $(NCURSES_BUILD_DIR)/.installed: download_ncurses \ ncurses-$(NCURSES_VERSION) in your root filesystem...") $(Q)$(MAKE) -C $(NCURSES_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(NCURSES_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)-cp -R $(SYSROOT)/usr/share/tabset $(ROOTFS)/usr/share/ @touch $@ download_ncurses: @@ -93,14 +90,17 @@ $(NCURSES_BUILD_DIR)/.configured: @touch $@ ncurses_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup ncurses-$(NCURSES_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup ncurses...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(NCURSES_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(NCURSES_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(NCURSES_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(NCURSES_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(NCURSES_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(NCURSES_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(NCURSES_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(NCURSES_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(NCURSES_PKGCONFIGS) + $(Q)-rm -rf $(NCURSES_BUILD_DIR) +.PHONY: $(NCURSES_BUILD_DIR)/.special + +$(NCURSES_BUILD_DIR)/.special: + $(Q)mkdir -p $(ROOTFS)/usr/share + $(Q)-cp -R $(SYSROOT)/usr/share/tabset $(ROOTFS)/usr/share/ + @touch $@ diff --git a/packages/misc/pango/pango.mk b/packages/misc/pango/pango.mk index 8a45888..541186f 100644 --- a/packages/misc/pango/pango.mk +++ b/packages/misc/pango/pango.mk @@ -35,12 +35,15 @@ PANGO_INCLUDES = pango* PANGO_LIBS = pango-* pango* libpango* PANGO_PKGCONFIGS = pango*.pc -pango_install: $(PANGO_BUILD_DIR)/.installed $(PANGO_BUILD_DIR)/.special +PANGO_DEPS := glib_install fontconfig_install cairo_install -$(PANGO_BUILD_DIR)/.installed: $(GLIB_BUILD_DIR)/.installed \ - $(FONTCONFIG_BUILD_DIR)/.installed $(CAIRO_BUILD_DIR)/.installed \ - download_pango $(PANGO_BUILD_DIR)/.decompressed \ - $(PANGO_BUILD_DIR)/.configured +pango_install: + @test -e $(PANGO_BUILD_DIR)/.installed || \ + $(MAKE) $(PANGO_BUILD_DIR)/.installed + $(MAKE) $(PANGO_BUILD_DIR)/.special + +$(PANGO_BUILD_DIR)/.installed: $(PANGO_DEPS) download_pango \ + $(PANGO_BUILD_DIR)/.decompressed $(PANGO_BUILD_DIR)/.configured $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \ pango-$(PANGO_VERSION) in your root filesystem...") $(call EMBTK_KILL_LT_RPATH, $(PANGO_BUILD_DIR)) @@ -110,4 +113,5 @@ pango_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(PANGO_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(PANGO_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(PANGO_PKGCONFIGS) + $(Q)-rm -rf $(PANGO_BUILD_DIR) diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk index a25fc54..cb55af0 100644 --- a/packages/misc/tslib/tslib.mk +++ b/packages/misc/tslib/tslib.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file tslib.mk # \brief tslib.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -37,7 +37,10 @@ TSLIB_PKGCONFIGS = tslib-*.pc TSLIB_DEPS = -tslib_install: $(TSLIB_BUILD_DIR)/.installed +tslib_install: + @test -e $(TSLIB_BUILD_DIR)/.installed || \ + $(MAKE) $(TSLIB_BUILD_DIR)/.installed + $(MAKE) $(TSLIB_BUILD_DIR)/.special $(TSLIB_BUILD_DIR)/.installed: $(TSLIB_DEPS) download_tslib \ $(TSLIB_BUILD_DIR)/.decompressed $(TSLIB_BUILD_DIR)/.configured @@ -47,7 +50,6 @@ $(TSLIB_BUILD_DIR)/.installed: $(TSLIB_DEPS) download_tslib \ $(Q)$(MAKE) -C $(TSLIB_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/ @touch $@ download_tslib: @@ -66,7 +68,7 @@ $(TSLIB_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(TSLIB_PACKAGE) ...") @tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(TSLIB_PACKAGE) ifeq ($(CONFIG_EMBTK_TSLIB_NEED_PATCH),y) - @cd $(PACKAGES_BUILD)/tslib-$(TSLIB_VERSION); \ + @cd $(TSLIB_BUILD_DIR); \ patch -p1 < $(DOWNLOAD_DIR)/tslib-$(TSLIB_VERSION).patch endif @touch $@ @@ -105,4 +107,11 @@ tslib_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(TSLIB_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(TSLIB_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(TSLIB_PKGCONFIGS) + $(Q)-rm -rf $(TSLIB_BUILD_DIR) + + +.PHONY: $(TSLIB_BUILD_DIR)/.special +$(TSLIB_BUILD_DIR)/.special: + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/ + @touch $@ diff --git a/packages/scripting-languages/lua/lua.mk b/packages/scripting-languages/lua/lua.mk index b73c3b7..e9e7a5c 100644 --- a/packages/scripting-languages/lua/lua.mk +++ b/packages/scripting-languages/lua/lua.mk @@ -37,7 +37,9 @@ LUA_PKGCONFIGS = LUA_DEPS = -lua_install: $(LUA_BUILD_DIR)/.installed +lua_install: + @test -e $(LUA_BUILD_DIR)/.installed || \ + $(MAKE) $(LUA_BUILD_DIR)/.installed $(LUA_BUILD_DIR)/.installed: $(LUA_DEPS) download_lua \ $(LUA_BUILD_DIR)/.decompressed @@ -68,16 +70,17 @@ $(LUA_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(LUA_PACKAGE) ...") @tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(LUA_PACKAGE) ifeq ($(CONFIG_EMBTK_LUA_NEED_PATCH),y) - @cd $(PACKAGES_BUILD)/lua-$(LUA_VERSION); \ + @cd $(LUA_BUILD_DIR); \ patch -p1 < $(DOWNLOAD_DIR)/lua-$(LUA_VERSION).patch endif @touch $@ lua_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup lua-$(LUA_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup lua...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LUA_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LUA_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LUA_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LUA_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LUA_PKGCONFIGS) + $(Q)-rm -rf $(LUA_BUILD_DIR) diff --git a/packages/scripting-languages/perl/perl.mk b/packages/scripting-languages/perl/perl.mk index 950fd5c..c2292a9 100644 --- a/packages/scripting-languages/perl/perl.mk +++ b/packages/scripting-languages/perl/perl.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file perl.mk # \brief perl.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ diff --git a/packages/security/openssl/openssl.mk b/packages/security/openssl/openssl.mk index 116dc56..3e51a19 100644 --- a/packages/security/openssl/openssl.mk +++ b/packages/security/openssl/openssl.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -47,7 +47,10 @@ else OPENSSL_LINUX_TARGET := linux-generic32 endif -openssl_install: $(OPENSSL_BUILD_DIR)/.installed +openssl_install: + @test -e $(OPENSSL_BUILD_DIR)/.installed || \ + $(MAKE) $(OPENSSL_BUILD_DIR)/.installed + $(MAKE) $(OPENSSL_BUILD_DIR)/.special $(OPENSSL_BUILD_DIR)/.installed: download_openssl \ $(OPENSSL_BUILD_DIR)/.decompressed $(OPENSSL_BUILD_DIR)/.configured @@ -61,7 +64,6 @@ else $(Q)$(MAKE) -C $(OPENSSL_BUILD_DIR) \ INSTALL_PREFIX=$(SYSROOT)/ LIBDIR=lib MANDIR=/usr/share/man install endif - $(Q)-cp -R $(SYSROOT)/etc/ssl $(ROOTFS)/etc/ $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt @touch $@ @@ -99,11 +101,13 @@ openssl_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(OPENSSL_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(OPENSSL_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(OPENSSL_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(OPENSSL_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(OPENSSL_PKGCONFIGS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(OPENSSL_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(OPENSSL_PKGCONFIGS) $(Q)-cd $(SYSROOT)/etc; rm -rf $(OPENSSL_ETC) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(OPENSSL_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(OPENSSL_PKGCONFIGS) -endif + $(Q)-rm -rf $(OPENSSL_BUILD_DIR) +.PHONY: $(OPENSSL_BUILD_DIR)/.special + +$(OPENSSL_BUILD_DIR)/.special: + $(Q)-cp -R $(SYSROOT)/etc/ssl $(ROOTFS)/etc/ + @touch $@ diff --git a/packages/security/security.mk b/packages/security/security.mk index a42f3c7..9338c3a 100644 --- a/packages/security/security.mk +++ b/packages/security/security.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file security.mk # \brief security.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ diff --git a/packages/system/dbus/dbus.mk b/packages/system/dbus/dbus.mk index b0d7c18..10a152f 100644 --- a/packages/system/dbus/dbus.mk +++ b/packages/system/dbus/dbus.mk @@ -40,7 +40,9 @@ DBUS_DEPS = libxml2_install expat_install DBUS_CONFIGURE_OPTS := --enable-abstract-sockets -dbus_install: $(DBUS_BUILD_DIR)/.installed +dbus_install: + test -e $(DBUS_BUILD_DIR)/.installed || \ + $(MAKE) $(DBUS_BUILD_DIR)/.installed $(DBUS_BUILD_DIR)/.installed: $(DBUS_DEPS) download_dbus \ $(DBUS_BUILD_DIR)/.decompressed $(DBUS_BUILD_DIR)/.configured @@ -99,12 +101,13 @@ $(DBUS_BUILD_DIR)/.configured: @touch $@ dbus_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup dbus-$(DBUS_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup dbus...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(DBUS_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(DBUS_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(DBUS_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(DBUS_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(DBUS_PKGCONFIGS) + $(Q)-rm -rf $(DBUS_BUILD_DIR) .PHONY: $(DBUS_BUILD_DIR)/.special diff --git a/packages/system/utillinuxng/utillinuxng.mk b/packages/system/utillinuxng/utillinuxng.mk index 78e2854..87598bd 100644 --- a/packages/system/utillinuxng/utillinuxng.mk +++ b/packages/system/utillinuxng/utillinuxng.mk @@ -58,7 +58,9 @@ UTILLINUXNG_CONFIGURE_OPTS := --without-audit --without-selinux \ UTILLINUXNG_DEPS = -utillinuxng_install: $(UTILLINUXNG_BUILD_DIR)/.installed +utillinuxng_install: + @test -e $(UTILLINUXNG_BUILD_DIR)/.installed || \ + $(MAKE) $(UTILLINUXNG_BUILD_DIR)/.installed $(UTILLINUXNG_BUILD_DIR)/.installed: $(UTILLINUXNG_DEPS) download_utillinuxng \ $(UTILLINUXNG_BUILD_DIR)/.decompressed \ @@ -76,7 +78,7 @@ $(UTILLINUXNG_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(UTILLINUXNG_PACKAGE) ...") @tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(UTILLINUXNG_PACKAGE) ifeq ($(CONFIG_EMBTK_UTILLINUXNG_NEED_PATCH),y) - @cd $(PACKAGES_BUILD)/util-linux-ng-$(UTILLINUXNG_VERSION); \ + @cd $(UTILLINUXNG_BUILD_DIR); \ patch -p1 < $(DOWNLOAD_DIR)/util-linux-ng-$(UTILLINUXNG_VERSION).patch endif @touch $@ @@ -105,12 +107,13 @@ $(UTILLINUXNG_BUILD_DIR)/.configured: @touch $@ utillinuxng_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup util-linux-ng-$(UTILLINUXNG_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup util-linux-ng...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(UTILLINUXNG_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(UTILLINUXNG_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(UTILLINUXNG_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(UTILLINUXNG_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(UTILLINUXNG_PKGCONFIGS) + $(Q)-rm -rf $(UTILLINUXNG_BUILD_DIR) ################################################## # util-linux-ng for the host development machine # @@ -133,7 +136,9 @@ UTILLINUXNG_HOST_CONFIGURE_OPTS := --without-audit --without-selinux \ UTILLINUXNG_HOST_DEPS = -utillinuxng_host_install: $(UTILLINUXNG_HOST_BUILD_DIR)/.installed +utillinuxng_host_install: + test -e $(UTILLINUXNG_HOST_BUILD_DIR)/.installed || \ + $(MAKE) $(UTILLINUXNG_HOST_BUILD_DIR)/.installed $(UTILLINUXNG_HOST_BUILD_DIR)/.installed: $(UTILLINUXNG_HOST_DEPS) \ download_utillinuxng $(UTILLINUXNG_HOST_BUILD_DIR)/.decompressed \ @@ -161,7 +166,7 @@ $(UTILLINUXNG_HOST_BUILD_DIR)/.configured: @touch $@ utillinuxng_host_clean: - $(call EMBTK_GENERIC_MESSAGE,"Cleanup util-linux-ng-$(UTILLINUXNG_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"Cleanup util-linux-ng...") ############################## # Common for host and target # diff --git a/packages/x11/bigreqsproto/bigreqsproto.mk b/packages/x11/bigreqsproto/bigreqsproto.mk index bde8564..c8e519b 100644 --- a/packages/x11/bigreqsproto/bigreqsproto.mk +++ b/packages/x11/bigreqsproto/bigreqsproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file bigreqsproto.mk # \brief bigreqsproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ @@ -34,7 +34,9 @@ BIGREQSPROTO_INCLUDES = X11/extensions/bigreqsproto.h X11/extensions/bigreqstr.h BIGREQSPROTO_LIBS = BIGREQSPROTO_PKGCONFIGS = bigreqsproto.pc -bigreqsproto_install: $(BIGREQSPROTO_BUILD_DIR)/.installed +bigreqsproto_install: + @test -e $(BIGREQSPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(BIGREQSPROTO_BUILD_DIR)/.installed $(BIGREQSPROTO_BUILD_DIR)/.installed: download_bigreqsproto \ $(BIGREQSPROTO_BUILD_DIR)/.decompressed $(BIGREQSPROTO_BUILD_DIR)/.configured @@ -86,10 +88,7 @@ bigreqsproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(BIGREQSPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(BIGREQSPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(BIGREQSPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(BIGREQSPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(BIGREQSPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(BIGREQSPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(BIGREQSPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(BIGREQSPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(BIGREQSPROTO_PKGCONFIGS) + $(Q)-rm -rf $(BIGREQSPROTO_BUILD_DIR) diff --git a/packages/x11/compositeproto/compositeproto.mk b/packages/x11/compositeproto/compositeproto.mk index cf025f9..db4ba57 100644 --- a/packages/x11/compositeproto/compositeproto.mk +++ b/packages/x11/compositeproto/compositeproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file compositeproto.mk # \brief compositeproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@wembtoolkit.org> # \date March 2010 ################################################################################ @@ -35,7 +35,9 @@ COMPOSITEPROTO_INCLUDES = X11/extensions/compositeproto.h \ COMPOSITEPROTO_LIBS = COMPOSITEPROTO_PKGCONFIGS = compositeproto.pc -compositeproto_install: $(COMPOSITEPROTO_BUILD_DIR)/.installed +compositeproto_install: + @test -e $(COMPOSITEPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(COMPOSITEPROTO_BUILD_DIR)/.installed $(COMPOSITEPROTO_BUILD_DIR)/.installed: download_compositeproto \ $(COMPOSITEPROTO_BUILD_DIR)/.decompressed $(COMPOSITEPROTO_BUILD_DIR)/.configured @@ -89,4 +91,5 @@ compositeproto_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(COMPOSITEPROTO_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(COMPOSITEPROTO_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(COMPOSITEPROTO_PKGCONFIGS) + $(Q)-rm -rf $(COMPOSITEPROTO_BUILD_DIR) diff --git a/packages/x11/damageproto/damageproto.mk b/packages/x11/damageproto/damageproto.mk index d9f59a0..70cd3ff 100644 --- a/packages/x11/damageproto/damageproto.mk +++ b/packages/x11/damageproto/damageproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file damageproto.mk # \brief damageproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ @@ -34,7 +34,9 @@ DAMAGEPROTO_INCLUDES = X11/extnsions/damageproto.h damagewire.h DAMAGEPROTO_LIBS = DAMAGEPROTO_PKGCONFIGS = damageproto.pc -damageproto_install: $(DAMAGEPROTO_BUILD_DIR)/.installed +damageproto_install: + @test -e $(DAMAGEPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(DAMAGEPROTO_BUILD_DIR)/.installed $(DAMAGEPROTO_BUILD_DIR)/.installed: download_damageproto \ $(DAMAGEPROTO_BUILD_DIR)/.decompressed $(DAMAGEPROTO_BUILD_DIR)/.configured @@ -86,10 +88,7 @@ damageproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(DAMAGEPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(DAMAGEPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(DAMAGEPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(DAMAGEPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(DAMAGEPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(DAMAGEPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(DAMAGEPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(DAMAGEPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(DAMAGEPROTO_PKGCONFIGS) + $(Q)-rm -rf $(DAMAGEPROTO_BUILD_DIR) diff --git a/packages/x11/fixesproto/fixesproto.mk b/packages/x11/fixesproto/fixesproto.mk index 7633f60..afd73f5 100644 --- a/packages/x11/fixesproto/fixesproto.mk +++ b/packages/x11/fixesproto/fixesproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file fixesproto.mk # \brief fixesproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ @@ -34,13 +34,9 @@ FIXESPROTO_INCLUDES = X11/extensions/xfixesproto.h X11/extensions/xfixeswire.h FIXESPROTO_LIBS = FIXESPROTO_PKGCONFIGS = fixesproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -fixesproto_install: $(FIXESPROTO_BUILD_DIR)/.installed +fixesproto_install: + @test -e $(FIXESPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(FIXESPROTO_BUILD_DIR)/.installed $(FIXESPROTO_BUILD_DIR)/.installed: download_fixesproto \ $(FIXESPROTO_BUILD_DIR)/.decompressed $(FIXESPROTO_BUILD_DIR)/.configured @@ -92,10 +88,7 @@ fixesproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FIXESPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FIXESPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FIXESPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(FIXESPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(FIXESPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(FIXESPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(FIXESPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FIXESPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FIXESPROTO_PKGCONFIGS) + $(Q)-rm -rf $(FIXESPROTO_BUILD_DIR) diff --git a/packages/x11/fontsproto/fontsproto.mk b/packages/x11/fontsproto/fontsproto.mk index 94c3561..6857da6 100644 --- a/packages/x11/fontsproto/fontsproto.mk +++ b/packages/x11/fontsproto/fontsproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file fontsproto.mk # \brief fontsproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ @@ -36,13 +36,9 @@ FONTSPROTO_INCLUDES = X11/fonts/font.h X11/fonts/fontproto.h \ FONTSPROTO_LIBS = FONTSPROTO_PKGCONFIGS = fontsproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -fontsproto_install: $(FONTSPROTO_BUILD_DIR)/.installed +fontsproto_install: + @test -e $(FONTSPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(FONTSPROTO_BUILD_DIR)/.installed $(FONTSPROTO_BUILD_DIR)/.installed: download_fontsproto \ $(FONTSPROTO_BUILD_DIR)/.decompressed $(FONTSPROTO_BUILD_DIR)/.configured @@ -90,14 +86,11 @@ $(FONTSPROTO_BUILD_DIR)/.configured: @touch $@ fontsproto_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup fontsproto-$(FONTSPROTO_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup fontsproto...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(FONTSPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(FONTSPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(FONTSPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(FONTSPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(FONTSPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(FONTSPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(FONTSPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(FONTSPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(FONTSPROTO_PKGCONFIGS) + $(Q)-rm -rf $(FONTSPROTO_BUILD_DIR) diff --git a/packages/x11/inputproto/inputproto.mk b/packages/x11/inputproto/inputproto.mk index 29404a5..f06a7c9 100644 --- a/packages/x11/inputproto/inputproto.mk +++ b/packages/x11/inputproto/inputproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009 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 @@ -19,7 +19,7 @@ # # \file inputproto.mk # \brief inputproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date December 2009 ################################################################################ @@ -35,13 +35,9 @@ INPUTPROTO_INCLUDES = X11/extensions/XI2.h X11/extensions/XI2proto.h \ INPUTPROTO_LIBS = INPUTPROTO_PKGCONFIGS = inputproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -inputproto_install: $(INPUTPROTO_BUILD_DIR)/.installed +inputproto_install: + @test -e $(INPUTPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(INPUTPROTO_BUILD_DIR)/.installed $(INPUTPROTO_BUILD_DIR)/.installed: download_inputproto \ $(INPUTPROTO_BUILD_DIR)/.decompressed $(INPUTPROTO_BUILD_DIR)/.configured @@ -93,10 +89,7 @@ inputproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(INPUTPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(INPUTPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(INPUTPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(INPUTPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(INPUTPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(INPUTPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(INPUTPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(INPUTPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(INPUTPROTO_PKGCONFIGS) + $(Q)-rm -rf $(INPUTPROTO_BUILD_DIR) diff --git a/packages/x11/kbproto/kbproto.mk b/packages/x11/kbproto/kbproto.mk index 53c99c9..d132b4c 100644 --- a/packages/x11/kbproto/kbproto.mk +++ b/packages/x11/kbproto/kbproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -10,7 +10,7 @@ # 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. +# GNU General Public License kbprotor more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -19,7 +19,7 @@ # # \file kbproto.mk # \brief kbproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ @@ -36,7 +36,9 @@ KBPROTO_INCLUDES = X11/extensions/XKBgeom.h X11/extensions/XKB.h \ KBPROTO_LIBS = KBPROTO_PKGCONFIGS = kbproto.pc -kbproto_install: $(KBPROTO_BUILD_DIR)/.installed +kbproto_install: + @test -e $(KBPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(KBPROTO_BUILD_DIR)/.installed $(KBPROTO_BUILD_DIR)/.installed: download_kbproto \ $(KBPROTO_BUILD_DIR)/.decompressed $(KBPROTO_BUILD_DIR)/.configured @@ -84,10 +86,11 @@ $(KBPROTO_BUILD_DIR)/.configured: @touch $@ kbproto_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup kbproto-$(KBPROTO_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup kbproto...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(KBPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(KBPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(KBPROTO_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(KBPROTO_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(KBPROTO_PKGCONFIGS) + $(Q)-rm -rf $(KBPROTO_BUILD_DIR) diff --git a/packages/x11/libfontenc/libfontenc.mk b/packages/x11/libfontenc/libfontenc.mk index 82a5406..17ca292 100644 --- a/packages/x11/libfontenc/libfontenc.mk +++ b/packages/x11/libfontenc/libfontenc.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file libfontenc.mk # \brief libfontenc.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -34,7 +34,9 @@ LIBFONTENC_INCLUDES = X11/fonts/fontenc.h LIBFONTENC_LIBS = libfontenc.* LIBFONTENC_PKGCONFIGS = libfontenc.pc -libfontenc_install: $(LIBFONTENC_BUILD_DIR)/.installed +libfontenc_install: + @test -e $(LIBFONTENC_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBFONTENC_BUILD_DIR)/.installed $(LIBFONTENC_BUILD_DIR)/.installed: download_libfontenc \ $(LIBFONTENC_BUILD_DIR)/.decompressed $(LIBFONTENC_BUILD_DIR)/.configured @@ -88,4 +90,5 @@ libfontenc_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBFONTENC_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBFONTENC_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBFONTENC_PKGCONFIGS) + $(Q)-rm -rf $(LIBFONTENC_BUILD_DIR) diff --git a/packages/x11/libpciaccess/libpciaccess.mk b/packages/x11/libpciaccess/libpciaccess.mk index 7ec8d9a..700ebab 100644 --- a/packages/x11/libpciaccess/libpciaccess.mk +++ b/packages/x11/libpciaccess/libpciaccess.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved. +# 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 @@ -20,7 +20,7 @@ # \file libpciaccess.mk # \brief libpciaccess.mk of Embtoolkit # \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> -# \date December 2009 +# \date March 2010 ################################################################################ LIBPCIACCESS_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_LIBPCIACCESS_VERSION_STRING))) @@ -37,7 +37,9 @@ LIBPCIACCESS_PKGCONFIGS = pciaccess.pc LIBPCIACCESS_DEPS = -libpciaccess_install: $(LIBPCIACCESS_BUILD_DIR)/.installed +libpciaccess_install: + @test -e $(LIBPCIACCESS_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBPCIACCESS_BUILD_DIR)/.installed $(LIBPCIACCESS_BUILD_DIR)/.installed: $(LIBPCIACCESS_DEPS) \ download_libpciaccess $(LIBPCIACCESS_BUILD_DIR)/.decompressed \ @@ -96,10 +98,11 @@ $(LIBPCIACCESS_BUILD_DIR)/.configured: @touch $@ libpciaccess_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup libpciaccess-$(LIBPCIACCESS_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup libpciaccess...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBPCIACCESS_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBPCIACCESS_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBPCIACCESS_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBPCIACCESS_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBPCIACCESS_PKGCONFIGS) + $(Q)-rm -rf $(LIBPCIACCESS_BUILD_DIR) diff --git a/packages/x11/libpthreadstubs/libpthreadstubs.mk b/packages/x11/libpthreadstubs/libpthreadstubs.mk index 52165db..da54f8c 100644 --- a/packages/x11/libpthreadstubs/libpthreadstubs.mk +++ b/packages/x11/libpthreadstubs/libpthreadstubs.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file libpthreadstubs.mk # \brief libpthreadstubs.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -33,7 +33,9 @@ LIBPTHREADSTUBS_INCLUDES = LIBPTHREADSTUBS_LIBS = LIBPTHREADSTUBS_PKGCONFIGS = pthread-stubs.pc -libpthreadstubs_install: $(LIBPTHREADSTUBS_BUILD_DIR)/.installed +libpthreadstubs_install: + @test -e $(LIBPTHREADSTUBS_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBPTHREADSTUBS_BUILD_DIR)/.installed $(LIBPTHREADSTUBS_BUILD_DIR)/.installed: download_libpthreadstubs \ $(LIBPTHREADSTUBS_BUILD_DIR)/.decompressed $(LIBPTHREADSTUBS_BUILD_DIR)/.configured @@ -87,4 +89,5 @@ libpthreadstubs_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBPTHREADSTUBS_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBPTHREADSTUBS_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBPTHREADSTUBS_PKGCONFIGS) + $(Q)-rm -rf $(LIBPTHREADSTUBS_BUILD_DIR) diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk index 78dbc66..2c1aa53 100644 --- a/packages/x11/libx11/libx11.mk +++ b/packages/x11/libx11/libx11.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file libx11.mk # \brief libx11.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -39,7 +39,10 @@ LIBX11_PKGCONFIGS = x11.pc x11-xcb.pc LIBX11_DEPS = utilmacros_install inputproto_install kbproto_install \ xextproto_install xproto_install libxcb_install xtrans_install -libx11_install: $(LIBX11_BUILD_DIR)/.installed +libx11_install: + @test -e $(LIBX11_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBX11_BUILD_DIR)/.installed + $(MAKE) $(LIBX11_BUILD_DIR)/.special $(LIBX11_BUILD_DIR)/.installed: $(LIBX11_DEPS) download_libx11 \ $(LIBX11_BUILD_DIR)/.decompressed $(LIBX11_BUILD_DIR)/.configured @@ -53,10 +56,6 @@ $(LIBX11_BUILD_DIR)/.installed: $(LIBX11_DEPS) download_libx11 \ $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt $(Q)$(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool - $(Q)-mkdir -p $(ROOTFS)/usr/share - $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 - $(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/ - $(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/ @touch $@ download_libx11: @@ -101,6 +100,7 @@ libx11_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBX11_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBX11_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBX11_PKGCONFIGS) + $(Q)-rm -rf $(LIBX11_BUILD_DIR) $(LIBX11_BUILD_DIR)/.patchlibtool: @LIBX11_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \ @@ -109,3 +109,12 @@ $(LIBX11_BUILD_DIR)/.patchlibtool: sed \ -i "s; /usr/$(LIBDIR)/libX11.la ; $(SYSROOT)/usr/$(LIBDIR)/libX11.la ;" $$i; \ done + +.PHONY: $(LIBX11_BUILD_DIR)/.special + +$(LIBX11_BUILD_DIR)/.special: + $(Q)-mkdir -p $(ROOTFS)/usr/share + $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 + $(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/ + $(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/ + @touch $@ diff --git a/packages/x11/libxau/libxau.mk b/packages/x11/libxau/libxau.mk index 81bdf61..47ff5da 100644 --- a/packages/x11/libxau/libxau.mk +++ b/packages/x11/libxau/libxau.mk @@ -36,7 +36,9 @@ LIBXAU_PKGCONFIGS = xau.pc LIBXAU_DEPS = xproto_install -libxau_install: $(LIBXAU_BUILD_DIR)/.installed +libxau_install: + @test -e $(LIBXAU_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXAU_BUILD_DIR)/.installed $(LIBXAU_BUILD_DIR)/.installed: $(LIBXAU_DEPS) download_libxau \ $(LIBXAU_BUILD_DIR)/.decompressed $(LIBXAU_BUILD_DIR)/.configured @@ -90,4 +92,5 @@ libxau_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXAU_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXAU_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXAU_PKGCONFIGS) + $(Q)-rm -rf $(LIBXAU_BUILD_DIR) diff --git a/packages/x11/libxcb/libxcb.mk b/packages/x11/libxcb/libxcb.mk index 207d650..334b6c0 100644 --- a/packages/x11/libxcb/libxcb.mk +++ b/packages/x11/libxcb/libxcb.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2010 Abdoulaye Walsimou GAYE. All rights reserved. +# 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 @@ -36,7 +36,9 @@ LIBXCB_PKGCONFIGS = xcb* LIBXCB_DEPS = xcbproto_install libpthreadstubs_install libxau_install -libxcb_install: $(LIBXCB_BUILD_DIR)/.installed +libxcb_install: + @test -e $(LIBXCB_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXCB_BUILD_DIR)/.installed $(LIBXCB_BUILD_DIR)/.installed: $(LIBXCB_DEPS) download_libxcb \ $(LIBXCB_BUILD_DIR)/.decompressed $(LIBXCB_BUILD_DIR)/.configured @@ -92,6 +94,7 @@ libxcb_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXCB_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXCB_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXCB_PKGCONFIGS) + $(Q)-rm -rf $(LIBXCB_BUILD_DIR) $(LIBXCB_BUILD_DIR)/.patchlibtool: @LIBXCB_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \ diff --git a/packages/x11/libxcomposite/libxcomposite.mk b/packages/x11/libxcomposite/libxcomposite.mk index 00c774f..9f80763 100644 --- a/packages/x11/libxcomposite/libxcomposite.mk +++ b/packages/x11/libxcomposite/libxcomposite.mk @@ -37,7 +37,9 @@ LIBXCOMPOSITE_PKGCONFIGS = xcomposite.pc LIBXCOMPOSITE_DEPS = xproto_install libxfixes_install compositeproto_install -libxcomposite_install: $(LIBXCOMPOSITE_BUILD_DIR)/.installed +libxcomposite_install: + @test -e $(LIBXCOMPOSITE_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXCOMPOSITE_BUILD_DIR)/.installed $(LIBXCOMPOSITE_BUILD_DIR)/.installed: $(LIBXCOMPOSITE_DEPS) download_libxcomposite \ $(LIBXCOMPOSITE_BUILD_DIR)/.decompressed $(LIBXCOMPOSITE_BUILD_DIR)/.configured @@ -95,10 +97,11 @@ $(LIBXCOMPOSITE_BUILD_DIR)/.configured: @touch $@ libxcomposite_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup libxcomposite-$(LIBXCOMPOSITE_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup libxcomposite...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBXCOMPOSITE_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBXCOMPOSITE_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXCOMPOSITE_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXCOMPOSITE_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXCOMPOSITE_PKGCONFIGS) + $(Q)-rm -rf $(LIBXCOMPOSITE_BUILD_DIR) diff --git a/packages/x11/libxext/libxext.mk b/packages/x11/libxext/libxext.mk index 345f3a9..65d7afd 100644 --- a/packages/x11/libxext/libxext.mk +++ b/packages/x11/libxext/libxext.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file libxext.mk # \brief libxext.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -44,7 +44,9 @@ LIBXEXT_PKGCONFIGS = LIBXEXT_DEPS = libx11_install -libxext_install: $(LIBXEXT_BUILD_DIR)/.installed +libxext_install: + @test -e $(LIBXEXT_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXEXT_BUILD_DIR)/.installed $(LIBXEXT_BUILD_DIR)/.installed: $(LIBXEXT_DEPS) download_libxext \ $(LIBXEXT_BUILD_DIR)/.decompressed $(LIBXEXT_BUILD_DIR)/.configured @@ -99,4 +101,5 @@ libxext_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXEXT_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXEXT_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXEXT_PKGCONFIGS) + $(Q)-rm -rf $(LIBXEXT_BUILD_DIR) diff --git a/packages/x11/libxfixes/libxfixes.mk b/packages/x11/libxfixes/libxfixes.mk index 9f69527..404b278 100644 --- a/packages/x11/libxfixes/libxfixes.mk +++ b/packages/x11/libxfixes/libxfixes.mk @@ -37,7 +37,9 @@ LIBXFIXES_PKGCONFIGS =xfixes.pc LIBXFIXES_DEPS = xproto_install fixesproto_install -libxfixes_install: $(LIBXFIXES_BUILD_DIR)/.installed +libxfixes_install: + @test -e $(LIBXFIXES_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXFIXES_BUILD_DIR)/.installed $(LIBXFIXES_BUILD_DIR)/.installed: $(LIBXFIXES_DEPS) download_libxfixes \ $(LIBXFIXES_BUILD_DIR)/.decompressed $(LIBXFIXES_BUILD_DIR)/.configured @@ -95,10 +97,11 @@ $(LIBXFIXES_BUILD_DIR)/.configured: @touch $@ libxfixes_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup libxfixes-$(LIBXFIXES_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup libxfixes...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBXFIXES_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBXFIXES_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXFIXES_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXFIXES_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXFIXES_PKGCONFIGS) + $(Q)-rm -rf $(LIBXFIXES_BUILD_DIR) diff --git a/packages/x11/libxfont/libxfont.mk b/packages/x11/libxfont/libxfont.mk index 3eb45e8..fd8275a 100644 --- a/packages/x11/libxfont/libxfont.mk +++ b/packages/x11/libxfont/libxfont.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -40,7 +40,9 @@ LIBXFONT_PKGCONFIGS = xfont.pc LIBXFONT_DEPS = libfontenc_install freetype_install -libxfont_install: $(LIBXFONT_BUILD_DIR)/.installed +libxfont_install: + @test -e $(LIBXFONT_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXFONT_BUILD_DIR)/.installed $(LIBXFONT_BUILD_DIR)/.installed: $(LIBXFONT_DEPS) download_libxfont \ $(LIBXFONT_BUILD_DIR)/.decompressed $(LIBXFONT_BUILD_DIR)/.configured @@ -95,4 +97,5 @@ libxfont_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXFONT_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXFONT_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXFONT_PKGCONFIGS) + $(Q)-rm -rf $(LIBXFONT_BUILD_DIR) diff --git a/packages/x11/libxft/libxft.mk b/packages/x11/libxft/libxft.mk index 1bec85a..4868819 100644 --- a/packages/x11/libxft/libxft.mk +++ b/packages/x11/libxft/libxft.mk @@ -1,5 +1,5 @@ ################################################################################ -# Abdoulaye Walsimou GAYE, <awg@embtoolkit.org> +# Embtoolkit # Copyright(C) 2010 Abdoulaye Walsimou GAYE. All rights reserved. # # This program is free software: you can redistribute it and/or modify @@ -19,7 +19,7 @@ # # \file libxft.mk # \brief libxft.mk of Embtoolkit -# \author Abdoulaye Walsimou GAYE, <awg@embtoolkit.org> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date June 2010 ################################################################################ @@ -36,7 +36,9 @@ LIBXFT_PKGCONFIGS = xft.pc LIBXFT_DEPS = freetype_install fontconfig_install libxrender_install -libxft_install: $(LIBXFT_BUILD_DIR)/.installed +libxft_install: + @test -e $(LIBXFT_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXFT_BUILD_DIR)/.installed $(LIBXFT_BUILD_DIR)/.installed: $(LIBXFT_DEPS) download_libxft \ $(LIBXFT_BUILD_DIR)/.decompressed $(LIBXFT_BUILD_DIR)/.configured @@ -85,10 +87,11 @@ $(LIBXFT_BUILD_DIR)/.configured: @touch $@ libxft_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup libxft-$(LIBXFT_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup libxft...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBXFT_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBXFT_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXFT_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXFT_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXFT_PKGCONFIGS) + $(Q)-rm -rf $(LIBXFT_BUILD_DIR) diff --git a/packages/x11/libxkbfile/libxkbfile.mk b/packages/x11/libxkbfile/libxkbfile.mk index 1d19ebd..e418169 100644 --- a/packages/x11/libxkbfile/libxkbfile.mk +++ b/packages/x11/libxkbfile/libxkbfile.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file libxkbfile.mk # \brief libxkbfile.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ @@ -37,7 +37,9 @@ LIBXKBFILE_PKGCONFIGS = LIBXKBFILE_DEPS = kbproto_install libx11_install -libxkbfile_install: $(LIBXKBFILE_BUILD_DIR)/.installed +libxkbfile_install: + @test -e $(LIBXKBFILE_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXKBFILE_BUILD_DIR)/.installed $(LIBXKBFILE_BUILD_DIR)/.installed: $(LIBXKBFILE_DEPS) download_libxkbfile \ $(LIBXKBFILE_BUILD_DIR)/.decompressed $(LIBXKBFILE_BUILD_DIR)/.configured @@ -92,4 +94,5 @@ libxkbfile_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXKBFILE_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXKBFILE_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXKBFILE_PKGCONFIGS) + $(Q)-rm -rf $(LIBXKBFILE_BUILD_DIR) diff --git a/packages/x11/libxrandr/libxrandr.mk b/packages/x11/libxrandr/libxrandr.mk index 01a6a65..7b729a6 100644 --- a/packages/x11/libxrandr/libxrandr.mk +++ b/packages/x11/libxrandr/libxrandr.mk @@ -36,7 +36,9 @@ LIBXRANDR_PKGCONFIGS = xrandr.pc LIBXRANDR_DEPS = xproto_install randrproto_install -libxrandr_install: $(LIBXRANDR_BUILD_DIR)/.installed +libxrandr_install: + @test -e $(LIBXRANDR_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXRANDR_BUILD_DIR)/.installed $(LIBXRANDR_BUILD_DIR)/.installed: $(LIBXRANDR_DEPS) download_libxrandr \ $(LIBXRANDR_BUILD_DIR)/.decompressed $(LIBXRANDR_BUILD_DIR)/.configured @@ -85,10 +87,11 @@ $(LIBXRANDR_BUILD_DIR)/.configured: @touch $@ libxrandr_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup libxrandr-$(LIBXRANDR_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup libxrandr...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBXRANDR_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBXRANDR_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXRANDR_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXRANDR_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXRANDR_PKGCONFIGS) + $(Q)-rm -rf $(LIBXRANDR_BUILD_DIR) diff --git a/packages/x11/libxrender/libxrender.mk b/packages/x11/libxrender/libxrender.mk index 7001869..1dd2782 100644 --- a/packages/x11/libxrender/libxrender.mk +++ b/packages/x11/libxrender/libxrender.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -36,7 +36,9 @@ LIBXRENDER_PKGCONFIGS = xrender.pc LIBXRENDER_DEPS = renderproto_install libx11_install -libxrender_install: $(LIBXRENDER_BUILD_DIR)/.installed +libxrender_install: + @test -e $(LIBXRENDER_BUILD_DIR)/.installed || \ + $(MAKE) $(LIBXRENDER_BUILD_DIR)/.installed $(LIBXRENDER_BUILD_DIR)/.installed: $(LIBXRENDER_DEPS) download_libxrender \ $(LIBXRENDER_BUILD_DIR)/.decompressed $(LIBXRENDER_BUILD_DIR)/.configured @@ -91,4 +93,5 @@ libxrender_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXRENDER_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXRENDER_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXRENDER_PKGCONFIGS) + $(Q)-rm -rf $(LIBXRENDER_BUILD_DIR) diff --git a/packages/x11/randrproto/randrproto.mk b/packages/x11/randrproto/randrproto.mk index 041a4f8..7d46c93 100644 --- a/packages/x11/randrproto/randrproto.mk +++ b/packages/x11/randrproto/randrproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file randrproto.mk # \brief randrproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date February 2010 ################################################################################ @@ -34,13 +34,9 @@ RANDRPROTO_INCLUDES = X11/extensions/randr.h X11/extensions/randrproto.h RANDRPROTO_LIBS = RANDRPROTO_PKGCONFIGS = randrproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -randrproto_install: $(RANDRPROTO_BUILD_DIR)/.installed +randrproto_install: + @test -e $(RANDRPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(RANDRPROTO_BUILD_DIR)/.installed $(RANDRPROTO_BUILD_DIR)/.installed: download_randrproto \ $(RANDRPROTO_BUILD_DIR)/.decompressed $(RANDRPROTO_BUILD_DIR)/.configured @@ -92,10 +88,7 @@ randrproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RANDRPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RANDRPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RANDRPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(RANDRPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(RANDRPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(RANDRPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(RANDRPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RANDRPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RANDRPROTO_PKGCONFIGS) + $(Q)-rm -rf $(RANDRPROTO_BUILD_DIR) diff --git a/packages/x11/recordproto/recordproto.mk b/packages/x11/recordproto/recordproto.mk index 99fa301..b4aa125 100644 --- a/packages/x11/recordproto/recordproto.mk +++ b/packages/x11/recordproto/recordproto.mk @@ -1,6 +1,6 @@ ################################################################################ -# GAYE Abdoulaye Walsimou, <awg@embtoolkit.org> -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Abdoulaye Walsimou GAYE, <awg@embtoolkit.org> +# 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 @@ -19,7 +19,7 @@ # # \file recordproto.mk # \brief recordproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <awg@embtoolkit.org> +# \author Abdoulaye Walsimou GAYE, <awg@embtoolkit.org> # \date June 2010 ################################################################################ @@ -35,13 +35,9 @@ RECORDPROTO_INCLUDES = X11/extensions/recordconst.h \ RECORDPROTO_LIBS = RECORDPROTO_PKGCONFIGS = recordproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -recordproto_install: $(RECORDPROTO_BUILD_DIR)/.installed +recordproto_install: + @test -e $(RECORDPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(RECORDPROTO_BUILD_DIR)/.installed $(RECORDPROTO_BUILD_DIR)/.installed: download_recordproto \ $(RECORDPROTO_BUILD_DIR)/.decompressed $(RECORDPROTO_BUILD_DIR)/.configured @@ -92,10 +88,7 @@ recordproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RECORDPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RECORDPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RECORDPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(RECORDPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(RECORDPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(RECORDPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(RECORDPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RECORDPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RECORDPROTO_PKGCONFIGS) + $(Q)-rm -rf $(RECORDPROTO_BUILD_DIR) diff --git a/packages/x11/renderproto/renderproto.mk b/packages/x11/renderproto/renderproto.mk index 22c6fa8..91f3e83 100644 --- a/packages/x11/renderproto/renderproto.mk +++ b/packages/x11/renderproto/renderproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -34,13 +34,9 @@ RENDERPROTO_INCLUDES = X11/extensions/render.h X11/extensions/renderproto.h RENDERPROTO_LIBS = RENDERPROTO_PKGCONFIGS = renderproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -renderproto_install: $(RENDERPROTO_BUILD_DIR)/.installed +renderproto_install: + @test -e $(RENDERPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(RENDERPROTO_BUILD_DIR)/.installed $(RENDERPROTO_BUILD_DIR)/.installed: download_renderproto \ $(RENDERPROTO_BUILD_DIR)/.decompressed $(RENDERPROTO_BUILD_DIR)/.configured @@ -92,10 +88,7 @@ renderproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RENDERPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RENDERPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RENDERPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(RENDERPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(RENDERPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(RENDERPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(RENDERPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RENDERPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RENDERPROTO_PKGCONFIGS) + $(Q)-rm -rf $(RENDERPROTO_BUILD_DIR) diff --git a/packages/x11/resourceproto/resourceproto.mk b/packages/x11/resourceproto/resourceproto.mk index 8224c21..fb78a98 100644 --- a/packages/x11/resourceproto/resourceproto.mk +++ b/packages/x11/resourceproto/resourceproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file resourceproto.mk # \brief resourceproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -34,7 +34,9 @@ RESOURCEPROTO_INCLUDES = X11/extensions/XResproto.h RESOURCEPROTO_LIBS = RESOURCEPROTO_PKGCONFIGS = resourceproto.pc -resourceproto_install: $(RESOURCEPROTO_BUILD_DIR)/.installed +resourceproto_install: + @test -e $(RESOURCEPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(RESOURCEPROTO_BUILD_DIR)/.installed $(RESOURCEPROTO_BUILD_DIR)/.installed: download_resourceproto \ $(RESOURCEPROTO_BUILD_DIR)/.decompressed $(RESOURCEPROTO_BUILD_DIR)/.configured @@ -86,10 +88,7 @@ resourceproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(RESOURCEPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(RESOURCEPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(RESOURCEPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(RESOURCEPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(RESOURCEPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(RESOURCEPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(RESOURCEPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(RESOURCEPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(RESOURCEPROTO_PKGCONFIGS) + $(Q)-rm -rf $(RESOURCEPROTO_BUILD_DIR) diff --git a/packages/x11/utilmacros/utilmacros.mk b/packages/x11/utilmacros/utilmacros.mk index b040427..1adcdb9 100644 --- a/packages/x11/utilmacros/utilmacros.mk +++ b/packages/x11/utilmacros/utilmacros.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -34,7 +34,9 @@ UTILMACROS_INCLUDES = UTILMACROS_LIBS = UTILMACROS_PKGCONFIGS = xorg-macros.pc -utilmacros_install: $(UTILMACROS_BUILD_DIR)/.installed +utilmacros_install: + @test -e $(UTILMACROS_BUILD_DIR)/.installed || \ + $(MAKE) $(UTILMACROS_BUILD_DIR)/.installed $(UTILMACROS_BUILD_DIR)/.installed: download_utilmacros \ $(UTILMACROS_BUILD_DIR)/.decompressed $(UTILMACROS_BUILD_DIR)/.configured @@ -87,10 +89,7 @@ utilmacros_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(UTILMACROS_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(UTILMACROS_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(UTILMACROS_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(UTILMACROS_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(UTILMACROS_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(UTILMACROS_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(UTILMACROS_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(UTILMACROS_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(UTILMACROS_PKGCONFIGS) + $(Q)-rm -rf $(UTILMACROS_BUILD_DIR) diff --git a/packages/x11/videoproto/videoproto.mk b/packages/x11/videoproto/videoproto.mk index 24068e2..5ff1e76 100644 --- a/packages/x11/videoproto/videoproto.mk +++ b/packages/x11/videoproto/videoproto.mk @@ -36,7 +36,9 @@ VIDEOPROTO_INCLUDES = X11/extensions/vldXvMC.h X11/extensions/Xv.h \ VIDEOPROTO_LIBS = VIDEOPROTO_PKGCONFIGS = videoproto.pc -videoproto_install: $(VIDEOPROTO_BUILD_DIR)/.installed +videoproto_install: + @test -e $(VIDEOPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(VIDEOPROTO_BUILD_DIR)/.installed $(VIDEOPROTO_BUILD_DIR)/.installed: download_videoproto \ $(VIDEOPROTO_BUILD_DIR)/.decompressed $(VIDEOPROTO_BUILD_DIR)/.configured @@ -88,10 +90,7 @@ videoproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(VIDEOPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(VIDEOPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(VIDEOPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(VIDEOPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(VIDEOPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(VIDEOPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(VIDEOPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(VIDEOPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(VIDEOPROTO_PKGCONFIGS) + $(Q)-rm -rf $(VIDEOPROTO_BUILD_DIR) diff --git a/packages/x11/x11.mk b/packages/x11/x11.mk index 3763f01..cf905f9 100644 --- a/packages/x11/x11.mk +++ b/packages/x11/x11.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file x11.mk # \brief x11.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ diff --git a/packages/x11/xcbproto/xcbproto.mk b/packages/x11/xcbproto/xcbproto.mk index b8465c9..1bfca6f 100644 --- a/packages/x11/xcbproto/xcbproto.mk +++ b/packages/x11/xcbproto/xcbproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file xcbproto.mk # \brief xcbproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -33,13 +33,9 @@ XCBPROTO_INCLUDES = XCBPROTO_LIBS = python2.6/dist-packages/xcbgen XCBPROTO_PKGCONFIGS = xcb-proto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -xcbproto_install: $(XCBPROTO_BUILD_DIR)/.installed +xcbproto_install: + @test -e $(XCBPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(XCBPROTO_BUILD_DIR)/.installed $(XCBPROTO_BUILD_DIR)/.installed: download_xcbproto \ $(XCBPROTO_BUILD_DIR)/.decompressed $(XCBPROTO_BUILD_DIR)/.configured @@ -91,10 +87,7 @@ xcbproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XCBPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XCBPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCBPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(XCBPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(XCBPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(XCBPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(XCBPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XCBPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XCBPROTO_PKGCONFIGS) + $(Q)-rm -rf $(XCBPROTO_BUILD_DIR) diff --git a/packages/x11/xcbutil/xcbutil.mk b/packages/x11/xcbutil/xcbutil.mk index a11075d..995179e 100644 --- a/packages/x11/xcbutil/xcbutil.mk +++ b/packages/x11/xcbutil/xcbutil.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file xcbutil.mk # \brief xcbutil.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2009 ################################################################################ @@ -42,7 +42,9 @@ XCBUTIL_PKGCONFIGS = xcb-atom.pc xcb-aux.pc xcb-event.pc xcb-icccm.pc \ XCBUTIL_DEPS = libxcb_install -xcbutil_install: $(XCBUTIL_BUILD_DIR)/.installed +xcbutil_install: + @test -e $(XCBUTIL_BUILD_DIR)/.installed || \ + $(MAKE) $(XCBUTIL_BUILD_DIR)/.installed $(XCBUTIL_BUILD_DIR)/.installed: $(XCBUTIL_DEPS) download_xcbutil \ $(XCBUTIL_BUILD_DIR)/.decompressed $(XCBUTIL_BUILD_DIR)/.configured @@ -97,6 +99,7 @@ xcbutil_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCBUTIL_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XCBUTIL_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XCBUTIL_PKGCONFIGS) + $(Q)-rm -rf $(XCBUTIL_BUILD_DIR) $(XCBUTIL_BUILD_DIR)/.patchlibtool: @XCBUTIL_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \ diff --git a/packages/x11/xcmiscproto/xcmiscproto.mk b/packages/x11/xcmiscproto/xcmiscproto.mk index 884bdc4..d450e66 100644 --- a/packages/x11/xcmiscproto/xcmiscproto.mk +++ b/packages/x11/xcmiscproto/xcmiscproto.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file xcmiscproto.mk # \brief xcmiscproto.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -34,13 +34,9 @@ XCMISCPROTO_INCLUDES = X11/extensions/xcmiscproto.h X11/extensions/xcmiscstr.h XCMISCPROTO_LIBS = XCMISCPROTO_PKGCONFIGS = xcmiscproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -xcmiscproto_install: $(XCMISCPROTO_BUILD_DIR)/.installed +xcmiscproto_install: + @test -e $(XCMISCPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(XCMISCPROTO_BUILD_DIR)/.installed $(XCMISCPROTO_BUILD_DIR)/.installed: download_xcmiscproto \ $(XCMISCPROTO_BUILD_DIR)/.decompressed $(XCMISCPROTO_BUILD_DIR)/.configured @@ -92,10 +88,7 @@ xcmiscproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XCMISCPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XCMISCPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCMISCPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(XCMISCPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(XCMISCPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(XCMISCPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(XCMISCPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XCMISCPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XCMISCPROTO_PKGCONFIGS) + $(Q)-rm -rf $(XCMISCPROTO_BUILD_DIR) diff --git a/packages/x11/xextproto/xextproto.mk b/packages/x11/xextproto/xextproto.mk index 382ee30..99706de 100644 --- a/packages/x11/xextproto/xextproto.mk +++ b/packages/x11/xextproto/xextproto.mk @@ -48,7 +48,9 @@ XEXTPROTO_INCLUDES = X11/extensions/ag.h X11/extensions/cupproto.h \ XEXTPROTO_LIBS = XEXTPROTO_PKGCONFIGS = xextproto.pc -xextproto_install: $(XEXTPROTO_BUILD_DIR)/.installed +xextproto_install: + @test -e $(XEXTPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(XEXTPROTO_BUILD_DIR)/.installed $(XEXTPROTO_BUILD_DIR)/.installed: download_xextproto \ $(XEXTPROTO_BUILD_DIR)/.decompressed $(XEXTPROTO_BUILD_DIR)/.configured @@ -100,10 +102,7 @@ xextproto_clean: $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XEXTPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XEXTPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XEXTPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(XEXTPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(XEXTPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(XEXTPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(XEXTPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XEXTPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XEXTPROTO_PKGCONFIGS) + $(Q)-rm -rf $(XEXTPROTO_BUILD_DIR) diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk index c982082..45a3ad3 100644 --- a/packages/x11/xf86inputevdev/xf86inputevdev.mk +++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk @@ -37,7 +37,10 @@ XF86INPUTEVDEV_PKGCONFIGS = xorg-evdev.pc XF86INPUTEVDEV_DEPS = xserver_install -xf86inputevdev_install: $(XF86INPUTEVDEV_BUILD_DIR)/.installed +xf86inputevdev_install: + @test -e $(XF86INPUTEVDEV_BUILD_DIR)/.installed || \ + $(MAKE) $(XF86INPUTEVDEV_BUILD_DIR)/.installed + $(MAKE) $(XF86INPUTEVDEV_BUILD_DIR)/.special $(XF86INPUTEVDEV_BUILD_DIR)/.installed: $(XF86INPUTEVDEV_DEPS) \ download_xf86inputevdev $(XF86INPUTEVDEV_BUILD_DIR)/.decompressed \ @@ -49,7 +52,6 @@ $(XF86INPUTEVDEV_BUILD_DIR)/.installed: $(XF86INPUTEVDEV_DEPS) \ $(Q)$(MAKE) -C $(XF86INPUTEVDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ @touch $@ download_xf86inputevdev: @@ -97,10 +99,16 @@ $(XF86INPUTEVDEV_BUILD_DIR)/.configured: @touch $@ xf86inputevdev_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup xf86inputevdev-$(XF86INPUTEVDEV_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup xf86inputevdev...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XF86INPUTEVDEV_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XF86INPUTEVDEV_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XF86INPUTEVDEV_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XF86INPUTEVDEV_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XF86INPUTEVDEV_PKGCONFIGS) + $(Q)-rm -rf $(XF86INPUTEVDEV_BUILD_DIR) + +.PHONY: $(XF86INPUTEVDEV_BUILD_DIR)/.special +$(XF86INPUTEVDEV_BUILD_DIR)/.special: + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + @touch $@ diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk index 997b8b2..dc4557c 100644 --- a/packages/x11/xf86videofbdev/xf86videofbdev.mk +++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk @@ -37,7 +37,10 @@ XF86VIDEOFBDEV_PKGCONFIGS = XF86VIDEOFBDEV_DEPS = xserver_install -xf86videofbdev_install: $(XF86VIDEOFBDEV_BUILD_DIR)/.installed +xf86videofbdev_install: + @test -e $(XF86VIDEOFBDEV_BUILD_DIR)/.installed || \ + $(MAKE) $(XF86VIDEOFBDEV_BUILD_DIR)/.installed + $(MAKE) $(XF86VIDEOFBDEV_BUILD_DIR)/.special $(XF86VIDEOFBDEV_BUILD_DIR)/.installed: $(XF86VIDEOFBDEV_DEPS) \ download_xf86videofbdev $(XF86VIDEOFBDEV_BUILD_DIR)/.decompressed \ @@ -49,7 +52,6 @@ $(XF86VIDEOFBDEV_BUILD_DIR)/.installed: $(XF86VIDEOFBDEV_DEPS) \ $(Q)$(MAKE) -C $(XF86VIDEOFBDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ @touch $@ download_xf86videofbdev: @@ -103,4 +105,10 @@ xf86videofbdev_clean: $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XF86VIDEOFBDEV_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XF86VIDEOFBDEV_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XF86VIDEOFBDEV_PKGCONFIGS) + $(Q)-rm -rf $(XF86VIDEOFBDEV_BUILD_DIR) + +.PHONY: $(XF86VIDEOFBDEV_BUILD_DIR)/.special +$(XF86VIDEOFBDEV_BUILD_DIR)/.special: + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + @touch $@ diff --git a/packages/x11/xkbcomp/xkbcomp.mk b/packages/x11/xkbcomp/xkbcomp.mk index fe46fd7..e0cfbf1 100644 --- a/packages/x11/xkbcomp/xkbcomp.mk +++ b/packages/x11/xkbcomp/xkbcomp.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 @@ -18,7 +18,7 @@ # # \file xkbcomp.mk # \brief xkbcomp.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -34,7 +34,10 @@ XKBCOMP_LIBS = XKBCOMP_PKGCONFIGS = XKBCOMP_DEPS = libxkbfile_install -xkbcomp_install: $(XKBCOMP_BUILD_DIR)/.installed + +xkbcomp_install: + @test -e $(XKBCOMP_BUILD_DIR)/.installed || \ + $(MAKE) $(XKBCOMP_BUILD_DIR)/.installed $(XKBCOMP_BUILD_DIR)/.installed: $(XKBCOMP_DEPS) download_xkbcomp \ $(XKBCOMP_BUILD_DIR)/.decompressed $(XKBCOMP_BUILD_DIR)/.configured @@ -82,10 +85,11 @@ $(XKBCOMP_BUILD_DIR)/.configured: @touch $@ xkbcomp_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup xkbcomp-$(XKBCOMP_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup xkbcomp...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XKBCOMP_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XKBCOMP_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XKBCOMP_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XKBCOMP_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XKBCOMP_PKGCONFIGS) + $(Q)-rm -rf $(XKBCOMP_BUILD_DIR) diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk index fbba20d..a612aa4 100644 --- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk +++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk @@ -1,24 +1,25 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2010 Abdoulaye Walsimou GAYE. 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 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 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. +# 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 <http://www.gnu.org/licenses/>. # -# 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 xkeyboardconfig.mk # \brief xkeyboardconfig.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -35,7 +36,10 @@ XKEYBOARDCONFIG_PKGCONFIGS = XKEYBOARDCONFIG_DEPS = xkbcomp_install -xkeyboardconfig_install: $(XKEYBOARDCONFIG_BUILD_DIR)/.installed +xkeyboardconfig_install: + @test -e $(XKEYBOARDCONFIG_BUILD_DIR)/.installed || \ + $(MAKE) $(XKEYBOARDCONFIG_BUILD_DIR)/.installed + $(MAKE) $(XKEYBOARDCONFIG_BUILD_DIR)/.special $(XKEYBOARDCONFIG_BUILD_DIR)/.installed: $(XKEYBOARDCONFIG_DEPS) \ download_xkeyboardconfig $(XKEYBOARDCONFIG_BUILD_DIR)/.decompressed \ @@ -46,8 +50,6 @@ $(XKEYBOARDCONFIG_BUILD_DIR)/.installed: $(XKEYBOARDCONFIG_DEPS) \ $(Q)$(MAKE) -C $(XKEYBOARDCONFIG_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 - $(Q)-cp -R $(SYSROOT)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/ @touch $@ download_xkeyboardconfig: @@ -86,10 +88,18 @@ $(XKEYBOARDCONFIG_BUILD_DIR)/.configured: @touch $@ xkeyboardconfig_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup xkeyboardconfig-$(XKEYBOARDCONFIG_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup xkeyboardconfig...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XKEYBOARDCONFIG_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XKEYBOARDCONFIG_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XKEYBOARDCONFIG_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XKEYBOARDCONFIG_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XKEYBOARDCONFIG_PKGCONFIGS) + $(Q)-rm -rf $(XKEYBOARDCONFIG_BUILD_DIR) + +.PHONY: $(XKEYBOARDCONFIG_BUILD_DIR)/.special +$(XKEYBOARDCONFIG_BUILD_DIR)/.special: + $(Q)-mkdir -p $(ROOTFS)/usr/share + $(Q)-mkdir -p $(ROOTFS)/usr/share/X11 + $(Q)-cp -R $(SYSROOT)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/ + @touch $@ diff --git a/packages/x11/xproto/xproto.mk b/packages/x11/xproto/xproto.mk index 655b901..28077da 100644 --- a/packages/x11/xproto/xproto.mk +++ b/packages/x11/xproto/xproto.mk @@ -37,13 +37,9 @@ XPROTO_INCLUDES = X11/keysymdef.h X11/Xalloca.h X11/Xatom.h X11/XF86keysym.h \ XPROTO_LIBS = XPROTO_PKGCONFIGS = xproto.pc -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -xproto_install: $(XPROTO_BUILD_DIR)/.installed +xproto_install: + @test -e $(XPROTO_BUILD_DIR)/.installed || \ + $(MAKE) $(XPROTO_BUILD_DIR)/.installed $(XPROTO_BUILD_DIR)/.installed: download_xproto \ $(XPROTO_BUILD_DIR)/.decompressed $(XPROTO_BUILD_DIR)/.configured @@ -91,14 +87,11 @@ $(XPROTO_BUILD_DIR)/.configured: @touch $@ xproto_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup xproto-$(XPROTO_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup xproto...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XPROTO_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XPROTO_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XPROTO_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(XPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(XPROTO_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(XPROTO_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(XPROTO_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XPROTO_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XPROTO_PKGCONFIGS) + $(Q)-rm -rf $(XPROTO_BUILD_DIR) diff --git a/packages/x11/xserver/xserver.kconfig b/packages/x11/xserver/xserver.kconfig index 544a816..f22eff7 100644 --- a/packages/x11/xserver/xserver.kconfig +++ b/packages/x11/xserver/xserver.kconfig @@ -54,6 +54,13 @@ choice depends on EMBTK_HAVE_XSERVER help Choose which variant of X server to install + + config EMBTK_HAVE_XSERVER_XORG + bool "xorg-server X server" + select KEMBTK_EGLIBC_OPTION_EGLIBC_STREAMS if EMBTK_CLIB_EGLIBC + select EMBTK_HAVE_LIBPCIACCESS + help + Traditional X server found on most Linux distributions. config EMBTK_HAVE_XSERVER_KDRIVE bool "kdrive X server: Xfbdev" help @@ -63,12 +70,6 @@ choice Kdriver is almost unmaintained now days, despite the fact it is integrated in the official xorg-server package. - config EMBTK_HAVE_XSERVER_XORG - bool "xorg-server X server" - select KEMBTK_EGLIBC_OPTION_EGLIBC_STREAMS if EMBTK_CLIB_EGLIBC - select EMBTK_HAVE_LIBPCIACCESS - help - Traditional X server found on most Linux distributions. endchoice choice prompt "xserver version you wish" diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk index cd008ea..9a5917d 100644 --- a/packages/x11/xserver/xserver.mk +++ b/packages/x11/xserver/xserver.mk @@ -71,7 +71,10 @@ else XSERVER_CONFIGURE_OPTS += --disable-tslib endif -xserver_install: $(XSERVER_BUILD_DIR)/.installed +xserver_install: + @test -e $(XSERVER_BUILD_DIR)/.installed || \ + $(MAKE) $(XSERVER_BUILD_DIR)/.installed + $(MAKE) $(XSERVER_BUILD_DIR)/.special $(XSERVER_BUILD_DIR)/.installed: $(XSERVER_DEPS) download_xserver \ $(XSERVER_BUILD_DIR)/.decompressed $(XSERVER_BUILD_DIR)/.configured @@ -82,7 +85,6 @@ $(XSERVER_BUILD_DIR)/.installed: $(XSERVER_DEPS) download_xserver \ $(Q)$(MAKE) -C $(XSERVER_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) pkgconfig_files_adapt - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ @touch $@ download_xserver: @@ -131,10 +133,16 @@ $(XSERVER_BUILD_DIR)/.configured: @touch $@ xserver_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup xserver-$(XSERVER_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup xserver...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XSERVER_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XSERVER_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XSERVER_INCLUDES) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XSERVER_LIBS) $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XSERVER_PKGCONFIGS) + $(Q)-rm -rf $(XSERVER_BUILD_DIR) + +.PHONY: $(XSERVER_BUILD_DIR)/.special +$(XSERVER_BUILD_DIR)/.special: + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/ + @touch $@ diff --git a/packages/x11/xtrans/xtrans.mk b/packages/x11/xtrans/xtrans.mk index dc14345..fb61b1f 100644 --- a/packages/x11/xtrans/xtrans.mk +++ b/packages/x11/xtrans/xtrans.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved. +# 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 @@ -19,7 +19,7 @@ # # \file xtrans.mk # \brief xtrans.mk of Embtoolkit -# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com> +# \author Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # \date March 2010 ################################################################################ @@ -34,13 +34,9 @@ XTRANS_INCLUDES = X11/xtrans XTRANS_LIBS = XTRANS_PKGCONFIGS = -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib32/pkgconfig -else -PKG_CONFIG_PATH=$(SYSROOT)/usr/lib/pkgconfig -endif - -xtrans_install: $(XTRANS_BUILD_DIR)/.installed +xtrans_install: + @test -e $(XTRANS_BUILD_DIR)/.installed || \ + $(MAKE) $(XTRANS_BUILD_DIR)/.installed $(XTRANS_BUILD_DIR)/.installed: download_xtrans \ $(XTRANS_BUILD_DIR)/.decompressed $(XTRANS_BUILD_DIR)/.configured @@ -89,14 +85,11 @@ $(XTRANS_BUILD_DIR)/.configured: @touch $@ xtrans_clean: - $(call EMBTK_GENERIC_MESSAGE,"cleanup xtrans-$(XTRANS_VERSION)...") + $(call EMBTK_GENERIC_MESSAGE,"cleanup xtrans...") $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XTRANS_BINS) $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XTRANS_SBINS) $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XTRANS_INCLUDES) - $(Q)-cd $(SYSROOT)/usr/lib; rm -rf $(XTRANS_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib/pkgconfig; rm -rf $(XTRANS_PKGCONFIGS) -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)-cd $(SYSROOT)/usr/lib32; rm -rf $(XTRANS_LIBS) - $(Q)-cd $(SYSROOT)/usr/lib32/pkgconfig; rm -rf $(XTRANS_PKGCONFIGS) -endif + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XTRANS_LIBS) + $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XTRANS_PKGCONFIGS) + $(Q)-rm -rf $(XTRANS_BUILD_DIR) |