[packages] liboping: update to 1.4.0, add a noping package for the ncurses app

[openwrt/svn-archive/archive.git] / libs / liboping / Makefile

diff --git a/libs/liboping/Makefile b/libs/liboping/Makefile
index f4e390bd2273bfb63ccae6d2bcc1c890da681ac1..d8022b316b0a64838df81aa6faabc5c38caf2976 100644 (file)
--- a/libs/liboping/Makefile
+++ b/libs/liboping/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,25 +8,45 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=liboping
-PKG_VERSION:=1.3.2
+PKG_VERSION:=1.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://verplant.org/liboping/files
-PKG_MD5SUM:=f549c6f1f4d1dbef4dc7cc823badc20b
+PKG_MD5SUM:=b3d3ef82c8b963266e0ce8db1509cac4
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
+define Package/liboping/Default
+  URL:=http://verplant.org/liboping/
+endef
+
 define Package/liboping
+$(call Package/liboping/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=liboping is a C library to generate ICMP echo requests.
-  URL:=http://verplant.org/liboping/
+  TITLE:=C library to generate ICMP echo requests.
 endef
 
+define Package/oping
+$(call Package/liboping/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Send ICMP echo request to network hosts
+  DEPENDS+= +liboping
+endef
+
+define Package/noping
+$(call Package/liboping/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Ncurses application to send ICMP echo request to network hosts
+  DEPENDS+= +liboping +libncurses
+endef
 
 TARGET_CFLAGS += $(FPIC)
 
@@ -35,12 +55,6 @@ CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/oping.h $(1)/usr/include/
@@ -48,9 +62,21 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboping.{a,so*} $(1)/usr/lib/
 endef
 
-define Package/liboping/install        
+define Package/liboping/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboping.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboping.so.* $(1)/usr/lib/
+endef
+
+define Package/oping/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oping $(1)/usr/bin/
+endef
+
+define Package/noping/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/noping $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,liboping))
+$(eval $(call BuildPackage,oping))
+$(eval $(call BuildPackage,noping))