bump version info

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 558c55a55781a0f555207e296a2bab6c0d5b65b7..23f5a97052fc1d205f54da515dfb65decf08ac09 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -35,19 +35,23 @@ AM_CFLAGS+= \
        -DAVAHI_SOCKET=\"$(avahi_socket)\" \
        -DAVAHI_SERVICE_DIR=\"$(servicedir)\" \
        -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" \
-       -DAVAHI_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" 
+       -DAVAHI_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" \
+       -DAVAHI_CONFIG_DIR=\"$(pkgsysconfdir)\"
 
 sbin_PROGRAMS = \
        avahi-daemon
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
        ini-file-parser-test
+endif
 
 avahi_daemon_SOURCES = \
        main.c main.h \
        simple-protocol.c simple-protocol.h \
        static-services.c static-services.h \
-       ini-file-parser.c ini-file-parser.h
+       ini-file-parser.c ini-file-parser.h \
+       setproctitle.c setproctitle.h
 
 avahi_daemon_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS)
 avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(LIBDAEMON_LIBS) -lexpat
@@ -68,15 +72,36 @@ service_DATA = \
 pkgdata_DATA = \
        avahi-service.dtd
 
+if ENABLE_CHROOT
+
+avahi_daemon_SOURCES += \
+       chroot.c chroot.h \
+       caps.c caps.h
+
+avahi_daemon_LDADD += -lcap
+
+endif
 
 if HAVE_DBUS
 
 avahi_daemon_SOURCES += \
-       dbus-protocol.c \
-       dbus-protocol.h
+       dbus-protocol.c dbus-protocol.h \
+       dbus-util.c dbus-util.h \
+       dbus-internal.h \
+       dbus-async-address-resolver.c \
+       dbus-async-host-name-resolver.c \
+       dbus-async-service-resolver.c \
+       dbus-domain-browser.c \
+       dbus-entry-group.c \
+       dbus-service-browser.c \
+       dbus-service-type-browser.c \
+       dbus-sync-address-resolver.c \
+       dbus-sync-host-name-resolver.c \
+       dbus-sync-service-resolver.c \
+       dbus-record-browser.c
 
 avahi_daemon_LDADD += \
-       ../avahi-common/libdbus-watch-glue.la \
+       ../avahi-common/libdbus-common.la \
        $(DBUS_LIBS)
 
 avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
@@ -88,7 +113,11 @@ introspection_DATA = \
        EntryGroup.introspect \
        DomainBrowser.introspect \
        ServiceTypeBrowser.introspect \
-       ServiceBrowser.introspect
+       ServiceBrowser.introspect \
+       ServiceResolver.introspect \
+       AddressResolver.introspect \
+       HostNameResolver.introspect \
+       RecordBrowser.introspect
 
 endif
 endif
@@ -98,13 +127,16 @@ EXTRA_DIST = \
        avahi-service.dtd \
        avahi-daemon.conf \
        example.service \
-       dbus-test.py \
        avahi-dbus.conf \
        Server.introspect \
        EntryGroup.introspect \
        DomainBrowser.introspect \
        ServiceTypeBrowser.introspect \
        ServiceBrowser.introspect \
+       ServiceResolver.introspect \
+       AddressResolver.introspect \
+       HostNameResolver.introspect \
+       RecordBrowser.introspect \
        ssh.service \
        example.service \
        introspect.dtd \
@@ -112,8 +144,6 @@ EXTRA_DIST = \
 
 xmllint:
        xmllint --noout --valid example.service
-       xmllint --noout --valid Server.introspect
-       xmllint --noout --valid EntryGroup.introspect
-       xmllint --noout --valid DomainBrowser.introspect
-       xmllint --noout --valid ServiceTypeBrowser.introspect
-       xmllint --noout --valid ServiceBrowser.introspect
+       for F in $(introspection_DATA) ; do \
+               xmllint --noout --valid $$F ; \
+       done