rename gtk1 and gtk2

SVN-Revision: 11567

diff --git a/XOrg/lib/gtk-1.2.10/Makefile b/XOrg/lib/gtk-1.2.10/Makefile
deleted file mode 100644 (file)
index 5c39ef4..0000000
--- a/XOrg/lib/gtk-1.2.10/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gtk-1.2.10
-PKG_VERSION:=1.2.10
-PKG_RELEASE:=1
-
-PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-       ftp://ftp.gtk.org/pub/gtk/v1.2/ \
-       http://gd.tuwien.ac.at/graphics/gimp/gtk/v1.2/
-PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-1.2.10
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_ARGS_XTRA+=--x-includes=$(STAGING_DIR)/usr/include/ \
-               --x-libraries=$(STAGING_DIR)/usr/lib \
-               --with-glib-prefix=$(STAGING_DIR)/usr/ \
-               --enable-static=yes \
-               --enable-static=yes
-
-EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
-EXTRA_LDFLAGS+=-lnotimpl -lglib -lgmodule
-
-define Package/gtk-1.2.10
-  SECTION:=xorg-framework
-  CATEGORY:=Xorg
-  SUBMENU:=framework
-  TITLE:=GTK+ 1.2.10 package
-  DEPENDS:=+glib1 +libX11 @DISPLAY_SUPPORT
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
-endef
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-       $(INSTALL_DIR) $(2)/bin
-       mv $(1)/usr/bin/gtk-config $(2)/bin/
-       $(SED) "s,libdirs=-L.*,libdirs=,g" $(2)/bin/gtk-config
-endef
-
-$(eval $(call BuildPackage,gtk-1.2.10))

diff --git a/XOrg/lib/gtk-2.10.14/Makefile b/XOrg/lib/gtk-2.10.14/Makefile
deleted file mode 100644 (file)
index 5e1e74d..0000000
--- a/XOrg/lib/gtk-2.10.14/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# 
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gtk2.10.14
-PKG_VERSION:=2.10.14
-PKG_RELEASE:=1
-
-PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/
-PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-2.10.14
-PKG_MD5SUM:=018d7dd0fa7de01cfdb77c7c55e7ba26
-
-include $(INCLUDE_DIR)/package.mk
-
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
-
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/
-
-define Package/gtk-2.10.14
-  SECTION:=xorg-framework
-  CATEGORY:=Xorg
-  SUBMENU:=framework
-  TITLE:=GTK+ 2.10.14 package
-  DEPENDS:=+cairo +pango +libjpeg +atk +libtiff +pixman @DISPLAY_SUPPORT
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
-endef
-
-define Build/InstallDev
-       $(INSTALL_DIR)  $(1)/usr/{lib/pkgconfig,include}
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*,so} $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/gtk-2.10.14/install
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gtk-2.10.14))
-$(eval $(call RequireCommand,gdk-pixbuf-csource, \
-       Please install gtk2.0-dev \
-))

diff --git a/XOrg/lib/gtk1/Makefile b/XOrg/lib/gtk1/Makefile
new file mode 100644 (file)
index 0000000..4fadb11
--- /dev/null
+++ b/XOrg/lib/gtk1/Makefile
@@ -0,0 +1,66 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# blogic@openwrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gtk1
+PKG_VERSION:=1.2.10
+PKG_RELEASE:=1
+
+PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:= \
+       ftp://ftp.gtk.org/pub/gtk/v1.2/ \
+       http://gd.tuwien.ac.at/graphics/gimp/gtk/v1.2/
+PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-1.2.10
+
+include $(INCLUDE_DIR)/package.mk
+
+CONFIGURE_ARGS_XTRA+=--x-includes=$(STAGING_DIR)/usr/include/ \
+               --x-libraries=$(STAGING_DIR)/usr/lib \
+               --with-glib-prefix=$(STAGING_DIR)/usr/ \
+               --enable-static=yes \
+               --enable-static=yes
+
+EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
+EXTRA_LDFLAGS+=-lnotimpl -lglib -lgmodule
+
+define Package/gtk1
+  SECTION:=xorg-framework
+  CATEGORY:=Xorg
+  SUBMENU:=framework
+  TITLE:=GTK+ 1.2.10 package
+  DEPENDS:=+glib1 +libX11 @DISPLAY_SUPPORT
+endef
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
+               if [ -x $(CONFIGURE_CMD) ]; then \
+                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
+                       $(CONFIGURE_VARS) \
+                       $(CONFIGURE_CMD) \
+                       $(CONFIGURE_ARGS_XTRA) \
+                       $(CONFIGURE_ARGS) ;\
+               fi \
+       )
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DIR) $(2)/bin
+       mv $(1)/usr/bin/gtk-config $(2)/bin/
+       $(SED) "s,libdirs=-L.*,libdirs=,g" $(2)/bin/gtk-config
+endef
+
+$(eval $(call BuildPackage,gtk1))

diff --git a/XOrg/lib/gtk2/Makefile b/XOrg/lib/gtk2/Makefile
new file mode 100644 (file)
index 0000000..a800957
--- /dev/null
+++ b/XOrg/lib/gtk2/Makefile
@@ -0,0 +1,53 @@
+# 
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gtk2
+PKG_VERSION:=2.10.14
+PKG_RELEASE:=1
+
+PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/
+PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-2.10.14
+PKG_MD5SUM:=018d7dd0fa7de01cfdb77c7c55e7ba26
+
+include $(INCLUDE_DIR)/package.mk
+
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
+
+EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/
+
+define Package/gtk2
+  SECTION:=xorg-framework
+  CATEGORY:=Xorg
+  SUBMENU:=framework
+  TITLE:=GTK+ 2.10.14 package
+  DEPENDS:=+cairo +pango +libjpeg +atk +libtiff +pixman @DISPLAY_SUPPORT
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR)  $(1)/usr/{lib/pkgconfig,include}
+       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*,so} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/gtk2/install
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,gtk2))
+$(eval $(call RequireCommand,gdk-pixbuf-csource, \
+       Please install gtk2.0-dev \
+))