Adapt to undocumented hack (passing 0:0 in tv to mean "now") that probably got introd...

[catta] / avahi-daemon / Makefile.am

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index f90b16d9c7a657bea5d04ee5b2d471f6fc23d33b..8c433d5ac8955f486751f19834458cba462b62c4 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -17,36 +17,107 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE -DAVAHI_SERVICE_DIRECTORY=\"`pwd`\"
-AM_LDADD=-lexpat
-
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD+=$(GLIB20_LIBS)
-
-if ENABLE_DBUS
-# DBUS
-AM_CFLAGS+=$(DBUS_CFLAGS)
-AM_LDADD+=$(DBUS_LIBS)
-endif
+AM_CFLAGS=-I$(top_srcdir)
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-bin_PROGRAMS = \
-       avahi
+if HAVE_LIBDAEMON
+if HAVE_EXPAT
+
+pkgsysconfdir=$(sysconfdir)/avahi
+servicedir=$(pkgsysconfdir)/services
+introspectiondir=$(pkgdatadir)/introspection
+dbusservicedir=$(DBUS_SYS_DIR)
+
+AM_CFLAGS+= \
+       -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)\" 
+
+sbin_PROGRAMS = \
+       avahi-daemon
 
-avahi_SOURCES = \
+noinst_PROGRAMS = \
+       ini-file-parser-test
+
+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) $(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
 
-if ENABLE_DBUS
-avahi_SOURCES += dbus-protocol.c dbus-protocol.h
+service_DATA = \
+       ssh.service
+
+pkgdata_DATA = \
+       avahi-service.dtd
+
+
+if HAVE_DBUS
+
+avahi_daemon_SOURCES += \
+       dbus-protocol.c \
+       dbus-protocol.h
+
+avahi_daemon_LDADD += \
+       ../avahi-common/libdbus-common.la \
+       $(DBUS_LIBS)
+
+avahi_daemon_CFLAGS += $(DBUS_CFLAGS)
+
+dbusservice_DATA = avahi-dbus.conf
+
+introspection_DATA = \
+       Server.introspect \
+       EntryGroup.introspect \
+       DomainBrowser.introspect \
+       ServiceTypeBrowser.introspect \
+       ServiceBrowser.introspect \
+       ServiceResolver.introspect \
+       AddressResolver.introspect \
+       HostNameResolver.introspect
+
+endif
+endif
 endif
 
-avahi_CFLAGS = $(AM_CFLAGS)
-avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
+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 \
+       ServiceResolver.introspect \
+       AddressResolver.introspect \
+       HostNameResolver.introspect \
+       ssh.service \
+       example.service \
+       introspect.dtd \
+       introspect.xsl
 
 xmllint:
        xmllint --noout --valid example.service
+       for F in $(introspection_DATA) ; do \
+               xmllint --noout --valid $$F ; \
+       done