DBUS: finish introspection support

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 3a033934d93d5f2945a88e0b1a200ccb34281a3b..b56aa554c60716d347e4b572fc13de46801ba29d 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 52 2005-05-06 16:23:30Z lennart $
+# $Id$
 #
 # This file is part of avahi.
 # 
@@ -17,26 +17,88 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
+pkgsysconfdir=$(sysconfdir)/avahi
+servicedir=$(pkgsysconfdir)/services
+introspectiondir=$(pkgdatadir)/introspection
+dbusservicedir=$(DBUS_SYS_DIR)
+
+AM_CFLAGS= \
+       -I$(top_srcdir) \
+       -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)\" 
+
+AM_LDADD=-lexpat
 
 # GLIB 2.0
 AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+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")'
 
+sbin_PROGRAMS = \
+       avahi-daemon
+
+avahi_daemon_SOURCES = \
+       main.c main.h \
+       simple-protocol.c simple-protocol.h \
+       static-services.c static-services.h
+
+pkgsysconf_DATA = \
+       avahi-daemon.conf
+
+service_DATA = \
+       example.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
+
 if ENABLE_DBUS
-bin_PROGRAMS = \
-       avahi
+avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h
 
-avahi_SOURCES = \
-       main.c
+dbusservice_DATA = avahi-dbus.conf
+
+introspection_DATA = \
+       Server.introspect \
+       EntryGroup.introspect \
+       DomainBrowser.introspect \
+       ServiceTypeBrowser.introspect \
+       ServiceBrowser.introspect
 
-avahi_CFLAGS = $(AM_CFLAGS)
-avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
 endif
+
+avahi_daemon_CFLAGS = $(AM_CFLAGS)
+avahi_daemon_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