Move python module of vte into its own package.

SVN-Revision: 12595

diff --git a/XOrg/lib/vte/Makefile b/XOrg/lib/vte/Makefile
index 5726855fb9e22a61d18bf91bddbe2de961683a80..7df7e8865f5b33120306f96ecba9d5b31fe1fc98 100644 (file)
--- a/XOrg/lib/vte/Makefile
+++ b/XOrg/lib/vte/Makefile
@@ -1,3 +1,11 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vte
@@ -10,12 +18,18 @@ PKG_MD5SUM:=9df3e35b81b209952ac1cf7904f7b620
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+
+PKG_INSTALL=1
+
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
 
-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
 
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-               -L$(STAGING_DIR)/usr/lib/libintl/lib \
-               -L$(STAGING_DIR)/usr/lib/libiconv/lib
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_vte CONFIG_PACKAGE_python-vte)
 
 define Package/vte
   SECTION:=xorg-libs
@@ -23,46 +37,69 @@ define Package/vte
   SUBMENU:=libraries
   TITLE:=Virtual Terminal Widget
   URL:=http://developer.gnome.org/arch/gnome/widgets/vte.html
-  DEPENDS:=+python +gtk2
+  DEPENDS:=+gtk2
+endef
+
+define Package/python-vte
+  SECTION:=lang-python
+  CATEGORY:=Languages
+  SUBMENU:=python
+  TITLE:=Python bindings for vte
+  URL:=http://developer.gnome.org/arch/gnome/widgets/vte.html
+  DEPENDS:=python-core +python-gtk +vte
 endef
 
 define Package/vte/description
-VTE is a library (libvte) implementing a terminal emulator widget for GTK+,
-and a minimal sample application (vte) using that.  Vte is mainly used in
-gnome-terminal, but can also be used to embed a console/terminal in games,
-editors, IDEs, etc.
+  VTE is a library (libvte) implementing a terminal emulator widget for GTK+,
+  and a minimal sample application (vte) using that.  Vte is mainly used in
+  gnome-terminal, but can also be used to embed a console/terminal in games,
+  editors, IDEs, etc.
 endef
 
 define Build/Configure
-       $(call Build/Configure/Default,--without-xft2)
+       $(call Build/Configure/Default, \
+               --without-xft2 \
+               $(if PKG_CONFIG_python-vte,--enable-python,--disable-python) \
+       )
 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
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \
+               $(1)/usr/lib
 
-define Build/InstallDev 
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig
 endef
 
 define Package/vte/install
-       $(INSTALL_DIR) $(1)/usr/share/vte/termcap/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/vte/termcap/* $(1)/usr/share/vte/termcap/
-       $(INSTALL_DIR) $(1)/usr/lib/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/lib/vte/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/vte/* $(1)/usr/lib/vte/
-       $(INSTALL_DIR) $(1)/usr/lib/python2.5/site-packages/gtk-2.0/
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/python2.5/site-packages/gtk-2.0/*.{so*,a} \
-               $(1)/usr/lib/python2.5/site-packages/gtk-2.0/
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)/usr/share/vte/termcap
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/share/vte/termcap/* \
+               $(1)/usr/share/vte/termcap
+
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+               $(1)/usr/lib
+
+       $(INSTALL_DIR) $(1)/usr/lib/vte
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/lib/vte/* \
+               $(1)/usr/lib/vte
 endef
-       
+
+define Package/python-vte/install
+       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.{so*,a} \
+               $(1)$(PYTHON_PKG_DIR)/gtk-2.0
+endef
+
 $(eval $(call BuildPackage,vte))
+$(eval $(call BuildPackage,python-vte))