summaryrefslogtreecommitdiff
path: root/package/avahi
diff options
context:
space:
mode:
Diffstat (limited to 'package/avahi')
-rw-r--r--package/avahi/Config.in45
-rw-r--r--package/avahi/Config.in.lib18
-rw-r--r--package/avahi/Makefile35
3 files changed, 19 insertions, 79 deletions
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
deleted file mode 100644
index 53d0e1ff8..000000000
--- a/package/avahi/Config.in
+++ /dev/null
@@ -1,45 +0,0 @@
-config ADK_COMPILE_AVAHI
- tristate
- default n
- depends on ADK_PACKAGE_AVAHI_DAEMON || ADK_PACKAGE_AVAHI_DNSCONFD || ADK_PACKAGE_LIBAVAHI
-
-config ADK_PACKAGE_AVAHI_DAEMON
- prompt "avahi-daemon...................... An mDNS/DNS-SD (ZeroConf) implementation (daemon)"
- tristate
- default n
- select ADK_COMPILE_AVAHI
- select ADK_PACKAGE_LIBAVAHI
- select ADK_PACKAGE_LIBDAEMON
- select ADK_PACKAGE_GLIB
- help
- 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.
-
- http://www.freedesktop.org/Software/Avahi
-
- This package contains an mDNS/DNS-SD daemon.
-
-config ADK_PACKAGE_AVAHI_DNSCONFD
- prompt "avahi-dnsconfd.................. Unicast DNS server from mDNS/DNS-SD config daemon"
- tristate
- default n
- select ADK_COMPILE_AVAHI
- depends on ADK_PACKAGE_AVAHI_DAEMON
- help
- 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.
-
- http://www.freedesktop.org/Software/Avahi
-
- 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.
-
diff --git a/package/avahi/Config.in.lib b/package/avahi/Config.in.lib
deleted file mode 100644
index abfbdc426..000000000
--- a/package/avahi/Config.in.lib
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_LIBAVAHI
- prompt "libavahi.......................... An mDNS/DNS-SD (ZeroConf) implementation (library)"
- tristate
- default n
- select ADK_COMPILE_AVAHI
- help
- 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.
-
- http://www.freedesktop.org/Software/Avahi
-
- This package contains the mDNS/DNS-SD shared libraries, used by other programs.
-
-
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 7ba87d368..ec3cd6fa1 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -9,22 +9,22 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e
PKG_DESCR:= mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
PKG_SECTION:= net
-PKG_DEPENDS:= libavahi libdaemon libexpat
+PKG_DEPENDS:= libavahi libdaemon libexpat gettext
+PKG_BUILDDEP+= libdaemon expat gdbm glib gettext
PKG_URL:= http://avahi.org
PKG_SITES:= http://avahi.org/download/
-PKG_DEPENDS_1:= libavahi libdaemon avahi-daemon
-PKG_DESCR_1:= Unicast DNS server from mDNS/DNS-SD configuration daemon
-PKG_DESCR_2:= DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library
-PKG_SECTION_2:= libs
+
+PKG_DEPENDS_DNSCONFD:= libavahi libdaemon avahi-daemon
+PKG_DESCR_DNSCONFD:= Unicast DNS server from mDNS/DNS-SD configuration daemon
+PKG_DESCR_LIB:= DNS-SD over mDNS library
include ${TOPDIR}/mk/package.mk
-TLDFLAGS+= -lintl
$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DNSCONFD},${PKG_DESCR_DNSCONFD},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs))
-CONFIGURE_STYLE= gnu
+TLDFLAGS+= -lintl
CONFIGURE_ARGS+= --enable-glib \
--disable-qt3 \
--disable-qt4 \
@@ -50,29 +50,32 @@ CONFIGURE_ARGS+= --enable-glib \
--with-distro=none \
--with-avahi-user=avahi \
--with-avahi-group=avahi
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
post-install:
# avahi daemon
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi
- ${INSTALL_DATA} ./files/avahi-daemon.conf ${IDIR_AVAHI_DAEMON}/etc/avahi/
+ ${INSTALL_DATA} ./files/avahi-daemon.conf \
+ ${IDIR_AVAHI_DAEMON}/etc/avahi/
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/avahi/services
${INSTALL_DATA} ./files/service-http \
${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service
${INSTALL_DATA} ./files/service-ssh \
${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service
${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/
+ ${CP} ${WRKINST}/usr/sbin/avahi-daemon \
+ ${IDIR_AVAHI_DAEMON}/usr/sbin/
# avahi dnsconfd
${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/etc/avahi
${CP} ${WRKINST}/etc/avahi/avahi-dnsconfd.action \
${IDIR_AVAHI_DNSCONFD}/etc/avahi/
${INSTALL_DIR} ${IDIR_AVAHI_DNSCONFD}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd ${IDIR_AVAHI_DNSCONFD}/usr/sbin/
+ ${CP} ${WRKINST}/usr/sbin/avahi-dnsconfd \
+ ${IDIR_AVAHI_DNSCONFD}/usr/sbin/
# libavahi
${INSTALL_DIR} ${IDIR_LIBAVAHI}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libavahi-common.so.* ${IDIR_LIBAVAHI}/usr/lib/
- ${CP} ${WRKINST}/usr/lib/libavahi-core.so.* ${IDIR_LIBAVAHI}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libavahi-common.so* \
+ ${IDIR_LIBAVAHI}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libavahi-core.so* \
+ ${IDIR_LIBAVAHI}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk