X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-daemon%2FMakefile.am;h=e1d64a4157a89b3387fa56cf56010a57d189e6f5;hb=e614891d38cae63957d0bfc00d34ecdbad4f8322;hp=0dadede2d2981ad81adad3193579a95b0d95c008;hpb=aedd4e87362371d83dd64d0bfb03ea3e5526607f;p=catta

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 0dadede..e1d64a4 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -28,7 +28,6 @@ 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/\" \
@@ -50,7 +49,8 @@ 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
@@ -83,6 +83,8 @@ endif
 
 if HAVE_DBUS
 
+dbusservicedir=$(DBUS_SYS_DIR)
+
 avahi_daemon_SOURCES += \
 	dbus-protocol.c dbus-protocol.h \
 	dbus-util.c dbus-util.h \
@@ -96,12 +98,19 @@ 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-client/check-nss.c
 
 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
@@ -114,7 +123,8 @@ introspection_DATA = \
 	ServiceBrowser.introspect \
 	ServiceResolver.introspect \
 	AddressResolver.introspect \
-	HostNameResolver.introspect
+	HostNameResolver.introspect \
+	RecordBrowser.introspect
 
 endif
 endif
@@ -124,7 +134,6 @@ EXTRA_DIST = \
 	avahi-service.dtd \
 	avahi-daemon.conf \
 	example.service \
-	dbus-test.py \
 	avahi-dbus.conf \
 	Server.introspect \
 	EntryGroup.introspect \
@@ -134,6 +143,7 @@ EXTRA_DIST = \
 	ServiceResolver.introspect \
 	AddressResolver.introspect \
 	HostNameResolver.introspect \
+	RecordBrowser.introspect \
 	ssh.service \
 	example.service \
 	introspect.dtd \