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

madplay: some build variant related fixes

Browse source 
the 2 variants could not be built at the same time

Signed-off-by: John Crispin <blogic@openwrt.org>
This commit is contained in:
John Crispin 2015-10-26 17:15:00 +01:00
parent 6f8928afbc
commit f8a70fc188
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sound/madplay/Makefile
View file

@ -19,6 +19,8 @@ PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Simon Peter <probono@puredarwin.org>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
@ -27,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/madplay/default
SECTION:=sound
CATEGORY:=Sound
DEPENDS:=+libid3tag +libmad
DEPENDS:=+libid3tag +libmad $(2)
TITLE:=MPEG audio player in fixed point - $(1)
VARIANT:=$(1)
URL:=http://sourceforge.net/projects/mad
@ -40,7 +42,7 @@ define Package/madplay/description
full support for ID3 tags.
endef
Package/madplay-alsa=$(call Package/madplay/default,alsa)
Package/madplay-alsa=$(call Package/madplay/default,alsa,+alsa-lib)
Package/madplay=$(call Package/madplay/default,oss)
define Build/Configure
@ -58,18 +60,23 @@ define Build/Configure
)
endef
ifeq ($(BUILD_VARIANT),madplay-alsa)
ifeq ($(BUILD_VARIANT),alsa)
CONFIGURE_ARGS += \
--without-oss \
--with-alsa
endif
ifeq ($(BUILD_VARIANT),madplay)
ifeq ($(BUILD_VARIANT),oss)
CONFIGURE_ARGS += \
--without-alsa
endif
define Package/madplay-$(BUILD_VARIANT)/install
define Package/madplay/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/
endef
define Package/madplay-alsa/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/madplay $(1)/usr/bin/
endef