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 /packages/x11 | |
| 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>
Diffstat (limited to 'packages/x11')
40 files changed, 307 insertions, 287 deletions
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) |