X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2FMakefile.am;h=622b4de6f8f9739b42b164be69ac7b0d023f826f;hb=7f72e93ab47a02f3e3fe04a0ff72236dd27cc496;hp=558c55a55781a0f555207e296a2bab6c0d5b65b7;hpb=f1167112d926b189fe189599576e8588923f036c;p=catta

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 558c55a..622b4de 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -23,34 +23,41 @@ 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_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" 
+	-DAVAHI_HOSTS_FILE=\"$(pkgsysconfdir)/hosts\" \
+	-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
+	static-hosts.c static-hosts.h \
+	ini-file-parser.c ini-file-parser.h \
+	setproctitle.c setproctitle.h \
+	../avahi-client/check-nss.c \
+	inotify-nosys.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
+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 \
@@ -60,26 +67,56 @@ 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
 
+if ENABLE_CHROOT
+
+avahi_daemon_SOURCES += \
+	chroot.c chroot.h \
+	caps.c caps.h
+
+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-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-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-watch-glue.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
 
@@ -88,7 +125,11 @@ introspection_DATA = \
 	EntryGroup.introspect \
 	DomainBrowser.introspect \
 	ServiceTypeBrowser.introspect \
-	ServiceBrowser.introspect
+	ServiceBrowser.introspect \
+	ServiceResolver.introspect \
+	AddressResolver.introspect \
+	HostNameResolver.introspect \
+	RecordBrowser.introspect
 
 endif
 endif
@@ -98,22 +139,28 @@ 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 \
+	sftp-ssh.service \
+	hosts \
 	example.service \
 	introspect.dtd \
 	introspect.xsl
 
 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
+
+install-data-local:
+	test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"