X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=f9fdef4b76b4fa9e5a77e0f5d88d92d8b7ba20f4;hb=0da62a499e177d194cb8622e3cd1dd9d6bc170e8;hp=4310797f85f42e3e2228693dc91de11b3eb2403b;hpb=deb6bcac8d1e1ecec4aafaee2d27dbe467e4f461;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 4310797..f9fdef4 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -31,21 +31,23 @@ avahi_commoninclude_HEADERS = \
 	domain.h \
 	cdecl.h \
 	defs.h \
-	malloc.h
+	malloc.h \
 	watch.h \
 	timeval.h \
 	simple-watch.h \
-	gccmacro.h
-
-noinst_HEADERS = \
-	llist.h
+	gccmacro.h \
+	error.h \
+	llist.h \
+	rlist.h
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
 	strlst-test \
 	domain-test \
 	alternative-test \
 	timeval-test \
 	watch-test
+endif
 
 lib_LTLIBRARIES = \
 	libavahi-common.la 
@@ -59,17 +61,17 @@ libavahi_common_la_SOURCES = \
 	domain.c domain.h \
 	timeval.c timeval.h \
 	simple-watch.c simple-watch.h \
-	watch.h gccmacro.h
+	watch.h gccmacro.h \
+	rlist.h rlist.c
 
-libavahi_common_la_CFLAGS = $(AM_CFLAGS)
-libavahi_common_la_LIBADD = $(AM_LDADD)
+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)
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
 	malloc.c malloc.h \
 	strlst-test.c
 strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
 
 alternative_test_SOURCES = \
 	alternative.c alternative.h \
@@ -77,14 +79,12 @@ alternative_test_SOURCES = \
 	domain.c domain.h \
 	alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
 	domain.c domain.h \
 	malloc.c malloc.h \
 	domain-test.c
 domain_test_CFLAGS = $(AM_CFLAGS)
-domain_test_LDADD = $(AM_LDADD)
 
 watch_test_SOURCES = \
 	timeval.c timeval.h \
@@ -92,29 +92,20 @@ watch_test_SOURCES = \
 	watch.h \
 	malloc.c malloc.h \
 	watch-test.c
-watch_test_CFLAGS = $(AM_CFLAGS)
-watch_test_LDADD = $(AM_LDADD)
+watch_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+watch_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
 
 timeval_test_SOURCES = \
 	timeval.c timeval.h \
 	timeval-test.c
-timeval_test_CFLAGS = $(AM_CFLAGS)
-timeval_test_LDADD = $(AM_LDADD)
-
+timeval_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
 
+if HAVE_DBUS
 
-if ENABLE_DBUS
-noinst_HEADERS += \
+noinst_HEADERS = \
 	dbus.h \
 	dbus-watch-glue.h
 
-noinst_LIBRARIES = \
-	libdbus-watch-glue.a
-
-libdbus_watch_glue_a_SOURCES = \
-	dbus-watch-glue.h dbus-watch-glue.c
-
-libdbus_watch_glue_a_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-
 endif