X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=cd21c11d78b8db83ea8cfe4d42090338f5b3b1de;hb=41f897e018ee55395441504c0cf3aef584527dd9;hp=a580a9d579bd1895e0baef7c46851ca58ac3d3fc;hpb=ec27d6612430992e3524901d5ac9113169822ab6;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index a580a9d..cd21c11 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -35,18 +35,22 @@ avahi_commoninclude_HEADERS = \
 	watch.h \
 	timeval.h \
 	simple-watch.h \
+	thread-watch.h \
 	gccmacro.h \
-	error.h
-
-noinst_HEADERS = \
-	llist.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 \
+	utf8-test
+endif
 
 lib_LTLIBRARIES = \
 	libavahi-common.la 
@@ -60,10 +64,14 @@ libavahi_common_la_SOURCES = \
 	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 \
+	utf8.c utf8.h
 
-libavahi_common_la_CFLAGS = $(AM_CFLAGS)
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO) 1:0:1
+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 \
@@ -75,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 = \
@@ -90,32 +102,30 @@ watch_test_SOURCES = \
 	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)
+
+utf8_test_SOURCES = \
+	utf8-test.c \
+	utf8.c utf8.h
+utf8_test_CFLAGS = $(AM_CFLAGS)
+utf8_test_LDADD = $(AM_LDADD)
 
 if HAVE_DBUS
 
-noinst_HEADERS += \
+noinst_HEADERS = \
 	dbus.h \
 	dbus-watch-glue.h
 
-noinst_LTLIBRARIES = \
-	libdbus-common.la \
-	libdbus-common-pic.la
-
-libdbus_common_la_SOURCES = \
-	dbus-watch-glue.h dbus-watch-glue.c \
-	dbus.h dbus.c
-libdbus_common_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libdbus_common_la_LDFLAGS = $(AM_LDFLAGS) -all-static
-
-libdbus_common_pic_la_SOURCES = $(libdbus_common_la_SOURCES)
-libdbus_common_pic_la_CFLAGS = $(libdbus_common_la_CFLAGS) -fPIC
-libdbus_common_pic_la_LDFLAGS = $(libdbus_common_la_LDFLAGS)
-
 endif