From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 17 Jul 2005 22:14:32 +0000 (+0000)
Subject: split off libospf from quagga-ospf(6)d
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2062ba52c0f70a3a7559ea8088296d095cee93b2;p=openwrt%2Fstaging%2Frobimarko.git

split off libospf from quagga-ospf(6)d

SVN-Revision: 1490
---

diff --git a/openwrt/package/quagga/Config.in b/openwrt/package/quagga/Config.in
index df13bb8448..87233d1103 100644
--- a/openwrt/package/quagga/Config.in
+++ b/openwrt/package/quagga/Config.in
@@ -21,9 +21,18 @@ config BR2_PACKAGE_QUAGGA_BGPD
 	  A BGPv4, BGPv4\+, BGPv4\- routing engine for use with Quagga routing
 	  software.
 
+config BR2_PACKAGE_LIBOSPF
+	depends BR2_PACKAGE_QUAGGA
+	prompt "libospf - OSPF support library"
+	tristate
+	default m if CONFIG_DEVEL
+	help
+	  An OSPFv2 routing engine for use with Quagga routing software.
+
 config BR2_PACKAGE_QUAGGA_OSPFD
 	depends BR2_PACKAGE_QUAGGA
 	prompt "...-ospfd - OSPFv2 routing engine"
+	select BR2_PACKAGE_LIBOSPF
 	tristate
 	default m if CONFIG_DEVEL
 	help
@@ -32,6 +41,7 @@ config BR2_PACKAGE_QUAGGA_OSPFD
 config BR2_PACKAGE_QUAGGA_OSPF6D
 	depends BR2_PACKAGE_QUAGGA
 	prompt "...-ospf6d - OSPFv3 routing engine"
+	select BR2_PACKAGE_LIBOSPF
 	tristate
 	default m if CONFIG_DEVEL
 	help
diff --git a/openwrt/package/quagga/Makefile b/openwrt/package/quagga/Makefile
index 6fdc38f1d0..fca54ecb9b 100644
--- a/openwrt/package/quagga/Makefile
+++ b/openwrt/package/quagga/Makefile
@@ -21,6 +21,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,QUAGGA,quagga,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBOSPF,libospf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -81,17 +82,19 @@ $(IPKG_QUAGGA_BGPD):
 	$(RSTRIP) $(IDIR_QUAGGA_BGPD)
 	$(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(PACKAGE_DIR)
 
+$(IPKG_LIBOSPF):
+	install -d -m0755 $(IDIR_LIBOSPF)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_LIBOSPF)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBOSPF)
+	$(IPKG_BUILD) $(IDIR_LIBOSPF) $(PACKAGE_DIR)
+
 $(IPKG_QUAGGA_OSPFD):
-	install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/
 	install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/sbin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/
 	$(RSTRIP) $(IDIR_QUAGGA_OSPFD)
 	$(IPKG_BUILD) $(IDIR_QUAGGA_OSPFD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_OSPF6D):
-	install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPF6D)/usr/lib/
 	install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/sbin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPF6D)/usr/sbin/
 	$(RSTRIP) $(IDIR_QUAGGA_OSPF6D)
diff --git a/openwrt/package/quagga/ipkg/libospf.control b/openwrt/package/quagga/ipkg/libospf.control
new file mode 100644
index 0000000000..56d1a6d7b7
--- /dev/null
+++ b/openwrt/package/quagga/ipkg/libospf.control
@@ -0,0 +1,7 @@
+Package: libospf
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <openwrt@nbd.name>
+Source: buildroot internal
+Description: OSPF support library
+ for Quagga routing software
diff --git a/openwrt/package/quagga/ipkg/quagga-ospf6d.control b/openwrt/package/quagga/ipkg/quagga-ospf6d.control
index 2345ef127d..6d20fd8896 100644
--- a/openwrt/package/quagga/ipkg/quagga-ospf6d.control
+++ b/openwrt/package/quagga/ipkg/quagga-ospf6d.control
@@ -3,5 +3,6 @@ Priority: optional
 Section: net
 Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
 Source: buildroot internal
+Depends: libospf
 Description: An OSPFv3 routing engine for use
  with Quagga routing software
diff --git a/openwrt/package/quagga/ipkg/quagga-ospfd.control b/openwrt/package/quagga/ipkg/quagga-ospfd.control
index eeab13acb8..be9ca20a05 100644
--- a/openwrt/package/quagga/ipkg/quagga-ospfd.control
+++ b/openwrt/package/quagga/ipkg/quagga-ospfd.control
@@ -3,5 +3,6 @@ Priority: optional
 Section: net
 Maintainer: Johannes 5 Joemann <joemann@beefree.free.de>
 Source: buildroot internal
+Depends: libospf
 Description: An OSPFv2 routing engine for use
  with Quagga routing software