[packages] make libintl and libiconv stub/full implementations switchable, use the...

[packages.git] / sound / mpd / Makefile

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index ee2f2eb..b86f867 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
 PKG_VERSION:=0.15.8
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/musicpd
@@ -19,6 +19,7 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/mpd
   SECTION:=sound
@@ -72,7 +73,6 @@ CONFIGURE_ARGS += \
        --enable-mms \
        --enable-curl \
        --disable-oss \
-       --enable-aac \
        --with-zeroconf=no \
        --disable-libOggFLACtest \
        --disable-test \
@@ -85,15 +85,8 @@ CONFIGURE_VARS += \
        $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
        $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
 
-TARGET_CFLAGS += \
-       -std=gnu99 \
-       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include/ \
-
-TARGET_LDFLAGS += \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
+TARGET_CFLAGS += -std=gnu99
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 # use gcc instead of g++ to avoid unnecessary linking against libstdc++
 TARGET_CXX:=$(TARGET_CC)