From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 08/11] gtk: clean up
Date: Sun, 30 Oct 2011 22:56:18 +0100 [thread overview]
Message-ID: <1320011781-24886-8-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320011781-24886-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
rules/gtk.make | 65 ++++---------------------------------------------------
1 files changed, 5 insertions(+), 60 deletions(-)
diff --git a/rules/gtk.make b/rules/gtk.make
index 4ff64a7..95b6c16 100644
--- a/rules/gtk.make
+++ b/rules/gtk.make
@@ -25,14 +25,6 @@ GTK_SOURCE := $(SRCDIR)/$(GTK).$(GTK_SUFFIX)
GTK_DIR := $(BUILDDIR)/$(GTK)
# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(GTK_SOURCE):
- @$(call targetinfo)
- @$(call get, GTK)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -67,23 +59,11 @@ GTK_AUTOCONF := \
--disable-glibtest \
--disable-modules \
--with-included-loaders=$(subst $(space),$(comma),$(GTK_LOADER-y)) \
- gio_can_sniff=yes
-
-ifndef PTXCONF_GTK_LOADER_PNG
-GTK_AUTOCONF += --without-libpng
-endif
-
-ifndef PTXCONF_GTK_LOADER_TIFF
-GTK_AUTOCONF += --without-libtiff
-endif
-
-ifndef PTXCONF_GTK_LOADER_JPEG
-GTK_AUTOCONF += --without-libjpeg
-endif
-
-ifndef PTXCONF_GTK_LOADER_JPEG2000
-GTK_AUTOCONF += --without-libjasper
-endif
+ gio_can_sniff=yes \
+ --$(call ptx/wwo, PTXCONF_GTK_LOADER_PNG)-libpng \
+ --$(call ptx/wwo, PTXCONF_GTK_LOADER_TIFF)-libtiff \
+ --$(call ptx/wwo, PTXCONF_GTK_LOADER_JPEG)-libjpeg \
+ --$(call ptx/wwo, PTXCONF_GTK_LOADER_JPEG2000)-libjasper
ifdef PTXCONF_GTK_TARGET_X11
GTK_AUTOCONF += --with-gdktarget=x11
@@ -123,41 +103,6 @@ $(STATEDIR)/gtk.targetinstall:
@$(call install_fixup, gtk,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, gtk,DESCRIPTION,missing)
-# reviewed: 2.14.7 wants to install this:
-#
-# /usr/bin/gdk-pixbuf-csource
-# /usr/bin/gtk-update-icon-cache
-# /usr/bin/gtk-query-immodules-2.0
-# /usr/bin/gdk-pixbuf-query-loaders
-# /usr/bin/gtk-demo
-# /usr/bin/gtk-builder-convert
-# /usr/share/themes/Default
-# /usr/share/themes/Default/gtk-2.0-key
-# /usr/share/themes/Default/gtk-2.0-key/gtkrc
-# /usr/share/themes/Emacs
-# /usr/share/themes/Emacs/gtk-2.0-key
-# /usr/share/themes/Emacs/gtk-2.0-key/gtkrc
-# /usr/share/themes/Raleigh
-# /usr/share/themes/Raleigh/gtk-2.0
-# /usr/share/themes/Raleigh/gtk-2.0/gtkrc
-# /usr/lib/libgdk_pixbuf-2.0.so.$(GTK_LIBVERSION)
-# /usr/lib/libgdk-directfb-2.0.so
-# /usr/lib/gtk-2.0/modules/libferret.so
-# /usr/lib/gtk-2.0/modules/libgail.so
-# /usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
-# /usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
-# /usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
-# /usr/lib/libgdk_pixbuf-2.0.so.0
-# /usr/lib/libgdk-directfb-2.0.so.0
-# /usr/lib/libgailutil.so.18
-# /usr/lib/libgailutil.so
-# /usr/lib/libgdk_pixbuf-2.0.so
-# /usr/lib/libgtk-directfb-2.0.so.0
-# /usr/lib/libgdk-directfb-2.0.so.$(GTK_LIBVERSION)
-# /usr/lib/libgtk-directfb-2.0.so
-# /usr/lib/libgtk-directfb-2.0.so.$(GTK_LIBVERSION)
-# /etc/gtk-2.0/im-multipress.conf
-
ifdef PTXCONF_GTK_TARGET_DIRECTFB
@$(call install_lib, gtk, 0, 0, 0644, libgdk-directfb-2.0)
@$(call install_lib, gtk, 0, 0, 0644, libgtk-directfb-2.0)
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 21:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 21:52 [ptxdist] a Robert Schwebel
2011-10-30 21:54 ` [ptxdist] a few version bumps Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 01/11] fbgrab: include zlib.h, fix linker dependencies Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 02/11] util-linux-ng: version bump 2.19.1 -> 2.20 Robert Schwebel
2011-11-03 14:21 ` Michael Olbrich
2011-10-30 21:56 ` [ptxdist] [PATCH 03/11] util-linux-ng: clean up package Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 04/11] xorg-server: fix patch documentation Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 05/11] " Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 06/11] " Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 07/11] xf86-video-fbdev: add fixme Robert Schwebel
2011-10-30 21:56 ` Robert Schwebel [this message]
2011-10-30 21:56 ` [ptxdist] [PATCH 09/11] host-autotools-autoconf: version bump 2.67 -> 2.68 Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 10/11] host-autotools-automake: version bump 1.11 -> 1.11.1 Robert Schwebel
2011-10-30 21:56 ` [ptxdist] [PATCH 11/11] host-autotools-libtool: version bump 2.2.6a -> 2.4.2 Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320011781-24886-8-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox