From: fatbob313 Date: Wed, 6 Jan 2010 23:02:55 +0000 (+0000) Subject: Reorganization X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=340771883dfd2bb0c85590880612477e9187e55f Reorganization --- diff --git a/Makefile b/Makefile deleted file mode 100644 index cb5fe9e..0000000 --- a/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=umurmur -PKG_VERSION:=0.1.3 -PKG_RELEASE:=1 - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - -include $(INCLUDE_DIR)/package.mk - - -define Package/umurmur - SECTION:=net - CATEGORY:=Network - TITLE:=uMurmur - DEPENDS:=+libopenssl +libconfig - URL:=http://code.google.com/p/umurmur - MAINTAINER:=Martin Johansson -endef - -define Package/umurmur/description - Minimalistic Mumble server daemon. -endef - -TARGET_CFLAGS := \ - -DWRT_TARGET \ - $(TARGET_CFLAGS) - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(CP) ./src/* $(PKG_BUILD_DIR)/ -endef - -define Build/CompileTarget - CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"\ - $(MAKE) -C $(PKG_BUILD_DIR)/umurmur.$(1)/umurmur \ - all -endef - -define Package/umurmur/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/umurmurd $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) ./files/umurmur.conf $(1)/etc/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/umurmur.init $(1)/etc/init.d/umurmur - $(INSTALL_DIR) $(1)/etc/umurmur -endef - -$(eval $(call BuildPackage,umurmur)) - diff --git a/files/umurmur.conf b/files/umurmur.conf deleted file mode 100644 index 09161fa..0000000 --- a/files/umurmur.conf +++ /dev/null @@ -1,31 +0,0 @@ -max_bandwidth = 5000; -welcometext = "Welcome to uMurmur!"; -certificate = "/etc/umurmur/cert.crt"; -private_key = "/etc/umurmur/key.key"; -password = ""; -max_users = 10; - -# Root channel must always be defined first. -# If a channel has a parent, the parent must be defined before the child channel(s). -channels = ( { - name = "Root"; - parent = ""; - description = "The Root of all channels"; - }, - { - name = "Lobby"; - parent = "Root"; - description = "Lobby channel"; - }, - { - name = "Red team"; - parent = "Lobby"; - description = "The Red team channel"; - }, - { - name = "Blue team"; - parent = "Lobby"; - description = "The Blue team channel"; - } -); -default_channel = "Lobby"; diff --git a/files/umurmur.init b/files/umurmur.init deleted file mode 100644 index 617110a..0000000 --- a/files/umurmur.init +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2008 OpenWrt.org - -START=90 - -PIDFILE="/var/run/umurmurd.pid" - -start() { - stop - /usr/bin/umurmurd -r -p $PIDFILE -} - -stop() { - [ -f "$PIDFILE" ] && kill $(cat "$PIDFILE") 2>/dev/null >/dev/null -} \ No newline at end of file diff --git a/openwrt/Makefile b/openwrt/Makefile new file mode 100644 index 0000000..cb5fe9e --- /dev/null +++ b/openwrt/Makefile @@ -0,0 +1,51 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=umurmur +PKG_VERSION:=0.1.3 +PKG_RELEASE:=1 + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) + +include $(INCLUDE_DIR)/package.mk + + +define Package/umurmur + SECTION:=net + CATEGORY:=Network + TITLE:=uMurmur + DEPENDS:=+libopenssl +libconfig + URL:=http://code.google.com/p/umurmur + MAINTAINER:=Martin Johansson +endef + +define Package/umurmur/description + Minimalistic Mumble server daemon. +endef + +TARGET_CFLAGS := \ + -DWRT_TARGET \ + $(TARGET_CFLAGS) + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR)/ +endef + +define Build/CompileTarget + CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"\ + $(MAKE) -C $(PKG_BUILD_DIR)/umurmur.$(1)/umurmur \ + all +endef + +define Package/umurmur/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/umurmurd $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_CONF) ./files/umurmur.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/umurmur.init $(1)/etc/init.d/umurmur + $(INSTALL_DIR) $(1)/etc/umurmur +endef + +$(eval $(call BuildPackage,umurmur)) + diff --git a/openwrt/files/umurmur.conf b/openwrt/files/umurmur.conf new file mode 100644 index 0000000..09161fa --- /dev/null +++ b/openwrt/files/umurmur.conf @@ -0,0 +1,31 @@ +max_bandwidth = 5000; +welcometext = "Welcome to uMurmur!"; +certificate = "/etc/umurmur/cert.crt"; +private_key = "/etc/umurmur/key.key"; +password = ""; +max_users = 10; + +# Root channel must always be defined first. +# If a channel has a parent, the parent must be defined before the child channel(s). +channels = ( { + name = "Root"; + parent = ""; + description = "The Root of all channels"; + }, + { + name = "Lobby"; + parent = "Root"; + description = "Lobby channel"; + }, + { + name = "Red team"; + parent = "Lobby"; + description = "The Red team channel"; + }, + { + name = "Blue team"; + parent = "Lobby"; + description = "The Blue team channel"; + } +); +default_channel = "Lobby"; diff --git a/openwrt/files/umurmur.init b/openwrt/files/umurmur.init new file mode 100644 index 0000000..617110a --- /dev/null +++ b/openwrt/files/umurmur.init @@ -0,0 +1,15 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006-2008 OpenWrt.org + +START=90 + +PIDFILE="/var/run/umurmurd.pid" + +start() { + stop + /usr/bin/umurmurd -r -p $PIDFILE +} + +stop() { + [ -f "$PIDFILE" ] && kill $(cat "$PIDFILE") 2>/dev/null >/dev/null +} \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index 9b959ab..f3856d9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,6 +22,6 @@ all: umurmurd $(OBJS): Makefile depend.mak: - $(CC) -M $(SRCS) > depend.mak + $(CC) $(CFLAGS) -M $(SRCS) > depend.mak include depend.mak \ No newline at end of file