Remove an invalid optimization in avahi_simple_poll_run(). (Closes #132)

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index ff436ae2588e902220ff9c874b5373944599ae1a..cd21c11d78b8db83ea8cfe4d42090338f5b3b1de 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,9 @@ noinst_PROGRAMS = \
        domain-test \
        alternative-test \
        timeval-test \
-       watch-test
+       watch-test \
+       watch-test-thread \
+       utf8-test
 endif
 
 lib_LTLIBRARIES = \
@@ -61,11 +64,14 @@ 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
+       rlist.h rlist.c \
+       utf8.c utf8.h
 
 libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) 
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) $(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,13 +83,17 @@ alternative_test_SOURCES = \
        alternative.c alternative.h \
        malloc.c malloc.h \
        domain.c domain.h \
-       alternative-test.c
+       address.c address.h \
+       alternative-test.c \
+       utf8.c utf8.h
 alternative_test_CFLAGS = $(AM_CFLAGS)
 
 domain_test_SOURCES = \
        domain.c domain.h \
        malloc.c malloc.h \
-       domain-test.c
+       address.c address.h \
+       domain-test.c \
+       utf8.c utf8.h
 domain_test_CFLAGS = $(AM_CFLAGS)
 
 watch_test_SOURCES = \
@@ -93,13 +103,23 @@ watch_test_SOURCES = \
        malloc.c malloc.h \
        watch-test.c
 watch_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-watch_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS)
+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
 timeval_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS)
+timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
+
+utf8_test_SOURCES = \
+       utf8-test.c \
+       utf8.c utf8.h
+utf8_test_CFLAGS = $(AM_CFLAGS)
+utf8_test_LDADD = $(AM_LDADD)
 
 if HAVE_DBUS