fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-sharp / Makefile.am

diff --git a/avahi-sharp/Makefile.am b/avahi-sharp/Makefile.am
index 80fd06e9a8ab657b26c8e461b8b266cfa99a14e9..1fdb1ca3d3f733b5642ff63f43674be69caedc9d 100644 (file)
--- a/avahi-sharp/Makefile.am
+++ b/avahi-sharp/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -30,6 +28,7 @@ AVAHISOURCES =                                \
        $(srcdir)/DomainBrowser.cs      \
        $(srcdir)/EntryGroup.cs         \
        $(srcdir)/HostNameResolver.cs   \
+       $(srcdir)/RecordBrowser.cs      \
        $(srcdir)/ResolverBase.cs       \
        $(srcdir)/ServiceBrowser.cs     \
        $(srcdir)/ServiceResolver.cs    \
@@ -47,31 +46,37 @@ EXTRA_DIST =                                \
        $(srcdir)/gencfg.sh
 
 $(ASSEMBLY): $(AVAHISOURCES)
-       mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix
+       $(AM_V_GEN)MONO_SHARED_DIR=. mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix
 
 
 $(ASSEMBLY).config: $(ASSEMBLY).config.in
-       $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \
-               $(top_builddir)/avahi-common/libavahi-common.la < $< > $@
+       $(AM_V_GEN)$(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \
+               $(top_builddir)/avahi-common/libavahi-common.la \
+               $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@
 
 if HAVE_MONO
+if HAVE_DBUS
 all: $(ASSEMBLY) $(ASSEMBLY).config
 
 if HAVE_MONODOC
 update-docs: $(ASSEMBLY)
-       $(MONODOCER) -assembly:$(ASSEMBLY) -path:en
+       $(AM_V_GEN)$(MONODOCER) -assembly:$(ASSEMBLY) -path:en
+
+avahi-sharp-docs.zip: avahi-sharp-docs.tree
 
-avahi-sharp-docs.zip: $(srcdir)/en/*/*
-       $(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
+avahi-sharp-docs.tree: $(srcdir)/en/*/*
+       $(AM_V_GEN)$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
 
-docdir = $(MONODOC_DIR)
-doc_DATA = avahi-sharp-docs.zip avahi-sharp-docs.tree avahi-sharp-docs.source
+monodocdir = $(MONODOC_DIR)
+monodoc_DATA = avahi-sharp-docs.zip avahi-sharp-docs.tree avahi-sharp-docs.source
 
 endif
 
 install-data-hook: $(ASSEMBLY)
-       $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+       $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
 
 uninstall-hook: $(ASSEMBLY)
-       $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+       $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+
+endif
 endif