diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-28 15:37:49 +0200 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-08-28 15:37:49 +0200 |
commit | 305b54a1a103f33f552c9693fbe1a0b801855c9c (patch) | |
tree | 59dc9be69d2b1d16649272efc2dcc5bc8c71ffd3 /packages/graphics | |
parent | 53b4522531e73e8546592ed5713d6933f35fd6c0 (diff) | |
download | embtoolkit-305b54a1a103f33f552c9693fbe1a0b801855c9c.tar.gz embtoolkit-305b54a1a103f33f552c9693fbe1a0b801855c9c.tar.bz2 embtoolkit-305b54a1a103f33f552c9693fbe1a0b801855c9c.tar.xz |
Packages: massively convert to use generic macros and implicit rules
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages/graphics')
-rw-r--r-- | packages/graphics/atk/atk.mk | 39 | ||||
-rw-r--r-- | packages/graphics/cairo/cairo.mk | 28 | ||||
-rw-r--r-- | packages/graphics/fontconfig/fontconfig.mk | 18 | ||||
-rw-r--r-- | packages/graphics/freetype/freetype.mk | 11 | ||||
-rw-r--r-- | packages/graphics/gdk-pixbuf/gdk-pixbuf.mk | 16 | ||||
-rw-r--r-- | packages/graphics/gtk/gtk.mk | 20 | ||||
-rw-r--r-- | packages/graphics/imlib2/imlib2.mk | 17 | ||||
-rw-r--r-- | packages/graphics/libjpeg/libjpeg.mk | 16 | ||||
-rw-r--r-- | packages/graphics/libpng/libpng.mk | 16 | ||||
-rw-r--r-- | packages/graphics/libtiff/libtiff.mk | 22 | ||||
-rw-r--r-- | packages/graphics/pango/pango.mk | 19 | ||||
-rw-r--r-- | packages/graphics/pixman/pixman.mk | 34 |
12 files changed, 51 insertions, 205 deletions
diff --git a/packages/graphics/atk/atk.mk b/packages/graphics/atk/atk.mk index ed38cb0..c05ed41 100644 --- a/packages/graphics/atk/atk.mk +++ b/packages/graphics/atk/atk.mk @@ -23,30 +23,21 @@ # \date December 2009 ################################################################################ -ATK_NAME := atk -ATK_VERSION := $(call embtk_get_pkgversion,ATK) -ATK_MAJOR_VERSION := $(call embtk_get_pkgversion,ATK_MAJOR) -ATK_SITE := http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_MAJOR_VERSION) -ATK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -ATK_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/atk/$(ATK_VERSION) -ATK_PACKAGE := atk-$(ATK_VERSION).tar.bz2 -ATK_SRC_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION) -ATK_BUILD_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION) +ATK_NAME := atk +ATK_VERSION := $(call embtk_get_pkgversion,atk) +ATK_MAJOR_VERSION := $(call embtk_get_pkgversion,atk_major) +ATK_SITE := http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_MAJOR_VERSION) +ATK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +ATK_PACKAGE := atk-$(ATK_VERSION).tar.bz2 +ATK_SRC_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION) +ATK_BUILD_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION) -ATK_BINS = -ATK_SBINS = -ATK_INCLUDES = atk-* -ATK_LIBS = libatk-* -ATK_PKGCONFIGS = atk.pc +ATK_BINS = +ATK_SBINS = +ATK_INCLUDES = atk-* +ATK_LIBS = libatk-* +ATK_PKGCONFIGS = atk.pc -ATK_CONFIGURE_OPTS := --disable-glibtest -ATK_DEPS := glib_install +ATK_CONFIGURE_OPTS := --disable-glibtest +ATK_DEPS := glib_install -atk_install: - $(call embtk_install_pkg,ATK) - -download_atk: - $(call embtk_download_pkg,ATK) - -atk_clean: - $(call embtk_cleanup_pkg,ATK) diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk index 226eaa5..37387ce 100644 --- a/packages/graphics/cairo/cairo.mk +++ b/packages/graphics/cairo/cairo.mk @@ -24,23 +24,23 @@ ################################################################################ CAIRO_NAME := cairo -CAIRO_VERSION := $(call embtk_get_pkgversion,CAIRO) +CAIRO_VERSION := $(call embtk_get_pkgversion,cairo) CAIRO_SITE := http://www.cairographics.org/releases CAIRO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -CAIRO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/cairo/$(CAIRO_VERSION) CAIRO_PACKAGE := cairo-$(CAIRO_VERSION).tar.gz CAIRO_SRC_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION) CAIRO_BUILD_DIR := $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION) -CAIRO_BINS = -CAIRO_SBINS = -CAIRO_INCLUDES = cairo -CAIRO_LIBS = libcairo* -CAIRO_PKGCONFIGS = cairo*.pc +CAIRO_BINS = +CAIRO_SBINS = +CAIRO_INCLUDES = cairo +CAIRO_LIBS = libcairo* +CAIRO_PKGCONFIGS = cairo*.pc -CAIRO_CONFIG_OPTS-y := -CAIRO_CONFIG_OPTS-n := -CAIRO_DEPS := pixman_install libpng_install freetype_install fontconfig_install +CAIRO_CONFIG_OPTS-y := +CAIRO_CONFIG_OPTS-n := +CAIRO_DEPS := pixman_install libpng_install freetype_install \ + fontconfig_install ifeq ($(CONFIG_EMBTK_HAVE_CAIRO_WITH_DIRECTFB),y) CAIRO_DEPS += directfb_install @@ -68,11 +68,3 @@ CAIRO_CONFIGURE_ENV := png_CFLAGS=`$(PKGCONFIG_BIN) libpng --cflags` CAIRO_CONFIGURE_ENV += png_LIBS=`$(PKGCONFIG_BIN) libpng --libs` CAIRO_CONFIGURE_ENV += png_REQUIRES=libpng -cairo_install: - $(call embtk_install_pkg,CAIRO) - -download_cairo: - $(call embtk_download_pkg,CAIRO) - -cairo_clean: - $(call embtk_cleanup_pkg,CAIRO) diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk index f7270be..15e4a28 100644 --- a/packages/graphics/fontconfig/fontconfig.mk +++ b/packages/graphics/fontconfig/fontconfig.mk @@ -27,7 +27,6 @@ FONTCONFIG_NAME := fontconfig FONTCONFIG_VERSION := $(call embtk_get_pkgversion,fontconfig) FONTCONFIG_SITE := http://fontconfig.org/release FONTCONFIG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -FONTCONFIG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/fontconfig/$(FONTCONFIG_VERSION) FONTCONFIG_PACKAGE := fontconfig-$(FONTCONFIG_VERSION).tar.gz FONTCONFIG_SRC_DIR := $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION) FONTCONFIG_BUILD_DIR := $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION) @@ -66,19 +65,6 @@ FONTCONFIG_MAKE_OPTS += FREETYPE_LIBS="$(FREETYPE_LIBS-y)" FONTCONFIG_DEPS := libxml2_install freetype_install -fontconfig_install: - $(call embtk_install_pkg,fontconfig) - $(MAKE) $(FONTCONFIG_BUILD_DIR)/.special - -download_fontconfig: - $(call embtk_download_pkg,fontconfig) - -.PHONY: $(FONTCONFIG_BUILD_DIR)/.special fontconfig_clean - -fontconfig_clean: - $(call embtk_cleanup_pkg,fontconfig) - -$(FONTCONFIG_BUILD_DIR)/.special: +define embtk_postinstall_fontconfig $(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/ - @touch $@ - +endef diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk index fced3ca..9aed9b1 100644 --- a/packages/graphics/freetype/freetype.mk +++ b/packages/graphics/freetype/freetype.mk @@ -24,10 +24,9 @@ ################################################################################ FREETYPE_NAME := freetype -FREETYPE_VERSION := $(call embtk_get_pkgversion,FREETYPE) +FREETYPE_VERSION := $(call embtk_get_pkgversion,freetype) FREETYPE_SITE := http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION) FREETYPE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -FREETYPE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/freetype/$(FREETYPE_VERSION) FREETYPE_PACKAGE := freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SRC_DIR := $(PACKAGES_BUILD)/freetype-$(FREETYPE_VERSION) FREETYPE_BUILD_DIR := $(PACKAGES_BUILD)/freetype-$(FREETYPE_VERSION) @@ -41,11 +40,3 @@ FREETYPE_PKGCONFIGS = freetype*.pc FREETYPE_DEPS := zlib_install FREETYPE_MAKE_OPTS := LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool -freetype_install: - $(call embtk_install_pkg,FREETYPE) - -download_freetype: - $(call embtk_download_pkg,FREETYPE) - -freetype_clean: - $(call embtk_cleanup_pkg,FREETYPE) diff --git a/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk b/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk index b0556c7..0fec257 100644 --- a/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk +++ b/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk @@ -28,7 +28,6 @@ GDKPIXBUF_MAJOR_VERSION := $(call embtk_get_pkgversion,gdkpixbuf_major) GDKPIXBUF_VERSION := $(call embtk_get_pkgversion,gdkpixbuf) GDKPIXBUF_SITE := http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/$(GDKPIXBUF_MAJOR_VERSION) GDKPIXBUF_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -GDKPIXBUF_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/gdk-pixbuf/$(GDKPIXBUF_VERSION) GDKPIXBUF_PACKAGE := gdk-pixbuf-$(GDKPIXBUF_VERSION).tar.bz2 GDKPIXBUF_SRC_DIR := $(PACKAGES_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION) GDKPIXBUF_BUILD_DIR := $(PACKAGES_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION) @@ -46,12 +45,6 @@ GDKPIXBUF_CONFIGURE_OPTS := --without-gdiplus --without-libjasper GDKPIXBUF_DEPS := libpng_install libjpeg_install \ libtiff_install glib_install -gdkpixbuf_install: - $(call embtk_install_pkg,gdkpixbuf) - -gdkpixbuf_clean: - $(call embtk_cleanup_pkg,gdkpixbuf) - # # gdk-pixbuf for host development machine. # @@ -62,7 +55,6 @@ GDKPIXBUF_HOST_SITE := $(GDKPIXBUF_SITE) GDKPIXBUF_HOST_SITE_MIRROR1 := $(GDKPIXBUF_SITE_MIRROR1) GDKPIXBUF_HOST_SITE_MIRROR2 := $(GDKPIXBUF_SITE_MIRROR2) GDKPIXBUF_HOST_SITE_MIRROR3 := $(GDKPIXBUF_SITE_MIRROR3) -GDKPIXBUF_HOST_PATCH_SITE := $(GDKPIXBUF_PATCH_SITE) GDKPIXBUF_HOST_PACKAGE := $(GDKPIXBUF_PACKAGE) GDKPIXBUF_HOST_SRC_DIR := $(TOOLS_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION) GDKPIXBUF_HOST_BUILD_DIR := $(TOOLS_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION) @@ -73,11 +65,3 @@ GDKPIXBUF_HOST_CONFIGURE_OPTS := --without-gdiplus --without-libjasper GDKPIXBUF_HOST_DEPS := libpng_host_install libjpeg_host_install \ libtiff_host_install glib_host_install -gdkpixbuf_host_install: - $(call embtk_install_hostpkg,gdkpixbuf_host) - -# -# Common targets -# -download_gdkpixbuf download_gdkpixbuf_host: - $(call embtk_download_pkg,gdkpixbuf) diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk index ce873c2..c3b5969 100644 --- a/packages/graphics/gtk/gtk.mk +++ b/packages/graphics/gtk/gtk.mk @@ -28,7 +28,6 @@ GTK_MAJOR_VERSION := $(call embtk_get_pkgversion,gtk_major) GTK_VERSION := $(call embtk_get_pkgversion,gtk) GTK_SITE := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(GTK_MAJOR_VERSION) GTK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -GTK_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/gtk/$(GTK_VERSION) GTK_PACKAGE := gtk+-$(GTK_VERSION).tar.bz2 GTK_SRC_DIR := $(PACKAGES_BUILD)/gtk+-$(GTK_VERSION) GTK_BUILD_DIR := $(PACKAGES_BUILD)/gtk+-$(GTK_VERSION) @@ -56,17 +55,11 @@ GTK_CONFIGURE_OPTS := $(GTK_BACKEND) GTK_CONFIGURE_OPTS += --disable-cups --disable-gtk-doc --disable-glibtest GTK_CONFIGURE_OPTS += LIBPNG=-lpng -gtk_install: - $(call embtk_install_pkg,gtk) +define embtk_postinstall_gtk $(Q)test -e $(GTK_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(GTK_BUILD_DIR)/.patchlibtool - $(Q)$(MAKE) $(GTK_BUILD_DIR)/.special - -download_gtk: - $(call embtk_download_pkg,gtk) - -gtk_clean: - $(call embtk_cleanup_pkg,gtk) + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ +endef $(GTK_BUILD_DIR)/.patchlibtool: ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) @@ -96,10 +89,3 @@ else mv $$i.new $$i; \ done endif - - -.PHONY: gtk_clean $(GTK_BUILD_DIR)/.special - -$(GTK_BUILD_DIR)/.special: - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/ - @touch $@ diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk index f79238a..b3cb0e6 100644 --- a/packages/graphics/imlib2/imlib2.mk +++ b/packages/graphics/imlib2/imlib2.mk @@ -27,7 +27,6 @@ IMLIB2_NAME := imlib2 IMLIB2_VERSION := $(call embtk_get_pkgversion,imlib2) IMLIB2_SITE := http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) IMLIB2_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -IMLIB2_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/imlib2/$(IMLIB2_VERSION) IMLIB2_PACKAGE := imlib2-$(IMLIB2_VERSION).tar.gz IMLIB2_SRC_DIR := $(PACKAGES_BUILD)/imlib2-$(IMLIB2_VERSION) IMLIB2_BUILD_DIR := $(PACKAGES_BUILD)/imlib2-$(IMLIB2_VERSION) @@ -42,21 +41,9 @@ IMLIB2_PKGCONFIGS = imlib2.pc IMLIB2_DEPS := libpng_install freetype_install libjpeg_install -imlib2_install: - $(call embtk_install_pkg,imlib2) - $(Q)$(MAKE) $(IMLIB2_BUILD_DIR)/.special - -download_imlib2: - $(call embtk_download_pkg,imlib2) - -imlib2_clean: - $(call embtk_cleanup_pkg,imlib2) - -.PHONY: $(IMLIB2_BUILD_DIR)/.special - -$(IMLIB2_BUILD_DIR)/.special: +define embtk_postinstall_imlib2 $(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 $@ +endef diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk index fab3f54..fba19b0 100644 --- a/packages/graphics/libjpeg/libjpeg.mk +++ b/packages/graphics/libjpeg/libjpeg.mk @@ -27,7 +27,6 @@ LIBJPEG_NAME := jpeg LIBJPEG_VERSION := $(call embtk_get_pkgversion,libjpeg) LIBJPEG_SITE := http://www.ijg.org/files LIBJPEG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -LIBJPEG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/jpeg/$(LIBJPEG_VERSION) LIBJPEG_PACKAGE := jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_SRC_DIR := $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION) LIBJPEG_BUILD_DIR := $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION) @@ -39,12 +38,6 @@ LIBJPEG_INCLUDES := jconfig.h jerror.h jmorecfg.h jpeglib.h LIBJPEG_CONFIGURE_OPTS := --program-suffix="" -libjpeg_install: - $(call embtk_install_pkg,libjpeg) - -libjpeg_clean: - $(call embtk_cleanup_pkg,libjpeg) - # # libjpeg for host development machine # @@ -54,18 +47,9 @@ LIBJPEG_HOST_SITE := $(LIBJPEG_SITE) LIBJPEG_HOST_SITE_MIRROR1 := $(LIBJPEG_SITE_MIRROR1) LIBJPEG_HOST_SITE_MIRROR2 := $(LIBJPEG_SITE_MIRROR2) LIBJPEG_HOST_SITE_MIRROR3 := $(LIBJPEG_SITE_MIRROR3) -LIBJPEG_HOST_PATCH_SITE := $(LIBJPEG_PATCH_SITE) LIBJPEG_HOST_PACKAGE := $(LIBJPEG_PACKAGE) LIBJPEG_HOST_SRC_DIR := $(TOOLS_BUILD)/jpeg-$(LIBJPEG_VERSION) LIBJPEG_HOST_BUILD_DIR := $(TOOLS_BUILD)/jpeg-$(LIBJPEG_VERSION) LIBJPEG_HOST_CONFIGURE_OPTS := --program-suffix="" -libjpeg_host_install: - $(call embtk_install_hostpkg,libjpeg_host) - -# -# Common for host and target -# -download_libjpeg download_libjpeg_host: - $(call embtk_download_pkg,libjpeg) diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk index 93e45df..5f920c1 100644 --- a/packages/graphics/libpng/libpng.mk +++ b/packages/graphics/libpng/libpng.mk @@ -28,7 +28,6 @@ LIBPNG_VERSION := $(call embtk_get_pkgversion,libpng) LIBPNG_SITE := http://download.sourceforge.net/libpng LIBPNG_PACKAGE := libpng-$(LIBPNG_VERSION).tar.gz LIBPNG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -LIBPNG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libpng/$(LIBPNG_VERSION) LIBPNG_SRC_DIR := $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION) LIBPNG_BUILD_DIR := $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION) @@ -41,12 +40,6 @@ LIBPNG_PKGCONFIGS = libpng* LIBPNG_CONFIGURE_OPTS := --with-libpng-compat=no LIBPNG_DEPS := zlib_install -libpng_install: - $(call embtk_install_pkg,libpng) - -libpng_clean: - $(call embtk_cleanup_pkg,libpng) - # # libpng for host development machine # @@ -58,18 +51,9 @@ LIBPNG_HOST_PACKAGE := $(LIBPNG_PACKAGE) LIBPNG_HOST_SITE_MIRROR1 := $(LIBPNG_SITE_MIRROR1) LIBPNG_HOST_SITE_MIRROR2 := $(LIBPNG_SITE_MIRROR2) LIBPNG_HOST_SITE_MIRROR3 := $(LIBPNG_SITE_MIRROR3) -LIBPNG_HOST_PATCH_SITE := $(LIBPNG_PATCH_SITE) LIBPNG_HOST_SRC_DIR := $(TOOLS_BUILD)/libpng-$(LIBPNG_VERSION) LIBPNG_HOST_BUILD_DIR := $(TOOLS_BUILD)/libpng-$(LIBPNG_VERSION) LIBPNG_HOST_CONFIGURE_OPTS := --with-libpng-compat=no LIBPNG_HOST_DEPS := zlib_host_install -libpng_host_install: - $(call embtk_install_hostpkg,libpng_host) - -# -# Common for target and host -# -download_libpng download_libpng_host: - $(call embtk_download_pkg,libpng) diff --git a/packages/graphics/libtiff/libtiff.mk b/packages/graphics/libtiff/libtiff.mk index 2457cfa..2c2d63d 100644 --- a/packages/graphics/libtiff/libtiff.mk +++ b/packages/graphics/libtiff/libtiff.mk @@ -27,14 +27,13 @@ LIBTIFF_NAME := libtiff LIBTIFF_VERSION := $(call embtk_get_pkgversion,libtiff) LIBTIFF_SITE := ftp://ftp.remotesensing.org/pub/libtiff LIBTIFF_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -LIBTIFF_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libtiff/$(LIBTIFF_VERSION) LIBTIFF_PACKAGE := tiff-$(LIBTIFF_VERSION).tar.gz LIBTIFF_SRC_DIR := $(PACKAGES_BUILD)/tiff-$(LIBTIFF_VERSION) LIBTIFF_BUILD_DIR := $(PACKAGES_BUILD)/tiff-$(LIBTIFF_VERSION) -LIBTIFF_BINS = vbmp2tiff fax2tiff pal2rgb ras2tiff rgb2ycbcr tiff2bw tiff2ps \ - tiffcmp tiffcrop tiffdump tiffmedian tiffsplit fax2ps gif2tiff \ - ppm2tiff raw2tiff thumbnail tiff2pdf tiff2rgba tiffcp \ +LIBTIFF_BINS = vbmp2tiff fax2tiff pal2rgb ras2tiff rgb2ycbcr tiff2bw tiff2ps \ + tiffcmp tiffcrop tiffdump tiffmedian tiffsplit fax2ps gif2tiff \ + ppm2tiff raw2tiff thumbnail tiff2pdf tiff2rgba tiffcp \ tiffdither tiffinfo tiffset bmp2tiff LIBTIFF_SBINS = LIBTIFF_INCLUDES = tiffconf.h tiff.h tiffio.h tiffio.hxx tiffvers.h @@ -43,12 +42,6 @@ LIBTIFF_PKGCONFIGS = LIBTIFF_CONFIGURE_OPTS := --disable-cxx --program-prefix="" -libtiff_install: - $(call embtk_install_pkg,libtiff) - -libtiff_clean: - $(call embtk_cleanup_pkg,libtiff) - # # libtiff for host development machine # @@ -58,18 +51,9 @@ LIBTIFF_HOST_SITE := $(LIBTIFF_SITE) LIBTIFF_HOST_SITE_MIRROR1 := $(LIBTIFF_SITE_MIRROR1) LIBTIFF_HOST_SITE_MIRROR2 := $(LIBTIFF_SITE_MIRROR2) LIBTIFF_HOST_SITE_MIRROR3 := $(LIBTIFF_SITE_MIRROR3) -LIBTIFF_HOST_PATCH_SITE := $(LIBTIFF_PATCH_SITE) LIBTIFF_HOST_PACKAGE := $(LIBTIFF_PACKAGE) LIBTIFF_HOST_SRC_DIR := $(TOOLS_BUILD)/tiff-$(LIBTIFF_VERSION) LIBTIFF_HOST_BUILD_DIR := $(TOOLS_BUILD)/tiff-$(LIBTIFF_VERSION) LIBTIFF_HOST_CONFIGURE_OPTS := --disable-cxx --program-prefix="" -libtiff_host_install: - $(call embtk_install_hostpkg,libtiff_host) - -# -# Common for host and target -# -download_libtiff download_libtiff_host: - $(call embtk_download_pkg,libtiff) diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk index 3b74fa1..0b2632c 100644 --- a/packages/graphics/pango/pango.mk +++ b/packages/graphics/pango/pango.mk @@ -28,7 +28,6 @@ PANGO_MAJOR_VERSION := $(call embtk_get_pkgversion,pango_major) PANGO_VERSION := $(call embtk_get_pkgversion,pango) PANGO_SITE := http://ftp.gnome.org/pub/gnome/sources/pango/$(PANGO_MAJOR_VERSION) PANGO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -PANGO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/pango/$(PANGO_VERSION) PANGO_PACKAGE := pango-$(PANGO_VERSION).tar.bz2 PANGO_SRC_DIR := $(PACKAGES_BUILD)/pango-$(PANGO_VERSION) PANGO_BUILD_DIR := $(PACKAGES_BUILD)/pango-$(PANGO_VERSION) @@ -49,17 +48,11 @@ PANGO_CONFIGURE_OPTS := $(PANGO_CONFIGURE_OPTS-y) PANGO_DEPS := glib_install fontconfig_install $(PANGO_DEPS-y) \ cairo_install -pango_install: - $(call embtk_install_pkg,pango) +define embtk_postinstall_pango $(Q)test -e $(PANGO_BUILD_DIR)/.patchlibtool || \ $(MAKE) $(PANGO_BUILD_DIR)/.patchlibtool - $(Q)$(MAKE) $(PANGO_BUILD_DIR)/.special - -download_pango: - $(call embtk_download_pkg,pango) - -pango_clean: - $(call embtk_cleanup_pkg,pango) + $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ +endef $(PANGO_BUILD_DIR)/.patchlibtool: $(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/* -type f -name *.la`; \ @@ -72,9 +65,3 @@ $(PANGO_BUILD_DIR)/.patchlibtool: mv $$i.new $$i; \ done @touch $@ - -.PHONY: pango_clean $(PANGO_BUILD_DIR)/.special - -$(PANGO_BUILD_DIR)/.special: - $(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/ - @touch $@ diff --git a/packages/graphics/pixman/pixman.mk b/packages/graphics/pixman/pixman.mk index bcceb7b..8f4d1f1 100644 --- a/packages/graphics/pixman/pixman.mk +++ b/packages/graphics/pixman/pixman.mk @@ -23,26 +23,16 @@ # \date December 2009 ################################################################################ -PIXMAN_NAME := pixman -PIXMAN_VERSION := $(call embtk_get_pkgversion,PIXMAN) -PIXMAN_SITE := http://www.cairographics.org/releases -PIXMAN_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror -PIXMAN_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/pixman/$(PIXMAN_VERSION) -PIXMAN_PACKAGE := pixman-$(PIXMAN_VERSION).tar.gz -PIXMAN_SRC_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION) -PIXMAN_BUILD_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION) +PIXMAN_NAME := pixman +PIXMAN_VERSION := $(call embtk_get_pkgversion,pixman) +PIXMAN_SITE := http://www.cairographics.org/releases +PIXMAN_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +PIXMAN_PACKAGE := pixman-$(PIXMAN_VERSION).tar.gz +PIXMAN_SRC_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION) +PIXMAN_BUILD_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION) -PIXMAN_BINS = -PIXMAN_SBINS = -PIXMAN_INCLUDES = pixman-* -PIXMAN_LIBS = libpixman-* -PIXMAN_PKGCONFIGS = pixman-*.pc - -pixman_install: - $(call embtk_install_pkg,PIXMAN) - -download_pixman: - $(call embtk_download_pkg,PIXMAN) - -pixman_clean: - $(call embtk_cleanup_pkg,PIXMAN) +PIXMAN_BINS = +PIXMAN_SBINS = +PIXMAN_INCLUDES = pixman-* +PIXMAN_LIBS = libpixman-* +PIXMAN_PKGCONFIGS = pixman-*.pc |