watch.h \
timeval.h \
simple-watch.h \
- gccmacro.h
-
-noinst_HEADERS = \
- llist.h
+ thread-watch.h \
+ gccmacro.h \
+ error.h \
+ llist.h \
+ rlist.h
+if ENABLE_TESTS
noinst_PROGRAMS = \
strlst-test \
domain-test \
alternative-test \
timeval-test \
- watch-test
+ watch-test \
+ watch-test-thread
+endif
lib_LTLIBRARIES = \
libavahi-common.la
domain.c domain.h \
timeval.c timeval.h \
simple-watch.c simple-watch.h \
- watch.h gccmacro.h
+ thread-watch.c thread-watch.h \
+ watch.h gccmacro.h \
+ rlist.h rlist.c
-libavahi_common_la_CFLAGS = $(AM_CFLAGS)
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+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 \
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)
watch.h \
malloc.c malloc.h \
watch-test.c
-watch_test_CFLAGS = $(AM_CFLAGS)
+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
-timeval_test_CFLAGS = $(AM_CFLAGS)
+timeval_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
if HAVE_DBUS
-noinst_HEADERS += \
+noinst_HEADERS = \
dbus.h \
dbus-watch-glue.h
-noinst_LTLIBRARIES = \
- libdbus-watch-glue.la \
- libdbus-watch-glue-pic.la
-
-libdbus_watch_glue_la_SOURCES = \
- dbus-watch-glue.h dbus-watch-glue.c
-libdbus_watch_glue_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libdbus_watch_glue_la_LDFLAGS = $(AM_LDFLAGS) -all-static
-
-libdbus_watch_glue_pic_la_SOURCES = $(libdbus_watch_glue_la_SOURCES)
-libdbus_watch_glue_pic_la_CFLAGS = $(libdbus_watch_glue_la_CFLAGS) -fPIC
-libdbus_watch_glue_pic_la_LDFLAGS = $(libdbus_watch_glue_la_LDFLAGS)
-
endif