* Some smaller packaging fixes

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 0682fba3cbfb1536864b65ee9e7b9be337942467..491e5cefd6a5bba1309fd26c36c51806521e00e6 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -19,13 +19,17 @@
 
 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_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
@@ -36,7 +40,6 @@ AM_LDADD+=$(GLIB20_LIBS)
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
 AM_LDADD+=$(LIBDAEMON_LIBS)
 
-
 if ENABLE_DBUS
 # DBUS
 AM_CFLAGS+=$(DBUS_CFLAGS)
@@ -46,33 +49,60 @@ endif
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-bin_PROGRAMS = \
-       avahi
+sbin_PROGRAMS = \
+       avahi-daemon
 
-avahi_SOURCES = \
+avahi_daemon_SOURCES = \
        main.c main.h \
        simple-protocol.c simple-protocol.h \
        static-services.c static-services.h
 
 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
 
 dbusservice_DATA = avahi-dbus.conf
 
-EXTRA_DIST = $(dbusservice_DATA)
+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
+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