X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2FMakefile.am;h=2792f2109c6908d32cd3c79ca42918262dcce4a4;hb=519c8939aa6d436c8ed48bb0f390e9971676928f;hp=1e9db4d42e3adabbd49c10e4861787e59b65ca9b;hpb=78fb052e89e9063ab985c1ad3c3ce10e47d1621d;p=catta

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 1e9db4d..2792f21 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -19,27 +19,24 @@
 
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
+introspectiondir=$(pkgdatadir)/introspection
+dbusservicedir=$(DBUS_SYS_DIR)
 
 AM_CFLAGS= \
 	-I$(top_srcdir) \
-	-D_GNU_SOURCE \
-	-DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
-	-DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" \
-	-DAVAHI_USER=\"avahi\" \
-	-DAVAHI_GROUP=\"avahi\"
-AM_LDADD=-lexpat
+	-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)\" 
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD+=$(GLIB20_LIBS)
+AM_LDADD=-lexpat
 
 # libdaemon
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
 AM_LDADD+=$(LIBDAEMON_LIBS)
 
-
 if ENABLE_DBUS
-# DBUS
 AM_CFLAGS+=$(DBUS_CFLAGS)
 AM_LDADD+=$(DBUS_LIBS)
 endif
@@ -47,29 +44,78 @@ endif
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-bin_PROGRAMS = \
-	avahi
+sbin_PROGRAMS = \
+	avahi-daemon
+
+noinst_PROGRAMS = \
+	ini-file-parser-test
 
-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 \
+	ini-file-parser.c ini-file-parser.h
+
+avahi_daemon_CFLAGS = $(AM_CFLAGS)
+avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la 
+
+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
 
 service_DATA = \
-	example.service
+	ssh.service
 
 pkgdata_DATA = \
 	avahi-service.dtd
 
+EXTRA_DIST = \
+	avahi-service.dtd \
+	avahi-daemon.conf \
+	example.service \
+	dbus-test.py \
+	avahi-dbus.conf \
+	Server.introspect \
+	EntryGroup.introspect \
+	DomainBrowser.introspect \
+	ServiceTypeBrowser.introspect \
+	ServiceBrowser.introspect \
+	ssh.service \
+	example.service \
+	introspect.dtd \
+	introspect.xsl
+
 if ENABLE_DBUS
-avahi_SOURCES += dbus-protocol.c dbus-protocol.h
+avahi_daemon_SOURCES += \
+	dbus-protocol.c \
+	dbus-protocol.h
+
+avahi_daemon_LDADD += \
+	../avahi-common/libdbus-watch-glue.a
+
+dbusservice_DATA = avahi-dbus.conf
+
+introspection_DATA = \
+	Server.introspect \
+	EntryGroup.introspect \
+	DomainBrowser.introspect \
+	ServiceTypeBrowser.introspect \
+	ServiceBrowser.introspect
+
 endif
 
-avahi_CFLAGS = $(AM_CFLAGS)
-avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+
 
 xmllint:
 	xmllint --noout --valid example.service
+	xmllint --noout --valid Server.introspect
+	xmllint --noout --valid EntryGroup.introspect
+	xmllint --noout --valid DomainBrowser.introspect
+	xmllint --noout --valid ServiceTypeBrowser.introspect
+	xmllint --noout --valid ServiceBrowser.introspect