fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-compat-libdns_sd / Makefile.am

diff --git a/avahi-compat-libdns_sd/Makefile.am b/avahi-compat-libdns_sd/Makefile.am
index 2b650595e5ecc986d17beca70eda96304d405c59..9a66bc0d12d9047c246f4ee6d8ea3eeb1e6a99b1 100644 (file)
--- a/avahi-compat-libdns_sd/Makefile.am
+++ b/avahi-compat-libdns_sd/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
@@ -23,23 +21,26 @@ AM_CFLAGS=-I$(top_srcdir)
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_DBUS
+if ENABLE_COMPAT_LIBDNS_SD
 
 avahi_compat_libdns_sddir=$(includedir)/avahi-compat-libdns_sd
 
 avahi_compat_libdns_sd_HEADERS = dns_sd.h
 
-lib_LTLIBRARIES = libavahi-compat-libdns_sd.la 
+lib_LTLIBRARIES = libdns_sd.la
 
-noinst_PROGRAMS = txt-test
+if ENABLE_TESTS
+noinst_PROGRAMS = txt-test null-test
+endif
 
-libavahi_compat_libdns_sd_la_SOURCES = \
+libdns_sd_la_SOURCES = \
        dns_sd.h \
        compat.c \
        txt.c \
        unsupported.c \
        warn.c warn.h
-libavahi_compat_libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-libavahi_compat_libdns_sd_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+libdns_sd_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+libdns_sd_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
 
 txt_test_SOURCES = \
        dns_sd.h \
@@ -47,17 +48,26 @@ txt_test_SOURCES = \
        txt-test.c \
        warn.c warn.h
 txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-txt_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
+
+null_test_SOURCES = \
+       dns_sd.h \
+       compat.c \
+       null-test.c \
+       warn.c warn.h
+null_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+null_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
 
 # You can test the compatibility layer by sticking in mDNSResponder's
 # dns-sd.c source here, naming it "libdns_sd-test.c" and running "make
 # libdns_sd-test" manually. We do not distribute that file due to
 # licensing restrictions.
 
-libdns_sd-test: libdns_sd-test.c libavahi-compat-libdns_sd.la
-       $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c 
-       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libavahi-compat-libdns_sd.la 
+libdns_sd-test: libdns_sd-test.c libdns_sd.la
+       $(LIBTOOL) --mode=compile $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test.o -c libdns_sd-test.c
+       $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(PTHREAD_CFLAGS) -o libdns_sd-test libdns_sd-test.o $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la libdns_sd.la
 
 CLEANFILES = libdns_sd-test.o libdns_sd-test
 
 endif
+endif