[packages] Use include_mk

[openwrt/svn-archive/archive.git] / lang / twisted / Makefile

diff --git a/lang/twisted/Makefile b/lang/twisted/Makefile
index f5401283ef0460b2945238ae36f71f2dc5a87a75..418777354c22810c67b1ab55c5bb30336031719f 100644 (file)
--- a/lang/twisted/Makefile
+++ b/lang/twisted/Makefile
@@ -1,10 +1,9 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-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
 
@@ -17,79 +16,82 @@ PKG_SOURCE_URL:=http://tmrc.mit.edu/mirror/twisted/Twisted/2.5
 PKG_MD5SUM:=56df2ae66db57932515a491c03bf514f
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/Twisted-$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
-include ../python/python-package.mk
+$(call include_mk, python-package.mk)
 
-define PyPackage/twisted/default
- URL:=http://twistedmatrix.com/
+define Package/twisted/default
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  URL:=http://twistedmatrix.com/
+  DEPENDS:=+python-mini
 endef
 
-define PyPackage/twisted/default/description
+define Package/twisted/default/description
  Twisted is a networking engine written in Python, supporting numerous 
  protocols. It contains a web server, numerous chat clients, chat servers, 
  mail servers, and more.
 endef
 
-define PyPackage/twisted
-$(call PyPackage/twisted/default)
- MENU:=1
- TITLE:=Python networking engine
- DEPENDS+= +zope-interface
+define Package/twisted
+$(call Package/twisted/default)
+  TITLE:=Python networking engine
+  DEPENDS+= +zope-interface
 endef
 
-define PyPackage/twisted-conch
-$(call PyPackage/twisted/default)
+define Package/twisted-conch
+$(call Package/twisted/default)
   TITLE:=Twisted - Conch
   DEPENDS+= twisted
 endef
 
-define PyPackage/twisted-lore
-$(call PyPackage/twisted/default)
+define Package/twisted-lore
+$(call Package/twisted/default)
   TITLE:=Twisted - Lore
   DEPENDS+= twisted
 endef
 
-define PyPackage/twisted-mail
-$(call PyPackage/twisted/default)
+define Package/twisted-mail
+$(call Package/twisted/default)
   TITLE:=Twisted - Mail
   DEPENDS+= twisted
 endef
 
-define PyPackage/twisted-names
-$(call PyPackage/twisted/default)
+define Package/twisted-names
+$(call Package/twisted/default)
   TITLE:=Twisted - Names
   DEPENDS+= twisted
 endef
 
-define PyPackage/twisted-news
-$(call PyPackage/twisted/default)
+define Package/twisted-news
+$(call Package/twisted/default)
   TITLE:=Twisted - News
   DEPENDS+= twisted
 endef
 
-define PyPackage/twisted-runner
-$(call PyPackage/twisted/default)
+define Package/twisted-runner
+$(call Package/twisted/default)
   TITLE:=Twisted - Runner
   DEPENDS+= twisted
 endef
 
-define PyPackage/twisted-web
-$(call PyPackage/twisted/default)
+define Package/twisted-web
+$(call Package/twisted/default)
   TITLE:=Twisted - Web
   DEPENDS+= twisted
 endef
 
-define PyPackage/twisted-words
-$(call PyPackage/twisted/default)
+define Package/twisted-words
+$(call Package/twisted/default)
   TITLE:=Twisted - Words
   DEPENDS+= twisted
 endef
 
-define PyPackage/zope-interface
-$(call PyPackage/twisted/default)
+define Package/zope-interface
+$(call Package/twisted/default)
   TITLE:=Zope interface
-  DESCRIPTION:=zope-interface
 endef
 
 TWISTED_SUPPROJECTS:=core
@@ -212,6 +214,7 @@ define PyPackage/zope-interface/filespec
 endef
 
 define Build/Compile
+       $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
        $(call Build/Compile/PyMod,., \
                install --prefix="$(PKG_INSTALL_DIR)/usr" --no-compile, \
                TWISTED_SUBPROJECTS="$(TWISTED_SUBPROJECTS)" \
@@ -232,3 +235,14 @@ $(eval $(call PyPackage,twisted-runner))
 $(eval $(call PyPackage,twisted-web))
 $(eval $(call PyPackage,twisted-words))
 $(eval $(call PyPackage,zope-interface))
+
+$(eval $(call BuildPackage,twisted))
+$(eval $(call BuildPackage,twisted-conch))
+$(eval $(call BuildPackage,twisted-lore))
+$(eval $(call BuildPackage,twisted-mail))
+$(eval $(call BuildPackage,twisted-names))
+$(eval $(call BuildPackage,twisted-news))
+$(eval $(call BuildPackage,twisted-runner))
+$(eval $(call BuildPackage,twisted-web))
+$(eval $(call BuildPackage,twisted-words))
+$(eval $(call BuildPackage,zope-interface))