packages: add missing conffiles define

[openwrt/svn-archive/archive.git] / utils / bemused / Makefile

diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index 599ca648c42847a5f96f05078bba65f09f6b7062..4cd0b13a3733fe76c6a7ba270318a9b4db3a17ba 100644 (file)
--- a/utils/bemused/Makefile
+++ b/utils/bemused/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2008 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,18 +9,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bemused-mpd
 PKG_VERSION:=r062
-PKG_RELEASE:=1
+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
 
 define Package/bemusedlinuxserver
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp +libiconv
+  DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp $(ICONV_DEPENDS)
   TITLE:=Bemused linux server
   URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/
 endef
@@ -32,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="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-       MYLIBS="-lbluetooth -lglib -L$(STAGING_DIR)/usr/lib/libiconv/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
@@ -53,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))