* add new text file "HACKING" and ignore more stuff in "common"

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index f1529840adf62ea649d965c4e9d7a94a3ac45f3a..62c2cd3aad0e94408efc5c9b2bfdb46d34a4b731 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -19,13 +19,16 @@
 
 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_DIRECTORY=\"$(servicedir)\" \
-       -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\"
+       -DAVAHI_SERVICE_DIR=\"$(servicedir)\" \
+       -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" \
+       -DAVAHI_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" 
 
 AM_LDADD=-lexpat
 
@@ -58,21 +61,37 @@ 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 Server.introspect server-introspect-xml.c
-BUILT_SOURCES = server-introspect-xml.c
+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
 
 if ENABLE_DBUS
 avahi_daemon_SOURCES += dbus-protocol.c dbus-protocol.h
 
-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
+
 endif
 
 avahi_daemon_CFLAGS = $(AM_CFLAGS)
@@ -82,6 +101,6 @@ xmllint:
        xmllint --noout --valid example.service
        xmllint --noout --valid Server.introspect
        xmllint --noout --valid EntryGroup.introspect
-
-server-introspect-xml.c: Server.introspect
-       python embedd-file.py -s $< server_introspect_xml > $@
+       xmllint --noout --valid DomainBrowser.introspect
+       xmllint --noout --valid ServiceTypeBrowser.introspect
+       xmllint --noout --valid ServiceBrowser.introspect