X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Favahi%2FMakefile;h=32059cee261236ae68b4a9a9bb1a9e0de6064374;hp=ab470233f8b745a09b3ef80b173ebbf59b5528a0;hb=fe23a744b143a20a7ac81cb40db2fe018035a14e;hpb=a7f962687005e09bf2ec54d3d43c04b1a0d6ca19 diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index ab470233f8..32059cee26 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -1,26 +1,23 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2007-2009 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:=avahi -PKG_VERSION:=0.6.14 +PKG_VERSION:=0.6.25 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ -PKG_MD5SUM:=6abad76bbc2ac0f51a8869b3a2e5c238 -PKG_CAT:=zcat +PKG_MD5SUM:=a83155a6e29e3988f07e5eea3287b21e -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host -PKG_BUILDDEP:=libexpat libdaemon libgdbm +PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk @@ -28,49 +25,59 @@ define Package/avahi/Default SECTION:=net CATEGORY:=Network TITLE:=An mDNS/DNS-SD implementation - DESCRIPTION:=\ - An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library).\\\ - Avahi is a system which facilitates service discovery on a local network -- \\\ - this means that you can plug your laptop or computer into a network and \\\ - instantly be able to view other people who you can chat with, find printers \\\ - to print to or find files being shared. This kind of technology is already \\\ - found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') \\\ - and is very convenient. URL:=http://www.avahi.org/ endef +define Package/avahi/Default/description + An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library). + Avahi is a system which facilitates service discovery on a local network -- + this means that you can plug your laptop or computer into a network and + instantly be able to view other people who you can chat with, find printers + to print to or find files being shared. This kind of technology is already + found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') + and is very convenient. +endef + define Package/libavahi $(call Package/avahi/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libdaemon + DEPENDS:=+libdaemon +libpthread TITLE+= (library) - DESCRIPTION+=\\\ - \\\ - This package contains the mDNS/DNS-SD shared libraries, used by other programs. +endef + +define Package/libavahi/description +$(call Package/avahi/Default/description) + . + This package contains the mDNS/DNS-SD shared libraries, used by other programs. endef define Package/avahi-autoipd $(call Package/avahi/Default) DEPENDS:=+libdaemon TITLE:=IPv4LL network address configuration daemon - DESCRIPTION+=\\\ - \\\ - This package implements IPv4LL, "Dynamic Configuration of \\\ - IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for \\\ - automatic IP address configuration from the link-local \\\ - 169.254.0.0/16 range without the need for a central server. It \\\ - is primarily intended to be used in ad-hoc networks which lack a \\\ - DHCP server. +endef + +define Package/avahi-autoipd/description +$(call Package/avahi/Default/description) + . + This package implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local + Addresses" (IETF RFC3927), a protocol for automatic IP address configuration + from the link-local 169.254.0.0/16 range without the need for a central + server. It is primarily intended to be used in ad-hoc networks which lack a + DHCP server. endef define Package/avahi-daemon $(call Package/avahi/Default) - DEPENDS:=+libavahi + DEPENDS:=+libavahi +libexpat TITLE+= (daemon) - DESCRIPTION+=\\\ - \\\ - This package contains an mDNS/DNS-SD daemon. +endef + +define Package/avahi-daemon/description +$(call Package/avahi/Default/description) + . + This package contains an mDNS/DNS-SD daemon. endef define Package/avahi-daemon/conffiles @@ -83,48 +90,64 @@ define Package/avahi-dnsconfd $(call Package/avahi/Default) DEPENDS:=+libavahi TITLE:=An Unicast DNS server from mDNS/DNS-SD configuration daemon - DESCRIPTION+=\\\ - \\\ - This package contains an Unicast DNS server from mDNS/DNS-SD configuration \\\ - daemon, which may be used to configure conventional DNS servers using mDNS \\\ - in a DHCP-like fashion. Especially useful on IPv6. endef +define Package/avahi-dnsconfd/description +$(call Package/avahi/Default/description) + . + This package contains an Unicast DNS server from mDNS/DNS-SD configuration + daemon, which may be used to configure conventional DNS servers using mDNS + in a DHCP-like fashion. Especially useful on IPv6. +endef + +TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE + +CONFIGURE_ARGS+= \ + --enable-shared \ + --enable-static \ + --disable-glib \ + --disable-gobject \ + --disable-qt3 \ + --disable-qt4 \ + --disable-gtk \ + --disable-dbus \ + --with-xml=expat \ + --disable-dbm \ + --enable-gdbm \ + --enable-libdaemon \ + --disable-python \ + --disable-pygtk \ + --disable-python-dbus \ + --disable-mono \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-doxygen-dot \ + --disable-doxygen-man \ + --disable-doxygen-rtf \ + --disable-doxygen-xml \ + --disable-doxygen-chm \ + --disable-doxygen-chi \ + --disable-doxygen-html \ + --disable-doxygen-ps \ + --disable-doxygen-pdf \ + --disable-xmltoman \ + --with-distro=none \ + --with-avahi-user=nobody \ + --with-avahi-group=nogroup \ + --with-autoipd-user=nobody \ + --with-autoipd-group=nogroup + +ifneq ($(CONFIG_SSP_SUPPORT),y) +CONFIGURE_ARGS+= \ + --disable-stack-protector +endif + +CONFIGURE_VARS+= \ + CFLAGS="$$$$CFLAGS -DNDEBUG" \ + define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - --disable-glib \ - --disable-qt3 \ - --disable-qt4 \ - --disable-gtk \ - --disable-dbus \ - --enable-expat \ - --disable-dbm \ - --enable-gdbm \ - --enable-libdaemon \ - --disable-python \ - --disable-pygtk \ - --disable-python-dbus \ - --disable-mono \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-doxygen-dot \ - --disable-doxygen-man \ - --disable-doxygen-rtf \ - --disable-doxygen-xml \ - --disable-doxygen-chm \ - --disable-doxygen-chi \ - --disable-doxygen-html \ - --disable-doxygen-ps \ - --disable-doxygen-pdf \ - --disable-xmltoman \ - --with-distro=none \ - --with-avahi-user=nobody \ - --with-avahi-group=nogroup \ - , \ - CFLAGS="$$$$CFLAGS -DNDEBUG" \ - ) + ( cd $(PKG_BUILD_DIR); aclocal; libtoolize; autoreconf; ); + $(call Build/Configure/Default) endef define Build/Compile @@ -134,51 +157,43 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc - $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc -endef - -define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/avahi-{common,core} \ - $(STAGING_DIR)/usr/lib/libavahi-{common,core}.{a,so*} \ - $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(1)/usr/lib/pkgconfig/ endef define Package/libavahi/install - install -d -m0755 $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ endef define Package/avahi-autoipd/install - install -d -m0755 $(1)/etc/avahi + $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/ - install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/ endef define Package/avahi-daemon/install - install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/ - install -d -m0755 $(1)/etc/avahi - install -m0644 ./files/avahi-daemon.conf $(1)/etc/avahi/ - install -d -m0755 $(1)/etc/avahi/services - install -m0644 ./files/service-http $(1)/etc/avahi/services/http.service - install -m0644 ./files/service-ssh $(1)/etc/avahi/services/ssh.service - install -d -m0755 $(1)/etc/init.d - install -m0755 ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/avahi + $(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/ + $(INSTALL_DIR) $(1)/etc/avahi/services + $(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service + $(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon endef define Package/avahi-dnsconfd/install - install -d -m0755 $(1)/etc/avahi + $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ - install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ endef $(eval $(call BuildPackage,libavahi)) @@ -186,6 +201,3 @@ $(eval $(call BuildPackage,avahi-autoipd)) $(eval $(call BuildPackage,avahi-daemon)) $(eval $(call BuildPackage,avahi-dnsconfd)) -$(eval $(call RequireCommand,pkg-config, \ - $(PKG_NAME) requires pkg-config. \ -))