X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils%2Fbemused%2FMakefile;h=61cc1013a6bd77f8de771edbeb6b73061c589824;hb=ca74ca9b86f4b2b5813b3f5812f66c22a240b959;hp=a306f8ec2d4b0057a476755d001a73b14ea95a64;hpb=d3a7097b715f030369e88d9db293e3177bb1c5d8;p=packages.git

diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index a306f8ec2..61cc1013a 100644
--- a/utils/bemused/Makefile
+++ b/utils/bemused/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bemused-mpd
 PKG_VERSION:=r062
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526
 PKG_MD5SUM:=aed8b41aed530e9177e43d9bebad10b7
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
@@ -33,15 +35,18 @@ define Package/bemusedlinuxserver/description
     Check http://jamse.sourceforge.net/ for a mobile phone client.
 endef
 
+EXTRA_CPPFLAGS:= \
+	-I$(STAGING_DIR)/usr/include/glib-1.2 \
+	-I$(STAGING_DIR)/usr/lib/glib/include
+
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS) " \
-	CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	INCL="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(ICONV_PREFIX)/include" \
-	MYLIBS="-lbluetooth -lglib -L$(ICONV_PREFIX)/lib -liconv"
-	$(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+		LDLIBS="-lbluetooth -lglib -liconv"
 endef
 
 define Package/bemusedlinuxserver/install
@@ -54,4 +59,9 @@ define Package/bemusedlinuxserver/install
 	$(INSTALL_BIN) ./files/bemused.init $(1)/etc/init.d/bemused
 endef
 
+define Package/bemusedlinuxserver/conffiles
+/etc/bemused.conf
+/etc/bemused-bookmarks
+endef
+
 $(eval $(call BuildPackage,bemusedlinuxserver))