Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

yate: improve depends of sub packages

Browse source 
Currently the Makfile pulls in every dependency mentioned. Fix this by
prefixing the depends with the respective PACKAGE_* items.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2018-02-03 14:18:51 +01:00
parent c46719867f
commit 4ba28200be
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
net/yate/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2014 OpenWrt.org # Copyright (C) 2006-2018 OpenWrt.org
# Copyright (C) 2006-2011 SMBPhone # Copyright (C) 2006-2011 SMBPhone
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
@ -56,7 +56,9 @@ endef
define Package/$(PKG_NAME)-scripts-perl define Package/$(PKG_NAME)-scripts-perl
$(call Package/yate/Default) $(call Package/yate/Default)
DEPENDS += $(PKG_NAME) $(PKG_NAME)-mod-extmodule +perlbase-data DEPENDS += $(PKG_NAME) \
+PACKAGE_$(PKG_NAME)-scripts-perl:$(PKG_NAME)-mod-extmodule \
+PACKAGE_$(PKG_NAME)-scripts-perl:perlbase-data
TITLE:= Perl module for Yate TITLE:= Perl module for Yate
endef endef
@ -69,14 +71,14 @@ endef
define Package/$(PKG_NAME)-collection-basic define Package/$(PKG_NAME)-collection-basic
$(call Package/yate/Default) $(call Package/yate/Default)
DEPENDS += $(PKG_NAME) \ DEPENDS += $(PKG_NAME) \
+$(PKG_NAME)-sounds \ +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-sounds \
+$(PKG_NAME)-mod-dumbchan \ +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-mod-dumbchan \
+$(PKG_NAME)-mod-regfile \ +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-mod-regfile \
+$(PKG_NAME)-mod-regexroute \ +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-mod-regexroute \
+$(PKG_NAME)-mod-rmanager \ +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-mod-rmanager \
+$(PKG_NAME)-mod-tonegen \ +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-mod-tonegen \
+$(PKG_NAME)-mod-yrtpchan \ +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-mod-yrtpchan \
+$(PKG_NAME)-mod-ysipchan +PACKAGE_$(PKG_NAME)-collection-basic:$(PKG_NAME)-mod-ysipchan
TITLE := Basic Yate Server TITLE := Basic Yate Server
endef endef
@ -167,7 +169,7 @@ endef
define BuildPlugin define BuildPlugin
define Package/$(PKG_NAME)-mod-$(1) define Package/$(PKG_NAME)-mod-$(1)
$(call Package/yate/Default) $(call Package/yate/Default)
DEPENDS:= $(PKG_NAME) $(4) DEPENDS:= $(PKG_NAME) $(patsubst +%,+PACKAGE_$(PKG_NAME)-mod-$(1):%,$(4))
TITLE:=$(3) TITLE:=$(3)
endef endef