X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fbatman%2FMakefile;h=b17818a14b795784dc4dcea875818e1193c1f7cb;hb=bd92798e7d61c0abb893c0275f2664c9630f7417;hp=0184c67a84290d3f46ee28415e20ebe70206ba8e;hpb=90d892b50efa961bd12ce6d5dc07aad87d60bdab;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/batman/Makefile b/net/batman/Makefile
index 0184c67a84..b17818a14b 100644
--- a/net/batman/Makefile
+++ b/net/batman/Makefile
@@ -1,34 +1,32 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=batmand
-PKG_REV:=963
+PKG_REV:=1439
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
-PKG_BRANCH:=batman
+PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\"
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_BRANCH)d-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://downloads.open-mesh.net/svn/batman/trunk/$(PKG_BRANCH)
+PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),$(PKG_NAME))-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://downloads.open-mesh.org/svn/batman/trunk/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
-PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/linux/modules
+PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman/linux/modules
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batmand/Default
-  URL:=https://www.open-mesh.net/
+  URL:=http://www.open-mesh.org/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
@@ -36,6 +34,7 @@ define Package/batmand
 $(call Package/batmand/Default)
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
   DEPENDS:=+libpthread +kmod-tun
   TITLE:=B.A.T.M.A.N. layer 3 routing daemon
 endef
@@ -44,6 +43,19 @@ define Package/batmand/description
 B.A.T.M.A.N. layer 3 routing daemon
 endef
 
+define Package/vis
+$(call Package/batmand/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  DEPENDS:=+libpthread
+  TITLE:=visualization server for B.A.T.M.A.N. layer 3
+endef
+        
+define Package/vis/description
+visualization server for B.A.T.M.A.N. layer 3
+endef
+
 define KernelPackage/batgat
 $(call Package/batmand/Default)
   SUBMENU:=Network Support
@@ -55,11 +67,11 @@ endef
 
 
 define KernelPackage/batgat/description
- Kernel gateway module for B.A.T.M.A.N.
+Kernel gateway module for B.A.T.M.A.N. for better tunnel performance
 endef
 
-MAKE_ARGS += \
-	EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+MAKE_BATMAND_ARGS += \
+	EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
 	CCFLAGS="$(TARGET_CFLAGS)" \
 	OFLAGS="$(TARGET_CFLAGS)" \
 	REVISION="$(PKG_REV)" \
@@ -69,20 +81,48 @@ MAKE_ARGS += \
 	INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 	STRIP="/bin/true" \
 	batmand install
+	
+MAKE_VIS_ARGS += \
+	EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
+	CCFLAGS="$(TARGET_CFLAGS)" \
+	OFLAGS="$(TARGET_CFLAGS)" \
+	REVISION="$(PKG_REV)" \
+	CC="$(TARGET_CC)" \
+	NODEBUG=1 \
+	UNAME="Linux" \
+	INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+	STRIP="/bin/true" \
+	vis install
+
+MAKE_BATGAT_ARGS += \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	ARCH="$(LINUX_KARCH)" \
+	PATH="$(TARGET_PATH)" \
+	SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
+	LINUX_VERSION="$(LINUX_VERSION)" \
+	REVISION="$(PKG_REV)" modules	
+
 
 define Build/Configure
 endef
 
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_batmand),)
+	BUILD_BATMAND := $(MAKE) -C $(PKG_BUILD_DIR)/batman $(MAKE_BATMAND_ARGS)
+endif
+
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_vis),)
+	BUILD_VIS := $(MAKE) -C $(PKG_BUILD_DIR)/vis $(MAKE_VIS_ARGS)
+endif
+	
+ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batgat),)
+	BUILD_BATGAT := $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATGAT_ARGS)
+endif
+	        
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS)
+	$(BUILD_BATMAND)
+	$(BUILD_VIS)
 	cp $(PKG_KMOD_BUILD_DIR)/Makefile.kbuild $(PKG_KMOD_BUILD_DIR)/Makefile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		PATH="$(TARGET_PATH)" \
-		SUBDIRS="$(PKG_KMOD_BUILD_DIR)" \
-		LINUX_VERSION="$(LINUX_VERSION)" \
-		REVISION="$(PKG_REV)" modules
+	$(BUILD_BATGAT)
 endef
 
 define Package/batmand/install
@@ -92,5 +132,13 @@ define Package/batmand/install
 	$(INSTALL_DATA) ./files/etc/config/batmand $(1)/etc/config
 endef
 
+define Package/vis/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/vis $(1)/etc/init.d
+	$(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config
+endef
+
 $(eval $(call BuildPackage,batmand))
+$(eval $(call BuildPackage,vis))
 $(eval $(call KernelPackage,batgat))