Signed-off-by: Robert Schwebel <[email protected]>
---
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
<[email protected]>")
@$(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
[email protected]
