X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2FMakefile.am;h=3fa4280a66e78dac84622a7ec78fa53873b02747;hb=05a83734133524435127937198fcf99bb81d3607;hp=6e0ac84848be998229f1e5134550bbd2b023f1de;hpb=2d48326e6731cb9266119cd531daac0bbf683f44;p=catta

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 6e0ac84..3fa4280 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -28,13 +28,13 @@ if HAVE_EXPAT
 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,8 +50,10 @@ avahi_daemon_SOURCES = \
 	main.c main.h \
 	simple-protocol.c simple-protocol.h \
 	static-services.c static-services.h \
+	static-hosts.c static-hosts.h \
 	ini-file-parser.c ini-file-parser.h \
-	setproctitle.c setproctitle.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
@@ -64,7 +66,8 @@ 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
@@ -84,6 +87,8 @@ endif
 
 if HAVE_DBUS
 
+dbusservicedir=$(DBUS_SYS_DIR)
+
 avahi_daemon_SOURCES += \
 	dbus-protocol.c dbus-protocol.h \
 	dbus-util.c dbus-util.h \
@@ -97,12 +102,18 @@ 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)
 
+if HAVE_DLOPEN
+avahi_daemon_LDADD += -ldl
+endif
+
 avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
 
 dbusservice_DATA = avahi-dbus.conf
@@ -115,7 +126,8 @@ introspection_DATA = \
 	ServiceBrowser.introspect \
 	ServiceResolver.introspect \
 	AddressResolver.introspect \
-	HostNameResolver.introspect
+	HostNameResolver.introspect \
+	RecordBrowser.introspect
 
 endif
 endif
@@ -134,7 +146,9 @@ EXTRA_DIST = \
 	ServiceResolver.introspect \
 	AddressResolver.introspect \
 	HostNameResolver.introspect \
+	RecordBrowser.introspect \
 	ssh.service \
+	hosts \
 	example.service \
 	introspect.dtd \
 	introspect.xsl
@@ -144,3 +158,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"