X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fhowl%2FMakefile;h=3b70f7d151fda4fb806a103ddea697d31cdcc33b;hb=3984db40a05fd2d33379a11b977f709e73e0210b;hp=89b02bab0e57206da78b35fce01084f5eb29fbd6;hpb=c0e52478488c8477348e277d6a5e46019152dd20;p=packages.git

diff --git a/libs/howl/Makefile b/libs/howl/Makefile
index 89b02bab0..3b70f7d15 100644
--- a/libs/howl/Makefile
+++ b/libs/howl/Makefile
@@ -1,33 +1,30 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=howl
 PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=4
 
 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
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 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,26 +33,34 @@ 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
 
 define Package/howl-autoipd
   $(call Package/howl/Default)
-  DEPENDS:=+libhowl
+  SUBMENU:=IP Addresses and Names
+  DEPENDS:=+libhowl +libpthread
   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
+  SUBMENU:=IP Addresses and Names
+  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
 
@@ -65,19 +70,23 @@ endef
 
 define Package/howl-nifd
   $(call Package/howl/Default)
-  DEPENDS:=+libhowl
+  SUBMENU:=IP Addresses and Names
+  DEPENDS:=+libhowl +libpthread
   TITLE:=A network interface monitor daemon
-  DESCRIPTION+=\\\
-	\\\
+endef
+
+define Package/howl-nifd/description
 	This package contains a network interface monitor daemon.
 endef
 
 define Package/howl-utils
   $(call Package/howl/Default)
-  DEPENDS:=+libhowl
+  SUBMENU:=IP Addresses and Names
+  DEPENDS:=+libhowl +libpthread
   TITLE+= (utilities)
-  DESCRIPTION+=\\\
-	\\\
+endef
+
+define Package/howl-utils/description
 	This package contains mDNS (Multicast DNS) client utilities.
 endef
 
@@ -88,27 +97,15 @@ define Build/Configure
 	);
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-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,,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc
-	$(SED) 's,-L/usr/lib/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,32 +115,32 @@ 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
+	$(INSTALL_BIN) ./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
-	$(INSTALL_DATA) ./files/mDNSResponder.init $(1)/etc/init.d/mDNSResponder
+	$(INSTALL_BIN) ./files/mDNSResponder.init $(1)/etc/init.d/mDNSResponder
 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
+	$(INSTALL_BIN) ./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))