fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-gobject / Makefile.am

diff --git a/avahi-gobject/Makefile.am b/avahi-gobject/Makefile.am
index e9e00a8c4858f661208ced52f0705855c2e01189..02f2b9483b4bbed6a5fa68bf844b50130d888999 100644 (file)
--- a/avahi-gobject/Makefile.am
+++ b/avahi-gobject/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
@@ -22,7 +20,11 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+EXTRA_DIST = \
+       AvahiCore-0.6.gir
+
 if HAVE_GOBJECT
+if HAVE_DBUS
 
 avahigobjectincludedir=$(includedir)/avahi-gobject
 
@@ -64,7 +66,7 @@ libavahi_gobject_la_SOURCES = \
 
 libavahi_gobject_la_CFLAGS = $(AM_CFLAGS) $(GOBJECT_CFLAGS)
 libavahi_gobject_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GOBJECT_LIBS)
-libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO)
+libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO) -export-symbols-regex '^ga_'
 
 # correctly clean the generated source files
 CLEANFILES = $(BUILT_SOURCES)
@@ -73,10 +75,10 @@ dist-hook:
        $(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done)
 
 signals-marshal.list: $(CORE_SOURCES) Makefile.am
-       ( cd $(srcdir) && \
-       sed -n -e 's/.*ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+       $(AM_V_GEN)( cd $(srcdir) && \
+       sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
                $(CORE_SOURCES) ) \
-               | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
+               | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
        if cmp -s $@.tmp $@; then \
                rm $@.tmp; \
        else \
@@ -84,15 +86,14 @@ signals-marshal.list: $(CORE_SOURCES) Makefile.am
        fi
 
 signals-marshal.h: signals-marshal.list
-       glib-genmarshal --header --prefix=ga_signals_marshal $< > $@
+       $(AM_V_GEN)glib-genmarshal --header --prefix=_ga_signals_marshal $< > $@
 
 signals-marshal.c: signals-marshal.list
-       glib-genmarshal --body --prefix=ga_signals_marshal $< > $@
-
+       $(AM_V_GEN)(echo "#include \"signals-marshal.h\"" ; glib-genmarshal --body --prefix=_ga_signals_marshal $< ) > $@
 
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
-       glib-mkenums \
+       $(AM_V_GEN)glib-mkenums \
        --fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
        --fprod "/* enumerations from \"@filename@\" */\n" \
        --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
@@ -100,14 +101,41 @@ signals-marshal.c: signals-marshal.list
        $< > $@
 
 %-enumtypes.c: %.h Makefile.in
-       glib-mkenums \
-       --fhead "#include <$*.h>" \
+       $(AM_V_GEN)glib-mkenums \
+       --fhead "#include <$*.h>\n#include<$*-enumtypes.h>" \
        --fprod "\n/* enumerations from \"@filename@\" */" \
        --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \
        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
        $< > $@
 
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = $(libavahi_gobject_la_SOURCES)
+
+Avahi-0.6.gir: $(lib_LTLIBRARIES)
+Avahi_0_6_gir_INCLUDES = GObject-2.0 AvahiCore-0.6
+Avahi_0_6_gir_CFLAGS = $(libavahi_gobject_la_CFLAGS)
+Avahi_0_6_gir_LIBS = $(lib_LTLIBRARIES)
+Avahi_0_6_gir_FILES = $(addprefix $(srcdir)/, $(CORE_SOURCES)) $(BUILT_SOURCES)
+Avahi_0_6_gir_SCANNERFLAGS = --strip-prefix=Ga
+INTROSPECTION_GIRS += Avahi-0.6.gir
+INTROSPECTION_INSTALL_GIRS = AvahiCore-0.6.gir $(INTROSPECTION_GIRS)
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_INSTALL_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_INSTALL_GIRS:.gir=.typelib)
+
+CLEANFILES += $(INTROSPECTION_GIRS) $(typelib_DATA)
+endif
+
+endif
 endif
 
 indent: