oath-toolkit: splitting liboath from oath-toolkit

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

diff --git a/utils/oath-toolkit/Makefile b/utils/oath-toolkit/Makefile
index 3063d1fa660294d65ec53145bb4272523e056d37..1eb4c2110aa0ecc12336ce46e4898c8adf5d7bf2 100644 (file)
--- a/utils/oath-toolkit/Makefile
+++ b/utils/oath-toolkit/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oath-toolkit
 PKG_VERSION:=2.6.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SAVANNAH/oath-toolkit
@@ -29,21 +29,30 @@ CONFIGURE_ARGS += \
        --disable-xmltest \
        --disable-pskc
 
+define Package/liboath
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A shared and static C library for OATH handling
+  URL:=http://www.nongnu.org/oath-toolkit/index.html
+endef
+
 define Package/oath-toolkit
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Toolkit for building one-time password authentication
+  TITLE:=A command line tool for generating and validating OTPs
   URL:=http://www.nongnu.org/oath-toolkit/index.html
-  DEPENDS:=
+  DEPENDS:= +liboath
 endef
 
-define Package/oath-toolkit/description
-       The OATH Toolkit provide components for building one-time password
-       authentication systems. It contains shared libraries, command line
-       tools and a PAM module. Supported technologies include the event-based
-       HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238).
+define Package/liboath/description
+  The OATH Toolkit provide components for building one-time password
+  authentication systems. It contains shared libraries, command line
+  tools and a PAM module. Supported technologies include the event-based
+  HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238).
 endef
 
+Package/oath-toolkit/description = $(Package/liboath/description)
+
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/liboath
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
@@ -51,11 +60,15 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef
 
+define Package/liboath/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboath.so* $(1)/usr/lib/
+endef
+
 define Package/oath-toolkit/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oathtool $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboath.so* $(1)/usr/lib/
 endef
 
+$(eval $(call BuildPackage,liboath))
 $(eval $(call BuildPackage,oath-toolkit))