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

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 7081752..e1d64a4 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -28,14 +28,14 @@ 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_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" 
+	-DAVAHI_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" \
+	-DAVAHI_CONFIG_DIR=\"$(pkgsysconfdir)\"
 
 sbin_PROGRAMS = \
 	avahi-daemon
@@ -49,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
@@ -70,9 +71,20 @@ 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
 
+dbusservicedir=$(DBUS_SYS_DIR)
+
 avahi_daemon_SOURCES += \
 	dbus-protocol.c dbus-protocol.h \
 	dbus-util.c dbus-util.h \
@@ -86,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
@@ -104,7 +123,8 @@ introspection_DATA = \
 	ServiceBrowser.introspect \
 	ServiceResolver.introspect \
 	AddressResolver.introspect \
-	HostNameResolver.introspect
+	HostNameResolver.introspect \
+	RecordBrowser.introspect
 
 endif
 endif
@@ -114,7 +134,6 @@ EXTRA_DIST = \
 	avahi-service.dtd \
 	avahi-daemon.conf \
 	example.service \
-	dbus-test.py \
 	avahi-dbus.conf \
 	Server.introspect \
 	EntryGroup.introspect \
@@ -124,6 +143,7 @@ EXTRA_DIST = \
 	ServiceResolver.introspect \
 	AddressResolver.introspect \
 	HostNameResolver.introspect \
+	RecordBrowser.introspect \
 	ssh.service \
 	example.service \
 	introspect.dtd \