* fix avahi-dnsconfd forking
* clean up init script output a little
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@269
941a03a8-eaeb-0310-b9a0-
b1bbd8fe43fe
lib_LTLIBRARIES = \
libavahi-common.la
lib_LTLIBRARIES = \
libavahi-common.la
-noinst_LIBRARIES = \
- libavahi-common-static.a
-
libavahi_common_la_SOURCES = \
address.c address.h \
strlst.c strlst.h \
libavahi_common_la_SOURCES = \
address.c address.h \
strlst.c strlst.h \
libavahi_common_la_CFLAGS = $(AM_CFLAGS)
libavahi_common_la_LIBADD = $(AM_LDADD)
libavahi_common_la_CFLAGS = $(AM_CFLAGS)
libavahi_common_la_LIBADD = $(AM_LDADD)
-libavahi_common_static_a_SOURCES = $(libavahi_common_la_SOURCES)
-libavahi_common_static_a_CFLAGS = $(AM_CFLAGS)
-libavahi_common_static_a_LIBADD =
-
strlst_test_SOURCES = \
strlst.c strlst.h \
strlst_test_SOURCES = \
strlst.c strlst.h \
strlst_test_CFLAGS = $(AM_CFLAGS)
strlst_test_LDADD = $(AM_LDADD)
alternative_test_SOURCES = \
alternative.c alternative.h \
strlst_test_CFLAGS = $(AM_CFLAGS)
strlst_test_LDADD = $(AM_LDADD)
alternative_test_SOURCES = \
alternative.c alternative.h \
alternative_test_CFLAGS = $(AM_CFLAGS)
alternative_test_LDADD = $(AM_LDADD)
alternative_test_CFLAGS = $(AM_CFLAGS)
alternative_test_LDADD = $(AM_LDADD)
# Import stuff from avahi-common
AM_CFLAGS+=-I$(top_srcdir)/avahi-common
COMMON_LDADD=../avahi-common/libavahi-common.la
# Import stuff from avahi-common
AM_CFLAGS+=-I$(top_srcdir)/avahi-common
COMMON_LDADD=../avahi-common/libavahi-common.la
-STATIC_COMMON_LDADD=../avahi-common/libavahi-common-static.a
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
prioq-test.c \
prioq.c prioq.h
prioq_test_CFLAGS = $(AM_CFLAGS)
prioq-test.c \
prioq.c prioq.h
prioq_test_CFLAGS = $(AM_CFLAGS)
-prioq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
- avahi-test.c \
- $(libavahi_core_la_SOURCES)
avahi_test_CFLAGS = $(AM_CFLAGS)
avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
conformance_test_SOURCES = \
conformance_test_SOURCES = \
- conformance-test.c \
- $(libavahi_core_la_SOURCES)
conformance_test_CFLAGS = $(AM_CFLAGS)
conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
avahi_reflector_SOURCES = \
avahi_reflector_SOURCES = \
- avahi-reflector.c \
- $(libavahi_core_la_SOURCES)
avahi_reflector_CFLAGS = $(AM_CFLAGS)
avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
dns_test_SOURCES = \
dns.c dns.h \
dns-test.c \
log.c log.h
dns_test_CFLAGS = $(AM_CFLAGS)
dns_test_SOURCES = \
dns.c dns.h \
dns-test.c \
log.c log.h
dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
timeeventq_test_SOURCES = \
timeeventq-test.c \
timeeventq.h timeeventq.c \
prioq.h prioq.c
timeeventq_test_CFLAGS = $(AM_CFLAGS)
timeeventq_test_SOURCES = \
timeeventq-test.c \
timeeventq.h timeeventq.c \
prioq.h prioq.c
timeeventq_test_CFLAGS = $(AM_CFLAGS)
-timeeventq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
valgrind: avahi-test
libtool --mode=execute valgrind ./avahi-test
valgrind: avahi-test
libtool --mode=execute valgrind ./avahi-test
dbus_protocol_shutdown();
#endif
dbus_protocol_shutdown();
#endif
if (avahi_server)
avahi_server_free(avahi_server);
if (avahi_server)
avahi_server_free(avahi_server);
if (daemonize)
daemon_retval_send(0);
if (daemonize)
daemon_retval_send(0);
while (!quit) {
fd_set rfds, wfds;
while (!quit) {
fd_set rfds, wfds;
+ if (ret != 0 && daemonize)
+ daemon_retval_send(1);
+
#set -e
PATH=/sbin:/bin:/usr/sbin:/usr/bin
#set -e
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Avahi mDNS/DNS-SD daemon"
+DESC="Avahi mDNS/DNS-SD Daemon"
NAME="avahi-daemon"
DAEMON="@sbindir@/$NAME"
NAME="avahi-daemon"
DAEMON="@sbindir@/$NAME"
#set -e
PATH=/sbin:/bin:/usr/sbin:/usr/bin
#set -e
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Avahi Dns Config daemon"
+DESC="Avahi Unicast DNS Configuration Daemon"
NAME="avahi-dnsconfd"
DAEMON="@sbindir@/$NAME"
NAME="avahi-dnsconfd"
DAEMON="@sbindir@/$NAME"