fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-glib / Makefile.am

diff --git a/avahi-glib/Makefile.am b/avahi-glib/Makefile.am
index f5ac4cedad0f8dacc54cea57724b200c56970c1e..b5d5fba1c6d266b2a6209fc9fe95831a033e827e 100644 (file)
--- a/avahi-glib/Makefile.am
+++ b/avahi-glib/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -24,24 +22,27 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GLIB
 
-avahiincludedir=$(includedir)/avahi-glib
+avahiglibincludedir=$(includedir)/avahi-glib
 
-avahiinclude_HEADERS = \
+avahiglibinclude_HEADERS = \
        glib-watch.h \
        glib-malloc.h
 
 lib_LTLIBRARIES = \
-       libavahi-glib.la 
+       libavahi-glib.la
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
        glib-watch-test
+endif
 
 libavahi_glib_la_SOURCES = \
        glib-watch.c glib-watch.h \
        glib-malloc.h glib-malloc.c
+
 libavahi_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
 libavahi_glib_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(GLIB20_LIBS)
-libavahi_glib_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:1:0
+libavahi_glib_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_GLIB_VERSION_INFO)
 
 glib_watch_test_SOURCES = \
        glib-watch.c glib-watch.h \