unify tapi deps

SVN-Revision: 33160

diff --git a/include/ltqtapi.mk b/include/ltqtapi.mk
new file mode 100644 (file)
index 0000000..7699d30
--- /dev/null
+++ b/include/ltqtapi.mk
@@ -0,0 +1,12 @@
+LTQ_TAPI_BUILD_DEPENDS:=TARGET_lantiq_danube:kmod-ltq-tapi \
+       TARGET_lantiq_danube:kmod-ltq-vmmc \
+       TARGET_lantiq_falcon:kmod-ltq-tapi \
+       TARGET_lantiq_falcon:kmod-ltq-vmmc
+
+LTQ_TAPI_TARGET:=@(TARGET_lantiq_falcon||TARGET_lantiq_danube)
+
+LTQ_TAPI_DEPENDS:=$(LTQ_TAPI_TARGET) \
+       +TARGET_lantiq_danube:kmod-ltq-tapi \
+       +TARGET_lantiq_danube:kmod-ltq-vmmc \
+       +TARGET_lantiq_falcon:kmod-ltq-tapi \
+       +TARGET_lantiq_falcon:kmod-ltq-vmmc

diff --git a/package/ltq-tapi/Makefile b/package/ltq-tapi/Makefile
index 3027ec490a9b56bfae9f4c67fd3f6e41bf0f2041..79b77b75dc148d283903e3b98bfdba5d69731976 100644 (file)
--- a/package/ltq-tapi/Makefile
+++ b/package/ltq-tapi/Makefile
@@ -16,13 +16,14 @@ PKG_SOURCE:=drv_tapi-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_MD5SUM:=edb43b494832c540cc035493d18db58f
 
+include $(INCLUDE_DIR)/ltqtapi.mk
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/ltq-tapi
   SUBMENU:=Voice over IP
   TITLE:=Lantiq TAPI subsystem
   URL:=http://www.lantiq.com/
-  DEPENDS:=+kmod-ltq-ifxos @(TARGET_lantiq_danube||TARGET_lantiq_falcon)
+  DEPENDS:=$(LTQ_TAPI_TARGET) +kmod-ltq-ifxos
   FILES:=$(PKG_BUILD_DIR)/src/drv_tapi.ko
   AUTOLOAD:=$(call AutoLoad,20,drv_tapi)
   MAINTAINER:=John Crispin <blogic@openwrt.org>

diff --git a/package/ltq-tapidemo/Makefile b/package/ltq-tapidemo/Makefile
index 1c1d2b4356c214fddf393cccfe63ded6bb7354e4..f4ac646014bb202f178b1b560dbfbaf96c53e2c4 100644 (file)
--- a/package/ltq-tapidemo/Makefile
+++ b/package/ltq-tapidemo/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=c970becc46b2935fb9e18f795d4e8469
 
 PKG_FIXUP:=autoreconf
 
+include $(INCLUDE_DIR)/ltqtapi.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ltq-tapidemo
@@ -26,7 +27,7 @@ define Package/ltq-tapidemo
   CATEGORY:=Network
   TITLE:=TAPIdemo application for Lantiq boards
   URL:=http://www.lantiq.com/
-  DEPENDS:=+kmod-ltq-tapi +kmod-ltq-vmmc +libpthread @(TARGET_lantiq_danube||TARGET_lantiq_falcon)
+  DEPENDS:=$(LTQ_TAPI_DEPENDS) +libpthread
   MAINTAINER:=John Crispin <blogic@openwrt.org>
   MENU:=1
 endef

diff --git a/package/ltq-vmmc/Makefile b/package/ltq-vmmc/Makefile
index 74724eb8befa4938ee2ce8623ee3245c618953dc..98b5df0eca0fa2f5447a8b6375cea055d88f3762 100644 (file)
--- a/package/ltq-vmmc/Makefile
+++ b/package/ltq-vmmc/Makefile
@@ -16,13 +16,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=d8eee8cba0edb28974cc1f8532e3bd18
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 
+include $(INCLUDE_DIR)/ltqtapi.mk
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/ltq-vmmc
   SUBMENU:=Voice over IP
   TITLE:=TAPI LL driver for Voice Macro
   URL:=http://www.lantiq.com/
-  DEPENDS:=+kmod-ltq-tapi @(TARGET_lantiq_danube||TARGET_lantiq_falcon)
+  DEPENDS:=$(LTQ_TAPI_TARGET) +kmod-ltq-tapi
   FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.ko
   AUTOLOAD:=$(call AutoLoad,25,drv_vmmc)
   MAINTAINER:=John Crispin <blogic@openwrt.org>

diff --git a/package/owsip/Makefile b/package/owsip/Makefile
index 37d5d8cee922ee5af70f41de594ff43b8c9a2ea6..4dcf1efdf85f9fee33501ea562aac6b64a6cf802 100644 (file)
--- a/package/owsip/Makefile
+++ b/package/owsip/Makefile
@@ -22,6 +22,7 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 PKG_MIRROR_MD5SUM:=74b0ab930321c4f85f220ff3852e210a
 
+include $(INCLUDE_DIR)/ltqtapi.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/owsip-template
@@ -34,7 +35,7 @@ define Package/owsip-template
 endef
 
 Package/owsip-oss=$(call Package/owsip-template,oss,OSS,BROKEN)
-Package/owsip-ltq-tapi=$(call Package/owsip-template,ltq-tapi,Lantiq VMMC,@(TARGET_lantiq_danube||TARGET_lantiq_falcon) +kmod-ltq-kpi2udp)
+Package/owsip-ltq-tapi=$(call Package/owsip-template,ltq-tapi,Lantiq VMMC,$(LTQ_TAPI_DEPENDS) +kmod-ltq-kpi2udp)
 
 define Package/owsip-$(BUILD_VARIANT)/description
        OpenWrt sip daemon - $(BUILD_VARIANT)

diff --git a/package/pjsip/Makefile b/package/pjsip/Makefile
index d21efc02f1d312e534c3f28e5b4fa3b14ee34523..7b46585f6ee0bedf8cacac034772b205323cbd0c 100644 (file)
--- a/package/pjsip/Makefile
+++ b/package/pjsip/Makefile
@@ -20,7 +20,8 @@ PKG_BUILD_PARALLEL:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/pjproject-$(PKG_VERSION)
 
-PKG_BUILD_DEPENDS:=TARGET_lantiq:kmod-ltq-tapi TARGET_lantiq:kmod-ltq-vmmc
+include $(INCLUDE_DIR)/ltqtapi.mk
+PKG_BUILD_DEPENDS:=$(LTQ_TAPI_BUILD_DEPENDS)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -70,7 +71,7 @@ EXTRA_CFLAGS:=-I$(STAGING_DIR)/usr/include/drv_tapi -I$(STAGING_DIR)/usr/include
 endif
 
 Package/pjsip-oss=$(call Package/pjsip-template,oss,BROKEN)
-Package/pjsip-ltq-tapi=$(call Package/pjsip-template,ltq-tapi,@TARGET_lantiq +TARGET_lantiq:kmod-ltq-tapi +TARGET_lantiq:kmod-ltq-vmmc)
+Package/pjsip-ltq-tapi=$(call Package/pjsip-template,ltq-tapi,$(LTQ_TAPI_DEPENDS))
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)