[packages] howl: add libpthread dependency (#6530)

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

diff --git a/libs/howl/Makefile b/libs/howl/Makefile
index 618e4da7d59fd4cd1ddd8d76945c29525c70e9c9..961760ab11b439d2e7d98636a3dd6dc33858f6b2 100644 (file)
--- a/libs/howl/Makefile
+++ b/libs/howl/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -15,10 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.porchdogsoft.com/download/
 PKG_MD5SUM:=c389d3ffba0e69a179de2ec650f1fdcc
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,8 +21,6 @@ define Package/howl/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Zeroconf networking implementation
-  DESCRIPTION:=\
-       Howl is a cross-platform implementation of Zeroconf networking.
   URL:=http://www.porchdogsoft.com/products/howl/
 endef
 
@@ -36,8 +29,10 @@ define Package/libhowl
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= (library)
-  DESCRIPTION+=\\\
-       \\\
+endef
+
+define Package/libhowl/description
+       Howl is a cross-platform implementation of Zeroconf networking. 
        This package contains the Howl shared libraries, used by other programs.
 endef
 
@@ -45,17 +40,21 @@ define Package/howl-autoipd
   $(call Package/howl/Default)
   DEPENDS:=+libhowl
   TITLE:=An IPv4 Link-Local address self-assigner daemon
-  DESCRIPTION+=\\\
-       \\\
+endef
+
+define Package/howl-autoipd/description
+       Howl is a cross-platform implementation of Zeroconf networking. 
        This package contains an IPv4 Link-Local address self-assigner daemon.
 endef
 
 define Package/howl-mdnsresponder
   $(call Package/howl/Default)
-  DEPENDS:=+libhowl
+  DEPENDS:=+libhowl +libpthread
   TITLE:=An mDNS (Multicast DNS) service responder daemon
-  DESCRIPTION+=\\\
-       \\\
+endef
+
+define Package/howl-mdnsresponder/description
+       Howl is a cross-platform implementation of Zeroconf networking. 
        This package contains an mDNS (Multicast DNS) service responder daemon.
 endef
 
@@ -67,8 +66,9 @@ define Package/howl-nifd
   $(call Package/howl/Default)
   DEPENDS:=+libhowl
   TITLE:=A network interface monitor daemon
-  DESCRIPTION+=\\\
-       \\\
+endef
+
+define Package/howl-nifd/description
        This package contains a network interface monitor daemon.
 endef
 
@@ -76,8 +76,9 @@ define Package/howl-utils
   $(call Package/howl/Default)
   DEPENDS:=+libhowl
   TITLE+= (utilities)
-  DESCRIPTION+=\\\
-       \\\
+endef
+
+define Package/howl-utils/description
        This package contains mDNS (Multicast DNS) client utilities.
 endef
 
@@ -88,6 +89,8 @@ define Build/Configure
        );
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -95,20 +98,14 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/
-       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-       $(SED) 's,-I/usr/include,-I$$$${includedir},g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
-       $(SED) 's,-L/usr/lib/howl,-L$$$${libdir}/howl,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
-endef
-
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/howl \
-               $(STAGING_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(1)/usr/lib/pkgconfig/
+       $(SED) 's,-I/usr/include,-I$$$${includedir},g' $(1)/usr/lib/pkgconfig/howl.pc
+       $(SED) 's,-L/usr/lib/howl,-L$$$${libdir}/howl,g' $(1)/usr/lib/pkgconfig/howl.pc
 endef
 
 define Package/libhowl/install
@@ -118,14 +115,14 @@ endef
 
 define Package/howl-autoipd/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_DATA) ./files/autoipd.init $(1)/etc/init.d/autoipd
 endef
-       
+
 define Package/howl-mdnsresponder/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/mDNSResponder.conf $(1)/etc/mDNSResponder.conf
        $(INSTALL_DIR) $(1)/etc/init.d
@@ -134,16 +131,16 @@ endef
 
 define Package/howl-nifd/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/nifd $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nifd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_DATA) ./files/nifd.init $(1)/etc/init.d/nifd
 endef
-       
+
 define Package/howl-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(1)/usr/bin/
 endef
-       
+
 $(eval $(call BuildPackage,libhowl))
 $(eval $(call BuildPackage,howl-autoipd))
 $(eval $(call BuildPackage,howl-mdnsresponder))