Drop private inotify code

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 0dadede2d2981ad81adad3193579a95b0d95c008..0aac0fc9ab8410c6e30e777118be6beb25f3cbf3 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -23,18 +23,18 @@ AM_CFLAGS=-I$(top_srcdir)
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_LIBDAEMON
-if HAVE_EXPAT
+if HAVE_XML
 
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
 introspectiondir=$(pkgdatadir)/introspection
-dbusservicedir=$(DBUS_SYS_DIR)
 
 AM_CFLAGS+= \
        -DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
        -DAVAHI_SOCKET=\"$(avahi_socket)\" \
        -DAVAHI_SERVICE_DIR=\"$(servicedir)\" \
        -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" \
+       -DAVAHI_HOSTS_FILE=\"$(pkgsysconfdir)/hosts\" \
        -DAVAHI_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" \
        -DAVAHI_CONFIG_DIR=\"$(pkgsysconfdir)\"
 
@@ -50,10 +50,13 @@ 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
+       static-hosts.c static-hosts.h \
+       ini-file-parser.c ini-file-parser.h \
+       setproctitle.c setproctitle.h \
+       ../avahi-client/check-nss.c
 
-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
+avahi_daemon_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS) $(XML_CFLAGS)
+avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(LIBDAEMON_LIBS) $(XML_LIBS)
 
 ini_file_parser_test_SOURCES = \
        ini-file-parser.c ini-file-parser.h \
@@ -63,10 +66,12 @@ ini_file_parser_test_CFLAGS = $(AM_CFLAGS)
 ini_file_parser_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la 
 
 pkgsysconf_DATA = \
-       avahi-daemon.conf
+       avahi-daemon.conf \
+       hosts
 
 service_DATA = \
-       ssh.service
+       ssh.service \
+       sftp-ssh.service
 
 pkgdata_DATA = \
        avahi-service.dtd
@@ -81,8 +86,14 @@ avahi_daemon_LDADD += -lcap
 
 endif
 
+if HAVE_DLOPEN
+avahi_daemon_LDADD += -ldl
+endif
+
 if HAVE_DBUS
 
+dbusservicedir=$(DBUS_SYS_DIR)
+
 avahi_daemon_SOURCES += \
        dbus-protocol.c dbus-protocol.h \
        dbus-util.c dbus-util.h \
@@ -96,13 +107,15 @@ avahi_daemon_SOURCES += \
        dbus-service-type-browser.c \
        dbus-sync-address-resolver.c \
        dbus-sync-host-name-resolver.c \
-       dbus-sync-service-resolver.c    
+       dbus-sync-service-resolver.c \
+       dbus-record-browser.c  \
+       ../avahi-common/dbus.c ../avahi-common/dbus.h \
+       ../avahi-common/dbus-watch-glue.c ../avahi-common/dbus-watch-glue.h
 
 avahi_daemon_LDADD += \
-       ../avahi-common/libdbus-common.la \
        $(DBUS_LIBS)
 
-avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
+avahi_daemon_CFLAGS += $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
 
 dbusservice_DATA = avahi-dbus.conf
 
@@ -114,7 +127,8 @@ introspection_DATA = \
        ServiceBrowser.introspect \
        ServiceResolver.introspect \
        AddressResolver.introspect \
-       HostNameResolver.introspect
+       HostNameResolver.introspect \
+       RecordBrowser.introspect
 
 endif
 endif
@@ -124,7 +138,6 @@ EXTRA_DIST = \
        avahi-service.dtd \
        avahi-daemon.conf \
        example.service \
-       dbus-test.py \
        avahi-dbus.conf \
        Server.introspect \
        EntryGroup.introspect \
@@ -134,7 +147,10 @@ EXTRA_DIST = \
        ServiceResolver.introspect \
        AddressResolver.introspect \
        HostNameResolver.introspect \
+       RecordBrowser.introspect \
        ssh.service \
+       sftp-ssh.service \
+       hosts \
        example.service \
        introspect.dtd \
        introspect.xsl
@@ -144,3 +160,6 @@ xmllint:
        for F in $(introspection_DATA) ; do \
                xmllint --noout --valid $$F ; \
        done
+
+install-data-local:
+       test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"