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

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 972e9ad..f9fdef4 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -40,12 +40,14 @@ avahi_commoninclude_HEADERS = \
 	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 
@@ -62,8 +64,8 @@ libavahi_common_la_SOURCES = \
 	watch.h gccmacro.h \
 	rlist.h rlist.c
 
-libavahi_common_la_CFLAGS = $(AM_CFLAGS)
-libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
+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 \
@@ -90,12 +92,14 @@ 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)
 
 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
 
@@ -103,19 +107,5 @@ 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