add an 'Error' property to ClientStateArgs

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index f9fdef4b76b4fa9e5a77e0f5d88d92d8b7ba20f4..c7869544713a9b467b94c5a7f9b59f60272d6b9e 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -35,6 +35,7 @@ avahi_commoninclude_HEADERS = \
        watch.h \
        timeval.h \
        simple-watch.h \
+       thread-watch.h \
        gccmacro.h \
        error.h \
        llist.h \
@@ -46,7 +47,8 @@ noinst_PROGRAMS = \
        domain-test \
        alternative-test \
        timeval-test \
-       watch-test
+       watch-test \
+       watch-test-thread
 endif
 
 lib_LTLIBRARIES = \
@@ -61,11 +63,13 @@ libavahi_common_la_SOURCES = \
        domain.c domain.h \
        timeval.c timeval.h \
        simple-watch.c simple-watch.h \
+       thread-watch.c thread-watch.h \
        watch.h gccmacro.h \
        rlist.h rlist.c
 
 libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) 
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
        strlst.c strlst.h \
@@ -77,12 +81,14 @@ alternative_test_SOURCES = \
        alternative.c alternative.h \
        malloc.c malloc.h \
        domain.c domain.h \
+       address.c address.h \
        alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
 
 domain_test_SOURCES = \
        domain.c domain.h \
        malloc.c malloc.h \
+       address.c address.h \
        domain-test.c
 domain_test_CFLAGS = $(AM_CFLAGS)
 
@@ -95,6 +101,10 @@ watch_test_SOURCES = \
 watch_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 watch_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
 
+watch_test_thread_SOURCES = $(watch_test_SOURCES) thread-watch.c thread-watch.h
+watch_test_thread_CFLAGS = $(watch_test_CFLAGS) -DUSE_THREAD
+watch_test_thread_LDADD = $(watch_test_LDADD)
+
 timeval_test_SOURCES = \
        timeval.c timeval.h \
        timeval-test.c