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

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index ed231a6..6e0ac84 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -17,66 +17,130 @@
 # 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_EXPAT
+
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
+introspectiondir=$(pkgdatadir)/introspection
+dbusservicedir=$(DBUS_SYS_DIR)
 
-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-daemon.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)
-endif
-
-# This cool debug trap works on i386/gcc only
-AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+	-DAVAHI_SERVICE_DIR=\"$(servicedir)\" \
+	-DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" \
+	-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
+	static-services.c static-services.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
+
+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-daemon.conf
 
 service_DATA = \
-	example.service
+	ssh.service
 
 pkgdata_DATA = \
 	avahi-service.dtd
 
-EXTRA_DIST = avahi-service.dtd avahi-daemon.conf example.service dbus-test.py
+if ENABLE_CHROOT
+
+avahi_daemon_SOURCES += \
+	chroot.c chroot.h \
+	caps.c caps.h
 
-if ENABLE_DBUS
-avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h
+avahi_daemon_LDADD += -lcap
+
+endif
+
+if HAVE_DBUS
+
+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	
+
+avahi_daemon_LDADD += \
+	../avahi-common/libdbus-common.la \
+	$(DBUS_LIBS)
+
+avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
 
-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
+
+endif
+endif
 endif
 
-avahi_daemon_CFLAGS = $(AM_CFLAGS)
-avahi_daemon_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 \
+	ssh.service \
+	example.service \
+	introspect.dtd \
+	introspect.xsl
 
 xmllint:
 	xmllint --noout --valid example.service
-	xmllint --noout --valid Server.introspect
+	for F in $(introspection_DATA) ; do \
+		xmllint --noout --valid $$F ; \
+	done