From e6e331ca6777647407d877a504cea137cc3acdec Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 13 Aug 2012 11:08:13 +0000 Subject: [PATCH] unify tapi deps SVN-Revision: 33160 --- include/ltqtapi.mk | 12 ++++++++++++ package/ltq-tapi/Makefile | 3 ++- package/ltq-tapidemo/Makefile | 3 ++- package/ltq-vmmc/Makefile | 3 ++- package/owsip/Makefile | 3 ++- package/pjsip/Makefile | 5 +++-- 6 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 include/ltqtapi.mk diff --git a/include/ltqtapi.mk b/include/ltqtapi.mk new file mode 100644 index 000000000000..7699d30d1dc9 --- /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 3027ec490a9b..79b77b75dc14 100644 --- 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 diff --git a/package/ltq-tapidemo/Makefile b/package/ltq-tapidemo/Makefile index 1c1d2b4356c2..f4ac646014bb 100644 --- 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 MENU:=1 endef diff --git a/package/ltq-vmmc/Makefile b/package/ltq-vmmc/Makefile index 74724eb8befa..98b5df0eca0f 100644 --- 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 diff --git a/package/owsip/Makefile b/package/owsip/Makefile index 37d5d8cee922..4dcf1efdf85f 100644 --- 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 d21efc02f1d3..7b46585f6ee0 100644 --- 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),) -- 2.30.2