X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Favahi%2FMakefile;h=5372492a363135202d8b004be278b5e92985a3bc;hp=8f5e88ca5f74146dfffb93937f11e86ce4eb6afe;hb=b51d30b996f84f926d1c9aad384db388ce2473f3;hpb=0e731f4c739425d6b9f8038539ab552dce570570 diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index 8f5e88ca5f..5372492a36 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -1,30 +1,36 @@ # - -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-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:=avahi -PKG_VERSION:=0.6.23 +PKG_VERSION:=0.6.30 PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ -PKG_MD5SUM:=aab1a304851d8145ea5f6a85c10af9e9 +PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 + +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread + +PKG_FIXUP:=autoreconf +PKG_REMOVE_FILES:=autogen.sh -PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk define Package/avahi/Default SECTION:=net CATEGORY:=Network - TITLE:=An mDNS/DNS-SD implementation + TITLE:=mDNS/DNS-SD URL:=http://www.avahi.org/ endef @@ -42,20 +48,51 @@ define Package/libavahi $(call Package/avahi/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libdaemon +libpthread + DEPENDS:=+libdaemon +libpthread +libgdbm TITLE+= (library) + VARIANT:=nodbus +endef + +define Package/libavahi-dbus + $(call Package/avahi/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libdaemon +libpthread +libgdbm +dbus @!LINUX_2_4 + TITLE+= (library) (dbus) + VARIANT:=dbus endef define Package/libavahi/description -$(call Package/avahi/Default/description) +$(call Package/avahi/Default/description) + . + This package contains the mDNS/DNS-SD shared libraries, used by other programs. + Specifically, it provides libavahi-core and libavahi-common libraries. + This version is compiled without D-Bus support, i.e. the --disable-dbus + compilation flag is set. +endef + +define Package/libavahi-dbus/description +$(call Package/avahi/Default/description) . This package contains the mDNS/DNS-SD shared libraries, used by other programs. + Specifically, it provides libavahi-core and libavahi-common libraries. + This version is compiled with D-Bus support endef define Package/avahi-autoipd $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names DEPENDS:=+libdaemon - TITLE:=IPv4LL network address configuration daemon + TITLE:=IPv4LL address conf daemon + VARIANT:=nodbus +endef + +define Package/avahi-autoipd-dbus + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libdaemon + TITLE:=IPv4LL address conf daemon (dbus) + VARIANT:=dbus endef define Package/avahi-autoipd/description @@ -66,12 +103,36 @@ $(call Package/avahi/Default/description) 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. + . + This verison is compile along with non-D-Bus version of libavahi. +endef + +define Package/avahi-autoipd-dbus/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. + . + This version is compiled along with the D-Bus version of libavahi. endef define Package/avahi-daemon $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names DEPENDS:=+libavahi +libexpat TITLE+= (daemon) + VARIANT:=nodbus +endef + +define Package/avahi-daemon-dbus + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libavahi-dbus +libexpat + TITLE+= (daemon) (dbus) + VARIANT:=dbus endef define Package/avahi-daemon/description @@ -80,26 +141,98 @@ $(call Package/avahi/Default/description) This package contains an mDNS/DNS-SD daemon. endef +define Package/avahi-daemon-dbus/description +$(call Package/avahi/Default/description) + . + This package contains an mDNS/DNS-SD daemon with dbus support. +endef + define Package/avahi-daemon/conffiles /etc/avahi/avahi-daemon.conf /etc/avahi/services/http.service /etc/avahi/services/ssh.service endef +define Package/avahi-daemon-dbus/conffiles +/etc/avahi/avahi-daemon.conf +/etc/avahi/services/http.service +/etc/avahi/services/ssh.service +endef + define Package/avahi-dnsconfd $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names DEPENDS:=+libavahi - TITLE:=An Unicast DNS server from mDNS/DNS-SD configuration daemon + TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon + VARIANT:=nodbus +endef + +define Package/avahi-dnsconfd-dbus + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libavahi-dbus + TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon with dbus support + VARIANT:=dbus endef define Package/avahi-dnsconfd/description $(call Package/avahi/Default/description) . - This package contains an Unicast DNS server from mDNS/DNS-SD configuration + This package contains a 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. + . + This version does not have D-Bus support. endef +define Package/avahi-dnsconfd-dbus/description +$(call Package/avahi/Default/description) + . + This package contains a 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. + . + This version has D-Bus support. +endef + +define Package/libavahi-client + $(call Package/avahi/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libavahi-dbus + TITLE+= (libavahi-client library) + VARIANT:=dbus +endef + +define Package/libavahi-client/description +$(call Package/avahi/Default/description) + . + This packages adds the libavahi-client library. + For more information please see the avahi documentation. + . + Requires D-Bus support. +endef + +define Package/avahi-utils + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libavahi-client + TITLE+= (utilities) + VARIANT:=dbus +endef + +define Package/avahi-utils/description +$(call Package/avahi/Default/description) + . + This packages installs the following avahi utility programs: + avahi-browse, avahi-publish, avahi-resolve, avahi-set-host-name. + For more information please see the avahi documentation. + . + Requires D-Bus support. +endef + +TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE + CONFIGURE_ARGS+= \ --enable-shared \ --enable-static \ @@ -108,7 +241,7 @@ CONFIGURE_ARGS+= \ --disable-qt3 \ --disable-qt4 \ --disable-gtk \ - --disable-dbus \ + --disable-gtk3 \ --with-xml=expat \ --disable-dbm \ --enable-gdbm \ @@ -140,22 +273,32 @@ CONFIGURE_ARGS+= \ --disable-stack-protector endif +ifeq ($(BUILD_VARIANT),dbus) +CONFIGURE_ARGS += \ + --enable-dbus +endif +ifeq ($(BUILD_VARIANT),nodbus) +CONFIGURE_ARGS += \ + --disable-dbus +endif + CONFIGURE_VARS+= \ - CFLAGS="$$$$CFLAGS -DNDEBUG" \ + CFLAGS="$$$$CFLAGS -DNDEBUG -DDISABLE_SYSTEMD" \ -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef -define Build/InstallDev - 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/ +define Package/libavahi-dbus/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/etc/dbus-1/system.d + $(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d endef define Package/libavahi/install @@ -163,6 +306,16 @@ define Package/libavahi/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ endef +define Package/libavahi-client/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-client.so.* $(1)/usr/lib/ +endef + +define Package/avahi-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ +endef + define Package/avahi-autoipd/install $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/ @@ -182,6 +335,18 @@ define Package/avahi-daemon/install $(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon endef +define Package/avahi-daemon-dbus/install + $(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_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ @@ -189,12 +354,21 @@ define Package/avahi-dnsconfd/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ endef +define Package/avahi-dnsconfd-dbus/install + $(INSTALL_DIR) $(1)/etc/avahi + $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,libavahi-client)) +$(eval $(call BuildPackage,avahi-utils)) +$(eval $(call BuildPackage,libavahi-dbus)) $(eval $(call BuildPackage,libavahi)) $(eval $(call BuildPackage,avahi-autoipd)) +$(eval $(call BuildPackage,avahi-autoipd-dbus)) $(eval $(call BuildPackage,avahi-daemon)) +$(eval $(call BuildPackage,avahi-daemon-dbus)) $(eval $(call BuildPackage,avahi-dnsconfd)) - -$(eval $(call RequireCommand,intltool-update, \ - $(PKG_NAME) requires intltool >= 0.35.0 \ -)) +$(eval $(call BuildPackage,avahi-dnsconfd-dbus))