git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5328 33e552b5-05e3-0310-8538-816dae2090ed

9 files changed, 387 insertions, 363 deletions

diff --git a/rules/atk.in b/rules/atk.in
index 59411ae0a..1ef223445 100644
--- a/rules/atk.in
+++ b/rules/atk.in
@@ -1,6 +1,7 @@
 config ATK
 	bool
 	prompt "atk"
+	select GLIB
 	help
 	  ATK is a toolkit providing accessibility interfaces 
 	  for applications or other toolkits. By implementing 
diff --git a/rules/glib28.in b/rules/glib.in
index 4af97a0af..289e4903b 100644
--- a/rules/glib28.in
+++ b/rules/glib.in
@@ -1,6 +1,6 @@
-config GLIB28
+config GLIB
 	bool
-	prompt "glib-2.8.x"
+	prompt "glib"
 	help
 	  GLib is a library containing many useful C 
 	  routines for things such as trees, hashes, 
diff --git a/rules/glib.make b/rules/glib.make
new file mode 100644
index 000000000..7581cb622
--- /dev/null
+++ b/rules/glib.make
@@ -0,0 +1,159 @@
+# -*-makefile-*-
+# $Id: template 5041 2006-03-09 08:45:49Z mkl $
+#
+# Copyright (C) 2006 by Robert Schwebel <r.schwebel@pengutronix.de>
+#                       Pengutronix <info@pengutronix.de>, Germany
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_GLIB) += glib
+
+#
+# Paths and names
+#
+GLIB_VERSION := 2.8.6
+GLIB         := glib-$(GLIB_VERSION)
+GLIB_SUFFIX  := tar.bz2
+GLIB_URL     := ftp://ftp.gtk.org/pub/gtk/v2.8/$(GLIB).$(GLIB_SUFFIX)
+GLIB_SOURCE  := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
+GLIB_DIR     := $(BUILDDIR)/$(GLIB)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+glib_get: $(STATEDIR)/glib.get
+
+$(STATEDIR)/glib.get: $(glib_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(GLIB_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(GLIB_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+glib_extract: $(STATEDIR)/glib.extract
+
+$(STATEDIR)/glib.extract: $(glib_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(GLIB_DIR))
+	@$(call extract, $(GLIB_SOURCE))
+	@$(call patchin, $(GLIB))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+glib_prepare: $(STATEDIR)/glib.prepare
+
+GLIB_PATH	:= PATH=$(CROSS_PATH)
+GLIB_ENV 	:= \
+	$(CROSS_ENV) \
+	glib_cv_stack_grows=no
+
+#FIXME
+#ifdef $(PTXCONF_GLIBC_DL)
+#GLIB_ENV	+= glib_cv_uscore=yes
+#else
+GLIB_ENV	+= glib_cv_uscore=no
+#endif
+
+#
+# autoconf
+#
+GLIB_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/glib.prepare: $(glib_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(GLIB_DIR)/config.cache)
+	cd $(GLIB_DIR) && \
+		$(GLIB_PATH) $(GLIB_ENV) \
+		./configure $(GLIB_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+glib_compile: $(STATEDIR)/glib.compile
+
+$(STATEDIR)/glib.compile: $(glib_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(GLIB_DIR) && $(GLIB_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+glib_install: $(STATEDIR)/glib.install
+
+$(STATEDIR)/glib.install: $(glib_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, GLIB)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+glib_targetinstall: $(STATEDIR)/glib.targetinstall
+
+$(STATEDIR)/glib.targetinstall: $(glib_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, glib)
+	@$(call install_fixup,glib,PACKAGE,glib)
+	@$(call install_fixup,glib,PRIORITY,optional)
+	@$(call install_fixup,glib,VERSION,$(GLIB_VERSION))
+	@$(call install_fixup,glib,SECTION,base)
+	@$(call install_fixup,glib,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,glib,DEPENDS,)
+	@$(call install_fixup,glib,DESCRIPTION,missing)
+
+ifdef PTXCONF_GTK_28
+	@$(call install_copy, glib, 0, 0, 0644, $(GLIB_DIR)/glib/.libs/libglib-2.0.so.0.800.6, /usr/lib/libglib-2.0.so.0.800.6)
+	@$(call install_link, glib, libglib-2.0.so.0.800.6, /usr/lib/libglib-2.0.so.0)
+	@$(call install_link, glib, libglib-2.0.so.0.800.6, /usr/lib/libglib-2.0.so)
+
+	@$(call install_copy, glib, 0, 0, 0644, $(GLIB_DIR)/gobject/.libs/libgobject-2.0.so.0.800.6, /usr/lib/libgobject-2.0.so.0.800.6)
+	@$(call install_link, glib, libgobject-2.0.so.0.800.6, /usr/lib/libgobject-2.0.so.0)
+	@$(call install_link, glib, libgobject-2.0.so.0.800.6, /usr/lib/libgobject-2.0.so)
+
+	@$(call install_copy, glib, 0, 0, 0644, $(GLIB_DIR)/gmodule/.libs/libgmodule-2.0.so.0.800.6, /usr/lib/libgmodule-2.0.so.0.800.6)
+	@$(call install_link, glib, libgmodule-2.0.so.0.800.6, /usr/lib/libgmodule-2.0.so.0)
+	@$(call install_link, glib, libgmodule-2.0.so.0.800.6, /usr/lib/libgmodule-2.0.so)
+
+	@$(call install_copy, glib, 0, 0, 0644, $(GLIB_DIR)/gthread/.libs/libgthread-2.0.so.0.800.6, /usr/lib/libgthread-2.0.so.0.800.6)
+	@$(call install_link, glib, libgthread-2.0.so.0.800.6, /usr/lib/libgthread-2.0.so.0)
+	@$(call install_link, glib, libgthread-2.0.so.0.800.6, /usr/lib/libgthread-2.0.so)
+endif
+
+	@$(call install_finish,glib)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+glib_clean:
+	rm -rf $(STATEDIR)/glib.*
+	rm -rf $(IMAGEDIR)/glib_*
+	rm -rf $(GLIB_DIR)
+
+# vim: syntax=make
diff --git a/rules/glib28.make b/rules/glib28.make
deleted file mode 100644
index eeb38428f..000000000
--- a/rules/glib28.make
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*-makefile-*-
-# $Id: template 5041 2006-03-09 08:45:49Z mkl $
-#
-# Copyright (C) 2006 by Robert Schwebel <r.schwebel@pengutronix.de>
-#                       Pengutronix <info@pengutronix.de>, Germany
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_GLIB28) += glib28
-
-#
-# Paths and names
-#
-GLIB28_VERSION	:= 2.8.6
-GLIB28		:= glib-$(GLIB28_VERSION)
-GLIB28_SUFFIX	:= tar.bz2
-GLIB28_URL	:= ftp://ftp.gtk.org/pub/gtk/v2.8/$(GLIB28).$(GLIB28_SUFFIX)
-GLIB28_SOURCE	:= $(SRCDIR)/$(GLIB28).$(GLIB28_SUFFIX)
-GLIB28_DIR	:= $(BUILDDIR)/$(GLIB28)
-
--include $(call package_depfile)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-glib28_get: $(STATEDIR)/glib28.get
-
-$(STATEDIR)/glib28.get: $(glib28_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(GLIB28_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(GLIB28_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-glib28_extract: $(STATEDIR)/glib28.extract
-
-$(STATEDIR)/glib28.extract: $(glib28_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GLIB28_DIR))
-	@$(call extract, $(GLIB28_SOURCE))
-	@$(call patchin, $(GLIB28))
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-glib28_prepare: $(STATEDIR)/glib28.prepare
-
-GLIB28_PATH	:= PATH=$(CROSS_PATH)
-GLIB28_ENV 	:= \
-	$(CROSS_ENV) \
-	glib_cv_stack_grows=no
-
-#FIXME
-#ifdef $(PTXCONF_GLIBC_DL)
-#GLIB28_ENV	+= glib_cv_uscore=yes
-#else
-GLIB28_ENV	+= glib_cv_uscore=no
-#endif
-
-#
-# autoconf
-#
-GLIB28_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-$(STATEDIR)/glib28.prepare: $(glib28_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GLIB28_DIR)/config.cache)
-	cd $(GLIB28_DIR) && \
-		$(GLIB28_PATH) $(GLIB28_ENV) \
-		./configure $(GLIB28_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-glib28_compile: $(STATEDIR)/glib28.compile
-
-$(STATEDIR)/glib28.compile: $(glib28_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(GLIB28_DIR) && $(GLIB28_PATH) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-glib28_install: $(STATEDIR)/glib28.install
-
-$(STATEDIR)/glib28.install: $(glib28_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, GLIB28)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-glib28_targetinstall: $(STATEDIR)/glib28.targetinstall
-
-$(STATEDIR)/glib28.targetinstall: $(glib28_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-
-	@$(call install_init, glib28)
-	@$(call install_fixup,glib28,PACKAGE,glib28)
-	@$(call install_fixup,glib28,PRIORITY,optional)
-	@$(call install_fixup,glib28,VERSION,$(GLIB28_VERSION))
-	@$(call install_fixup,glib28,SECTION,base)
-	@$(call install_fixup,glib28,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,glib28,DEPENDS,)
-	@$(call install_fixup,glib28,DESCRIPTION,missing)
-
-	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/glib/.libs/libglib-2.0.so.0.800.6, /usr/lib/libglib-2.0.so.0.800.6)
-	@$(call install_link, glib28, libglib-2.0.so.0.800.6, /usr/lib/libglib-2.0.so.0)
-	@$(call install_link, glib28, libglib-2.0.so.0.800.6, /usr/lib/libglib-2.0.so)
-
-	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/gobject/.libs/libgobject-2.0.so.0.800.6, /usr/lib/libgobject-2.0.so.0.800.6)
-	@$(call install_link, glib28, libgobject-2.0.so.0.800.6, /usr/lib/libgobject-2.0.so.0)
-	@$(call install_link, glib28, libgobject-2.0.so.0.800.6, /usr/lib/libgobject-2.0.so)
-
-	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/gmodule/.libs/libgmodule-2.0.so.0.800.6, /usr/lib/libgmodule-2.0.so.0.800.6)
-	@$(call install_link, glib28, libgmodule-2.0.so.0.800.6, /usr/lib/libgmodule-2.0.so.0)
-	@$(call install_link, glib28, libgmodule-2.0.so.0.800.6, /usr/lib/libgmodule-2.0.so)
-
-	@$(call install_copy, glib28, 0, 0, 0644, $(GLIB28_DIR)/gthread/.libs/libgthread-2.0.so.0.800.6, /usr/lib/libgthread-2.0.so.0.800.6)
-	@$(call install_link, glib28, libgthread-2.0.so.0.800.6, /usr/lib/libgthread-2.0.so.0)
-	@$(call install_link, glib28, libgthread-2.0.so.0.800.6, /usr/lib/libgthread-2.0.so)
-
-	@$(call install_finish,glib28)
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-glib28_clean:
-	rm -rf $(STATEDIR)/glib28.*
-	rm -rf $(IMAGEDIR)/glib28_*
-	rm -rf $(GLIB28_DIR)
-
-# vim: syntax=make
diff --git a/rules/gtk-menu.in b/rules/gtk-menu.in
index d72d354cd..05b66c8ef 100644
--- a/rules/gtk-menu.in
+++ b/rules/gtk-menu.in
@@ -1,7 +1,7 @@
 menu "GTK+ and friends            "
 
-source "rules/gtk28.in"
-source "rules/glib28.in"
+source "rules/gtk.in"
+source "rules/glib.in"
 source "rules/atk.in"
 source "rules/pango.in"
 source "rules/cairo.in"
diff --git a/rules/gtk.in b/rules/gtk.in
new file mode 100644
index 000000000..79ca266e8
--- /dev/null
+++ b/rules/gtk.in
@@ -0,0 +1,72 @@
+menuconfig GTK
+	bool
+	prompt "gtk+"
+	select GLIB
+	select ATK
+	select PANGO
+#	select LIBTIFF if GTK_LIBTIFF
+	select LIBPNG if GTK_LIBPNG
+	select LIBJPEG if GTK_LIBJPG
+	select XORG_LIB_XEXT if GTK_TARGET_X11
+	select XORG_LIB_XINERAMA if GTK_TARGET_X11_XINERAMA
+	select XORG_LIB_XRANDR if GTK_TARGET_X11_XRANDR
+	help	
+	The GTK+ is a multi-platform toolkit for creating graphical
+	user interfaces. Offering a complete set of widgets, the GTK+
+	is suitable for projects ranging from small one-off tools to complete
+	application suites.
+
+choice
+	prompt "gtk+ version"
+	depends on GTK
+	default GTK_28
+
+config GTK_28
+	bool
+	prompt "2.8.x"
+
+endchoice
+
+
+config GTK_LIBTIFF
+	bool
+	prompt "TIFF loader for gdk-pixbuf"
+	depends on GTK
+	default y
+
+config GTK_LIBJPEG
+	bool
+	prompt "JPEG loader for gdk-pixbuf"
+	depends on GTK
+	default y
+
+config GTK_LIBPNG
+	bool
+	prompt "PNG loader for gdk-pixbuf"
+	depends on GTK
+	default y
+
+
+choice
+	prompt "gdk-target"
+	depends on GTK
+
+config GTK_TARGET_X11
+	bool
+	prompt "gdk-target X11"
+	depends on GTK
+	select CAIRO_XLIB
+endchoice
+
+config GTK_TARGET_X11_XINERAMA
+	bool
+	prompt "Xinerama support"
+	depends on GTK
+	depends on GTK_TARGET_X11
+
+config GTK_TARGET_X11_XRANDR
+	bool
+	prompt "Xrandr support"
+	depends on GTK
+	depends on GTK_TARGET_X11
+
diff --git a/rules/gtk.make b/rules/gtk.make
new file mode 100644
index 000000000..213d59f6f
--- /dev/null
+++ b/rules/gtk.make
@@ -0,0 +1,151 @@
+# -*-makefile-*-
+# $Id: template 5041 2006-03-09 08:45:49Z mkl $
+#
+# Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de>
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_GTK) += gtk
+
+#
+# Paths and names
+#
+GTK_VERSION	:= 2.8.16
+GTK		:= gtk+-$(GTK_VERSION)
+GTK_SUFFIX	:= tar.bz2
+GTK_URL		:= ftp://ftp.gtk.org/pub/gtk/v2.8/$(GTK).$(GTK_SUFFIX)
+GTK_SOURCE	:= $(SRCDIR)/$(GTK).$(GTK_SUFFIX)
+GTK_DIR		:= $(BUILDDIR)/$(GTK)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+gtk_get: $(STATEDIR)/gtk.get
+
+$(STATEDIR)/gtk.get: $(gtk_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(GTK_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(GTK_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+gtk_extract: $(STATEDIR)/gtk.extract
+
+$(STATEDIR)/gtk.extract: $(gtk_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(GTK_DIR))
+	@$(call extract, $(GTK_SOURCE))
+	@$(call patchin, $(GTK))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+gtk_prepare: $(STATEDIR)/gtk.prepare
+
+GTK_PATH	:= PATH=$(CROSS_PATH)
+GTK_ENV 	:= $(CROSS_ENV)
+
+#
+# autoconf
+#
+GTK_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--enable-explicit-deps=yes
+
+ifndef PTXCONF_GTK_LIBPNG
+GTK_AUTOCONF += --without-libpng
+endif
+
+ifndef PTXCONF_GTK_LIBTIFF
+GTK_AUTOCONF += --without-libtiff
+endif
+
+ifndef PTXCONF_GTK_LIBJPEG
+GTK_AUTOCONF += --without-libjpeg
+endif
+
+ifdef PTXCONF_GTK_TARGET_X11
+GTK_AUTOCONF += --with-gdktarget=x11
+endif
+
+$(STATEDIR)/gtk.prepare: $(gtk_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(GTK_DIR)/config.cache)
+	cd $(GTK_DIR) && \
+		$(GTK_PATH) $(GTK_ENV) \
+		./configure $(GTK_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+gtk_compile: $(STATEDIR)/gtk.compile
+
+$(STATEDIR)/gtk.compile: $(gtk_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(GTK_DIR) && $(GTK_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+gtk_install: $(STATEDIR)/gtk.install
+
+$(STATEDIR)/gtk.install: $(gtk_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, GTK)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+gtk_targetinstall: $(STATEDIR)/gtk.targetinstall
+
+$(STATEDIR)/gtk.targetinstall: $(gtk_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, gtk)
+	@$(call install_fixup,gtk,PACKAGE,gtk)
+	@$(call install_fixup,gtk,PRIORITY,optional)
+	@$(call install_fixup,gtk,VERSION,$(GTK_VERSION))
+	@$(call install_fixup,gtk,SECTION,base)
+	@$(call install_fixup,gtk,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,gtk,DEPENDS,)
+	@$(call install_fixup,gtk,DESCRIPTION,missing)
+
+	@$(call install_copy, gtk, 0, 0, 0755, $(GTK_DIR)/foobar, /dev/null)
+
+	@$(call install_finish,gtk)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+gtk_clean:
+	rm -rf $(STATEDIR)/gtk.*
+	rm -rf $(IMAGEDIR)/gtk_*
+	rm -rf $(GTK_DIR)
+
+# vim: syntax=make
diff --git a/rules/gtk28.in b/rules/gtk28.in
deleted file mode 100644
index 3792b5452..000000000
--- a/rules/gtk28.in
+++ /dev/null
@@ -1,51 +0,0 @@
-menuconfig GTK28
-	bool
-	prompt "gtk+-2.8.x"
-	select GLIB28
-	select ATK
-	select PANGO
-#	select LIBTIFF if GTK28_LIBTIFF
-	select LIBPNG if GTK28_LIBPNG
-	select LIBJPEG if GTK28_LIBJPG
-	select XORG_LIB_XEXT if GTK28_TARGET_X11
-	select XORG_LIB_XINERAMA if GTK28_TARGET_X11_XINERAMA
-	select XORG_LIB_XRANDR if GTK28_TARGET_X11_XRANDR
-	help	
-	The GTK+ is a multi-platform toolkit for creating graphical
-	user interfaces. Offering a complete set of widgets, the GTK+
-	is suitable for projects ranging from small one-off tools to complete
-	application suites.
-
-config GTK28_LIBTIFF
-	bool
-	prompt "TIFF loader for gdk-pixbuf"
-	depends on GTK28
-	default y
-
-config GTK28_LIBJPEG
-	bool
-	prompt "JPEG loader for gdk-pixbuf"
-	depends on GTK28
-	default y
-
-config GTK28_LIBPNG
-	bool
-	prompt "PNG loader for gdk-pixbuf"
-	depends on GTK28
-	default y
-
-menuconfig GTK28_TARGET_X11
-	bool
-	default y
-	prompt "gdk-target X11"
-	depends on GTK28
-
-config GTK28_TARGET_X11_XINERAMA
-	bool
-	prompt "Xinerama support"
-	depends on GTK28_TARGET_X11
-
-config GTK28_TARGET_X11_XRANDR
-	bool
-	prompt "Xrandr support"
-	depends on GTK28_TARGET_X11
diff --git a/rules/gtk28.make b/rules/gtk28.make
deleted file mode 100644
index 33cc75d8d..000000000
--- a/rules/gtk28.make
+++ /dev/null
@@ -1,151 +0,0 @@
-# -*-makefile-*-
-# $Id: template 5041 2006-03-09 08:45:49Z mkl $
-#
-# Copyright (C) 2006 by Marc Kleine-Budde <mkl@pengutronix.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_GTK28) += gtk28
-
-#
-# Paths and names
-#
-GTK28_VERSION	:= 2.8.16
-GTK28		:= gtk+-$(GTK28_VERSION)
-GTK28_SUFFIX	:= tar.bz2
-GTK28_URL	:= ftp://ftp.gtk.org/pub/gtk/v2.8/$(GTK28).$(GTK28_SUFFIX)
-GTK28_SOURCE	:= $(SRCDIR)/$(GTK28).$(GTK28_SUFFIX)
-GTK28_DIR	:= $(BUILDDIR)/$(GTK28)
-
--include $(call package_depfile)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-gtk28_get: $(STATEDIR)/gtk28.get
-
-$(STATEDIR)/gtk28.get: $(gtk28_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(GTK28_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(GTK28_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-gtk28_extract: $(STATEDIR)/gtk28.extract
-
-$(STATEDIR)/gtk28.extract: $(gtk28_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GTK28_DIR))
-	@$(call extract, $(GTK28_SOURCE))
-	@$(call patchin, $(GTK28))
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-gtk28_prepare: $(STATEDIR)/gtk28.prepare
-
-GTK28_PATH	:= PATH=$(CROSS_PATH)
-GTK28_ENV 	:= $(CROSS_ENV)
-
-#
-# autoconf
-#
-GTK28_AUTOCONF := \
-	$(CROSS_AUTOCONF_USR) \
-	--enable-explicit-deps=yes
-
-ifndef PTXCONF_GTK28_LIBPNG
-GTK28_AUTOCONF += --without-libpng
-endif
-
-ifndef PTXCONF_GTK28_LIBTIFF
-GTK28_AUTOCONF += --without-libtiff
-endif
-
-ifndef PTXCONF_GTK28_LIBJPEG
-GTK28_AUTOCONF += --without-libjpeg
-endif
-
-ifdef PTXCONF_GTK28_TARGET_X11
-GTK28_AUTOCONF += --with-gdktarget=x11
-endif
-
-$(STATEDIR)/gtk28.prepare: $(gtk28_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GTK28_DIR)/config.cache)
-	cd $(GTK28_DIR) && \
-		$(GTK28_PATH) $(GTK28_ENV) \
-		./configure $(GTK28_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-gtk28_compile: $(STATEDIR)/gtk28.compile
-
-$(STATEDIR)/gtk28.compile: $(gtk28_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(GTK28_DIR) && $(GTK28_PATH) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-gtk28_install: $(STATEDIR)/gtk28.install
-
-$(STATEDIR)/gtk28.install: $(gtk28_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, GTK28)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-gtk28_targetinstall: $(STATEDIR)/gtk28.targetinstall
-
-$(STATEDIR)/gtk28.targetinstall: $(gtk28_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-
-	@$(call install_init, gtk28)
-	@$(call install_fixup,gtk28,PACKAGE,gtk28)
-	@$(call install_fixup,gtk28,PRIORITY,optional)
-	@$(call install_fixup,gtk28,VERSION,$(GTK28_VERSION))
-	@$(call install_fixup,gtk28,SECTION,base)
-	@$(call install_fixup,gtk28,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup,gtk28,DEPENDS,)
-	@$(call install_fixup,gtk28,DESCRIPTION,missing)
-
-	@$(call install_copy, gtk28, 0, 0, 0755, $(GTK28_DIR)/foobar, /dev/null)
-
-	@$(call install_finish,gtk28)
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-gtk28_clean:
-	rm -rf $(STATEDIR)/gtk28.*
-	rm -rf $(IMAGEDIR)/gtk28_*
-	rm -rf $(GTK28_DIR)
-
-# vim: syntax=make