X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2FMakefile.am;h=c21e30f35c859b72b09f61a256211521d24224c5;hb=7e5c846390f76a61c6c951366e11367f741b2d0f;hp=2f094905dbd718e9a5b434209763c479353b6f06;hpb=aaa1c563f5f89f3f1e333a031cf71056fdc50e5e;p=catta

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 2f09490..c21e30f 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -17,66 +15,154 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+AM_CFLAGS=-I$(top_srcdir)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+if HAVE_LIBDAEMON
+if HAVE_XML
+
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
+introspectiondir=$(pkgdatadir)/introspection
 
-AM_CFLAGS= \
-	-I$(top_srcdir) \
+AM_CFLAGS+= \
 	-DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
 	-DAVAHI_SOCKET=\"$(avahi_socket)\" \
-	-DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
-	-DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\"
-
-
-AM_LDADD=-lexpat
-
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD+=$(GLIB20_LIBS)
-
-# libdaemon
-AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
-AM_LDADD+=$(LIBDAEMON_LIBS)
-
-if ENABLE_DBUS
-# DBUS
-AM_CFLAGS+=$(DBUS_CFLAGS)
-AM_LDADD+=$(DBUS_LIBS)
+	-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)\"
+
+sbin_PROGRAMS = \
+	avahi-daemon
+
+if ENABLE_TESTS
+noinst_PROGRAMS = \
+	ini-file-parser-test
 endif
 
-# This cool debug trap works on i386/gcc only
-AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
-
-bin_PROGRAMS = \
-	avahi
-
-avahi_SOURCES = \
+avahi_daemon_SOURCES = \
 	main.c main.h \
 	simple-protocol.c simple-protocol.h \
-	static-services.c static-services.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 \
+	sd-daemon.h sd-daemon.c \
+	../avahi-client/check-nss.c
+
+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 \
+	ini-file-parser-test.c
+
+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.conf
+	avahi-daemon.conf \
+	hosts
 
 service_DATA = \
-	example.service
+	ssh.service \
+	sftp-ssh.service
 
 pkgdata_DATA = \
 	avahi-service.dtd
 
-EXTRA_DIST = avahi-service.dtd avahi.conf example.service
+if ENABLE_CHROOT
 
-if ENABLE_DBUS
-avahi_SOURCES += dbus-protocol.c dbus-protocol.h
+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-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 += \
+	$(DBUS_LIBS)
+
+avahi_daemon_CFLAGS += $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
 
-dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = avahi-dbus.conf
 
-EXTRA_DIST += $(dbusservice_DATA)
+introspection_DATA = \
+	Server.introspect \
+	EntryGroup.introspect \
+	DomainBrowser.introspect \
+	ServiceTypeBrowser.introspect \
+	ServiceBrowser.introspect \
+	ServiceResolver.introspect \
+	AddressResolver.introspect \
+	HostNameResolver.introspect \
+	RecordBrowser.introspect
+
+endif
+endif
 endif
 
-avahi_CFLAGS = $(AM_CFLAGS)
-avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+EXTRA_DIST = \
+	avahi-service.dtd \
+	avahi-daemon.conf \
+	example.service \
+	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
+	for F in $(introspection_DATA) ; do \
+		xmllint --noout --valid $$F ; \
+	done
+
+install-data-local:
+	test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
+
+update-systemd:
+	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
+	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h