fix avahi_netlink_new to allow multiple netlinks per process

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

diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am
index 32390868b68509572cc6889955c051ed9129c20d..bc6714241c892f8e54502b1fc091901095a51a4e 100644 (file)
--- a/avahi-compat-howl/Makefile.am
+++ b/avahi-compat-howl/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,22 +20,37 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+SUBDIRS = . samples
+
 if HAVE_DBUS
+if ENABLE_COMPAT_HOWL
 
 avahi_compat_howldir=$(includedir)/avahi-compat-howl
+avahi_compat_howl_rendezvousdir=$(avahi_compat_howldir)/rendezvous
+avahi_compat_howl_corbydir=$(avahi_compat_howldir)/corby
+avahi_compat_howl_discoverydir=$(avahi_compat_howldir)/discovery
+avahi_compat_howl_saltdir=$(avahi_compat_howldir)/salt
 
 avahi_compat_howl_HEADERS = \
-       include/howl.h \
+       include/howl.h
+
+avahi_compat_howl_rendezvous_HEADERS = \
        include/rendezvous/rendezvous.h \
-       include/rendezvous/text_record.h \
+       include/rendezvous/text_record.h
+
+avahi_compat_howl_corby_HEADERS = \
        include/corby/message.h \
        include/corby/object.h \
        include/corby/orb.h \
        include/corby/corby.h \
        include/corby/channel.h \
-       include/corby/buffer.h \
+       include/corby/buffer.h
+
+avahi_compat_howl_discovery_HEADERS = \
        include/discovery/discovery.h \
-       include/discovery/text_record.h \
+       include/discovery/text_record.h
+
+avahi_compat_howl_salt_HEADERS = \
        include/salt/socket.h \
        include/salt/address.h \
        include/salt/platform.h \
@@ -47,33 +60,50 @@ avahi_compat_howl_HEADERS = \
        include/salt/time.h \
        include/salt/debug.h
 
-lib_LTLIBRARIES = libavahi-compat-howl.la 
+HOWLHEADERS = \
+       $(avahi_compat_howl_HEADERS) \
+       $(avahi_compat_howl_rendezvous_HEADERS) \
+       $(avahi_compat_howl_corby_HEADERS) \
+       $(avahi_compat_howl_discovery_HEADERS) \
+       $(avahi_compat_howl_salt_HEADERS)
 
-#noinst_PROGRAMS = txt-test
+lib_LTLIBRARIES = libhowl.la
 
-libavahi_compat_howl_la_SOURCES = \
-       $(avahi_compat_howl_HEADERS) \
-       warn.c warn.h
-libavahi_compat_howl_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-libavahi_compat_howl_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMPAT_HOWL_VERSION_INFO) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la
+if ENABLE_TESTS
+noinst_PROGRAMS = address-test text-test browse-domain-test
+endif
 
-#txt_test_SOURCES = \
-#      dns_sd.h \
-#      txt.c \
-#      txt-test.c \
-#      warn.c warn.h
-#txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-#txt_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+libhowl_la_SOURCES = \
+       $(HOWLHEADERS) \
+       warn.c warn.h \
+       unsupported.c \
+       address.c \
+       text.c \
+       compat.c
+libhowl_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+libhowl_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMPAT_HOWL_VERSION_INFO) $(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.
+address_test_SOURCES = \
+       $(HOWLHEADERS) \
+       address.c \
+       address-test.c \
+       warn.c warn.h
+address_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+address_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
 
-#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 
+text_test_SOURCES = \
+       $(HOWLHEADERS) \
+       text.c \
+       text-test.c \
+       warn.c warn.h
+text_test_CFLAGS = $(AM_CFLAGS)  $(PTHREAD_CFLAGS) -I $(srcdir)/include
+text_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) ../avahi-common/libavahi-common.la
 
-#CLEANFILES = libdns_sd-test.o libdns_sd-test
+browse_domain_test_SOURCES = \
+       $(HOWLHEADERS) \
+       browse-domain-test.c
+browse_domain_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
+browse_domain_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) libhowl.la
 
 endif
+endif