summaryrefslogtreecommitdiff
path: root/packages/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'packages/graphics')
-rw-r--r--packages/graphics/atk/atk.mk13
-rw-r--r--packages/graphics/cairo/cairo.mk19
-rw-r--r--packages/graphics/directfb/directfb.mk18
-rw-r--r--packages/graphics/fontconfig/fontconfig.mk42
-rw-r--r--packages/graphics/freefont/freefont.mk27
-rw-r--r--packages/graphics/freetype/freetype.mk30
-rw-r--r--packages/graphics/gtk/gtk.kconfig9
-rw-r--r--packages/graphics/gtk/gtk.mk15
-rw-r--r--packages/graphics/imlib2/imlib2.mk21
-rw-r--r--packages/graphics/libjpeg/libjpeg.mk5
-rw-r--r--packages/graphics/libpng/libpng.mk18
-rw-r--r--packages/graphics/libtiff/libtiff.mk25
-rw-r--r--packages/graphics/pixman/pixman.mk23
13 files changed, 127 insertions, 138 deletions
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 02:01:27 +0000