packages/mdnsreposnder: various changes:

[openwrt/svn-archive/archive.git] / net / umurmur / Makefile

diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile
index 3bb0102df1e73188584a78e6f1ab87e3274e63e8..8c61ba214644b9c575baa4330c2266bdb317293e 100644 (file)
--- a/net/umurmur/Makefile
+++ b/net/umurmur/Makefile
@@ -1,50 +1,95 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
 
-
 PKG_NAME:=umurmur
-PKG_VERSION:=0.1.3
+PKG_VERSION:=0.2.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://umurmur.googlecode.com/files/
-PKG_MD5SUM:=f72b6f0aee7fdba31cd4faa9fb01ab6d
+PKG_MD5SUM:=06dc224be5160e172574c9248682140b
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/umurmur
+define Package/umurmur/Default
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Instant Messaging
   TITLE:=uMurmur
-  DEPENDS:=+libopenssl +libconfig
+  DEPENDS:=+libconfig
   URL:=http://code.google.com/p/umurmur
   MAINTAINER:=Martin Johansson <martin@fatbob.nu>
 endef
 
-define Package/umurmur/description
+define Package/umurmur/Default/description
   Minimalistic Mumble server daemon.
 endef
 
-TARGET_CFLAGS := \
-       -DWRT_TARGET \
-       -I$(STAGING_DIR)/usr/include \
-       $(TARGET_CFLAGS)
+define Package/umurmur-openssl
+  $(call Package/umurmur/Default)
+  TITLE+= (with OpenSSL support)
+  DEPENDS+= +libopenssl
+  VARIANT:=openssl
+endef
+
+define Package/umurmur-openssl/description
+  $(call Package/umurmur/Default/description)
+  Uses OpenSSL library for SSL and crypto.
+endef
+
+define Package/umurmur-polarssl
+  $(call Package/umurmur/Default)
+  TITLE+= (with PolarSSL support)
+  DEPENDS+= +libpolarssl
+  VARIANT:=polarssl
+endef
+
+define Package/umurmur-polarssl/description
+  $(call Package/umurmur/Default/description)
+  Uses the PolarSSL library for SSL and crypto.
+endef
+
+define Build/Compile
+       CC="$(TARGET_CC)" \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS)" \
+       $(MAKE) -C $(PKG_BUILD_DIR)/src all
+endef
+
+define Package/umurmur-openssl/conffiles
+/etc/umurmur.conf
+endef
 
-MAKE_PATH:=src
+Package/umurmur-polarssl/conffiles = $(Package/umurmur-openssl/conffiles)
 
-define Package/umurmur/install
+define Package/umurmur-openssl/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/files/umurmur.conf $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/umurmur.init $(1)/etc/init.d/umurmur
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt/files/umurmur.init $(1)/etc/init.d/umurmur
        $(INSTALL_DIR) $(1)/etc/umurmur
 endef
 
-$(eval $(call BuildPackage,umurmur))
+Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install)
+
+ifeq ($(BUILD_VARIANT),openssl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+  TARGET_LDFLAGS += -lcrypto -lssl
+endif
+
+ifeq ($(BUILD_VARIANT),polarssl)
+  TARGET_CFLAGS += -DUSE_POLARSSL -I$(STAGING_DIR)/usr/include
+  TARGET_LDFLAGS += -lpolarssl
+endif
+
+$(eval $(call BuildPackage,umurmur-openssl))
+$(eval $(call BuildPackage,umurmur-polarssl))