net/quagga-unstable: Enable parallel build

[openwrt/svn-archive/archive.git] / net / quagga-unstable / Makefile

diff --git a/net/quagga-unstable/Makefile b/net/quagga-unstable/Makefile
index a8c597dba3a85ce9a50c7abd5b23f5cd43b468f0..bb93f0113c206e9141f8501787fd4e115e6efeb9 100644 (file)
--- a/net/quagga-unstable/Makefile
+++ b/net/quagga-unstable/Makefile
@@ -1,5 +1,5 @@
 #
-# 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.
@@ -8,14 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga-unstable
-PKG_VERSION:=0.99.15
+PKG_VERSION:=0.99.17
 PKG_RELEASE:=1
 
 PKG_SOURCE:=quagga-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \
                 http://www.uk.quagga.net/download/
-PKG_MD5SUM:=8975414c76a295f4855a417af0b5ddce
+PKG_MD5SUM:=37b9022adca04b03863d2d79787e643f
+
+PKG_BUILD_PARALLEL:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/quagga-$(PKG_VERSION)
 
@@ -23,6 +25,8 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_quagga-unstable-isisd \
        CONFIG_PACKAGE_quagga-unstable-ripngd
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/quagga-unstable/Default
@@ -31,6 +35,7 @@ define Package/quagga-unstable/Default
   DEPENDS:=quagga-unstable
   TITLE:=The Quagga Software Routing Suite
   URL:=http://www.quagga.net
+  MAINTAINER:=Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
 endef
 
 define Package/quagga-unstable
@@ -96,6 +101,34 @@ define Package/quagga-unstable-vtysh
   TITLE:=integrated shell for Quagga routing software
 endef
 
+define Package/quagga-unstable/conffiles
+/etc/quagga/zebra.conf
+endef
+
+define Package/quagga-unstable-bgpd/conffiles
+/etc/quagga/bgpd.conf
+endef
+
+define Package/quagga-unstable-isisd/conffiles
+/etc/quagga/isisd.conf
+endef
+
+define Package/quagga-unstable-ospfd/conffiles
+/etc/quagga/ospfd.conf
+endef
+
+define Package/quagga-unstable-ospf6d/conffiles
+/etc/quagga/ospf6d.conf
+endef
+
+define Package/quagga-unstable-ripd/conffiles
+/etc/quagga/ripd.conf
+endef
+
+define Package/quagga-unstable-ripngd/conffiles
+/etc/quagga/ripngd.conf
+endef
+
 CONFIGURE_ARGS+= \
        --localstatedir=/var/run/quagga \
        --sysconfdir=/etc/quagga/ \
@@ -115,12 +148,6 @@ ifneq ($(CONFIG_PACKAGE_quagga-unstable-ripngd),)
   CONFIGURE_ARGS+= --enable-ripngd
 endif
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR=$(PKG_INSTALL_DIR) \
-               all install
-endef
-
 define Package/quagga-unstable/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
@@ -128,7 +155,7 @@ define Package/quagga-unstable/install
        # avoid /etc being set to 0750
        $(INSTALL_DIR) $(1)/etc/quagga
        chmod 0750 $(1)/etc/quagga
-       $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/zebra.conf
+       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/zebra.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/quagga $(1)/usr/sbin/quagga.init
        $(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga
@@ -187,7 +214,7 @@ define Package/quagga-unstable-bgpd/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/quagga
        chmod 0750 $(1)/etc/quagga
-       $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf
+       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf
 endef
 
 define Package/quagga-unstable-isisd/install
@@ -195,7 +222,7 @@ define Package/quagga-unstable-isisd/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/quagga
        chmod 0750 $(1)/etc/quagga
-       $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/isisd.conf
+       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/isisd.conf
 endef
 
 define Package/quagga-unstable-ospfd/install
@@ -203,7 +230,7 @@ define Package/quagga-unstable-ospfd/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/quagga
        chmod 0750 $(1)/etc/quagga
-       $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
+       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
 endef
 
 define Package/quagga-unstable-ospf6d/install
@@ -211,7 +238,7 @@ define Package/quagga-unstable-ospf6d/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/quagga
        chmod 0750 $(1)/etc/quagga
-       $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf
+       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf
 endef
 
 define Package/quagga-unstable-ripd/install
@@ -219,7 +246,7 @@ define Package/quagga-unstable-ripd/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/quagga
        chmod 0750 $(1)/etc/quagga
-       $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripd.conf
+       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripd.conf
 endef
 
 define Package/quagga-unstable-ripngd/install
@@ -227,7 +254,7 @@ define Package/quagga-unstable-ripngd/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/quagga
        chmod 0750 $(1)/etc/quagga
-       $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
+       $(INSTALL_CONF) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
 endef
 
 define Package/quagga-unstable-vtysh/install
@@ -249,9 +276,9 @@ $(eval $(call BuildPackage,quagga-unstable))
 $(eval $(call BuildPackage,quagga-unstable-libzebra))
 $(eval $(call BuildPackage,quagga-unstable-libospf))
 $(eval $(call BuildPackage,quagga-unstable-bgpd))
-$(eval $(call BuildPackage,quagga-unstable-isisd))
+#$(eval $(call BuildPackage,quagga-unstable-isisd))
 $(eval $(call BuildPackage,quagga-unstable-ospfd))
-$(eval $(call BuildPackage,quagga-unstable-ospf6d))
+#$(eval $(call BuildPackage,quagga-unstable-ospf6d))
 $(eval $(call BuildPackage,quagga-unstable-ripd))
-$(eval $(call BuildPackage,quagga-unstable-ripngd))
+#$(eval $(call BuildPackage,quagga-unstable-ripngd))
 $(eval $(call BuildPackage,quagga-unstable-vtysh))