[packages] Use include_mk
authorLars-Peter Clausen <lars@metafoo.de>
Wed, 24 Feb 2010 23:13:32 +0000 (23:13 +0000)
committerLars-Peter Clausen <lars@metafoo.de>
Wed, 24 Feb 2010 23:13:32 +0000 (23:13 +0000)
SVN-Revision: 19848

40 files changed:
Xorg/lib/hippo-canvas/Makefile
Xorg/lib/vte/Makefile
Xorg/lib/xcbproto/Makefile
Xorg/xorg/driver/xf86-input-evdev/Makefile
Xorg/xorg/driver/xf86-input-keyboard/Makefile
Xorg/xorg/driver/xf86-input-mouse/Makefile
Xorg/xorg/driver/xf86-video-ati/Makefile
Xorg/xorg/driver/xf86-video-fbdev/Makefile
Xorg/xorg/driver/xf86-video-geode/Makefile
Xorg/xorg/driver/xf86-video-intel/Makefile
Xorg/xorg/driver/xf86-video-nv/Makefile
Xorg/xorg/driver/xf86-video-vesa/Makefile
lang/cython/Makefile
lang/egenix-mx/Makefile
lang/gst-python/Makefile
lang/kid/Makefile
lang/logilab-astng/Makefile
lang/logilab-common/Makefile
lang/numpy/Makefile
lang/psycopg/Makefile
lang/pybluez/Makefile
lang/pycairo/Makefile
lang/pyevent/Makefile
lang/pygobject/Makefile
lang/pygtk/Makefile
lang/pymysql/Makefile
lang/pypcap/Makefile
lang/pyserial/Makefile
lang/pysqlite/Makefile
lang/python-crypto/Makefile
lang/python-dbus/Makefile
lang/python-gnome-desktop2/Makefile
lang/pyyaml/Makefile
lang/telepathy-python/Makefile
lang/twisted/Makefile
lang/xapian-bindings/Makefile
lang/yapsnmp/Makefile
net/mercurial/Makefile
utils/rdiff-backup/Makefile
utils/rrdtool/Makefile

index 2f7a177..566c52a 100644 (file)
@@ -17,7 +17,7 @@ PKG_MD5SUM:=9a0f64eb0258a3e8ba710eff9798a7d0
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 PKG_INSTALL:=1
 
index 2dd34e8..8d94923 100644 (file)
@@ -19,7 +19,7 @@ PKG_FIXUP:=libtool
 PKG_BUILD_DEPENDS:=intltool/host
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 PKG_INSTALL=1
 
index c4bd27e..4bf154f 100644 (file)
@@ -19,7 +19,7 @@ PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=PACKAGE_python:python PACKAGE_python-mini:python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,PACKAGE_python PACKAGE_python-mini)
 
index ba982a7..99cd18c 100644 (file)
@@ -22,7 +22,7 @@ PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=randrproto inputproto xproto
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-input-evdev
   SECTION:=xorg-driver
index 4a85aec..39110ff 100644 (file)
@@ -21,7 +21,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-input-keyboard
   SECTION:=xorg-driver
index 61aeeef..76b0110 100644 (file)
@@ -21,7 +21,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-input-mouse
   SECTION:=xorg-driver
index df7070e..7b3f272 100644 (file)
@@ -18,7 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/
 PKG_MD5SUM:=e662348f6f957fcedf52818d668ab9f5
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-video-ati
   SECTION:=xorg-driver
index cfca39f..3b68ad5 100644 (file)
@@ -20,7 +20,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-video-fbdev
   SECTION:=xorg-driver
index c5a383f..b53ed85 100644 (file)
@@ -23,7 +23,7 @@ PKG_INSTALL:=1
 
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-video-geode
   SECTION:=xorg-driver
index 6d8401d..f1c7110 100644 (file)
@@ -20,7 +20,7 @@ PKG_BUILD_DEPENDS:=xf86driproto glproto
 PKG_MD5SUM:=8951d0366c16991badb7f9050556f4f3
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-video-intel
   SECTION:=xorg-driver
index bafd200..11bff5f 100644 (file)
@@ -18,7 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/
 PKG_MD5SUM:=1b22188bd9012a148206940708b52ea6
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 define Package/xf86-video-nv
   SECTION:=xorg-driver
index 7330fcb..d48860d 100644 (file)
@@ -20,7 +20,7 @@ PKG_BUILD_DEPENDS:=xproto fontsproto randrproto renderproto xextproto
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/xorg-driver.mk)
+$(call include_mk, xorg-driver.mk)
 
 
 define Package/xf86-video-vesa
index e95cc30..0e02fdf 100644 (file)
@@ -19,7 +19,7 @@ PKG_MD5SUM:=684103ed37472d9beef3a38e0d5c431d
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/cython
   SUBMENU:=Python
index fbc7999..301dc0b 100644 (file)
@@ -19,7 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-base-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-egenix-mx
   SUBMENU:=Python
index 9aefb46..9d246d9 100644 (file)
@@ -17,7 +17,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 
 TARGET_CFLAGS += $(FPIC) \
index 3ac7133..252c6f1 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=31e7156698a6f214b4067afb9e13728f
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-kid
   SUBMENU:=Python
index 483447f..c25a36c 100644 (file)
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=ftp://ftp.logilab.fr/pub/astng/
 PKG_MD5SUM:=a654d65a4644fb984d840906cf8b27d5
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/logilab-astng
   SUBMENU:=Python
index cc460f8..94b2671 100644 (file)
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=ftp://ftp.logilab.fr/pub/common/
 PKG_MD5SUM:=90f679e0d4ed19e2bf083fb932cde922
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/logilab-common
   SUBMENU:=Python
index 1b2915e..e9985cc 100644 (file)
@@ -15,7 +15,7 @@ PKG_SOURCE_URL:=@SF/numpy
 PKG_MD5SUM:=8f011e9d7697da570efaac61c51725e0
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/numpy
   SUBMENU:=Python
index 76166f3..4cb6051 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=a31f79f68d6d32898d6f24e11369a106
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-psycopg
   SUBMENU:=Python
index 7918f4b..1834386 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=eb38d423b49255a7b9f5ba1f50844b53
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-bluez
   SUBMENU:=Python
index adc73de..56a378a 100644 (file)
@@ -17,7 +17,7 @@ PKG_MD5SUM:=847f5377c32228a656819f5bd18eb6b4
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 PKG_INSTALL=1
 
index 271b19d..26cadf2 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=584912c92d08bf005283fb29a47a6e4d
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-event
   SUBMENU:=Python
index 202067b..7114325 100644 (file)
@@ -18,7 +18,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 EXTRA_LDFLAGS+= \
        -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
index 1b1b108..70b68b9 100644 (file)
@@ -17,7 +17,7 @@ PKG_MD5SUM:=a816346d750d61e3fa67a200e4292694
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 TARGET_CFLAGS+= \
        -I$(STAGING_DIR)/usr/lib/libintl/include/ \
index 9555825..9a54f26 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=532268f02870bea18c1d465e88afff30
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-mysql
   SUBMENU:=Python
index bbf1fc8..ecc0df5 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=034c3cbbfa81aa19e8f685b767c65764
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-pcap
   SUBMENU:=Python
index d6a7e45..dceb461 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=eec19df59fd75ba5a136992897f8e468
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/pyserial
   SUBMENU:=Python
index 4603b11..1c77bbc 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=b4a185e936848370fcc1a5b17755b641
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-sqlite
  SUBMENU:=Python
index a5584c3..8225cc1 100644 (file)
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://www.amk.ca/files/python/crypto/
 PKG_MD5SUM:=4d5674f3898a573691ffb335e8d749cd
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-crypto
        SECTION:=lang-python
index 7cbc018..94d8fb3 100644 (file)
@@ -19,7 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 
 TARGET_CFLAGS += \
index 63b2f16..addb409 100644 (file)
@@ -16,7 +16,7 @@ PKG_MD5SUM:=504877a973f6abc0788283232cd703cb
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 PKG_INSTALL=1
 
index 857fe67..02103f1 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=a4163a2017fa57f448c66815511fa555
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/pyyaml
   SUBMENU:=Python
index 6a7a174..436ea67 100644 (file)
@@ -15,7 +15,7 @@ PKG_SOURCE_URL:=http://telepathy.freedesktop.org/releases/telepathy-python/
 PKG_MD5SUM:=594a66a70764052e30df9428b5be52b2
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/telepathy-python
   SUBMENU:=Python
index bd73959..4187773 100644 (file)
@@ -19,7 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Twisted-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/twisted/default
   SUBMENU:=Python
index 0139e1d..e22ac53 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=a80e51f4971d7505abcc0bdde912266b
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 PKG_INSTALL=1
 
index 524b7fe..12317ce 100644 (file)
@@ -20,7 +20,7 @@ PKG_BUILD_DEPENDS:=python
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-yapsnmp
   SUBMENU:=Python
index 86d7b6e..b1bd42d 100644 (file)
@@ -17,7 +17,7 @@ PKG_MD5SUM:=4fd3b9a2e5dcd025840c3849b136bec8
 PKG_BUILD_DEPENDS:=python-mini
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/mercurial
   SECTION:=net
index ddbac0c..78e032e 100644 (file)
@@ -18,7 +18,7 @@ PKG_MD5SUM:=1a94dc537fcf74d6a3a80bd27808e77b
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/rdiff-backup
   SUBMENU:=backup
index dac6653..8b7d386 100644 (file)
@@ -25,7 +25,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/rrdtool/Default
   SECTION:=utils