X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=24187abbeb3140e0011e0e6b10a4e2c4d317e0dd;hb=908e491f7d55209acfbb2595ab1ef5b24502d641;hp=670c8552fc93a7d79dfeb123eec644652ddbf51d;hpb=16d9e30dd7fa052bd7e6dd37927d7f27bec90ef1;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 670c855..24187ab 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -1,7 +1,5 @@
-# $Id: Makefile.am 90 2005-05-23 16:15:12Z lennart $
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -35,6 +33,7 @@ avahi_commoninclude_HEADERS = \
 	watch.h \
 	timeval.h \
 	simple-watch.h \
+	thread-watch.h \
 	gccmacro.h \
 	error.h \
 	llist.h \
@@ -46,11 +45,13 @@ noinst_PROGRAMS = \
 	domain-test \
 	alternative-test \
 	timeval-test \
-	watch-test
+	watch-test \
+	watch-test-thread \
+	utf8-test
 endif
 
 lib_LTLIBRARIES = \
-	libavahi-common.la 
+	libavahi-common.la
 
 libavahi_common_la_SOURCES = \
 	malloc.c malloc.h \
@@ -61,11 +62,15 @@ 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 \
+	i18n.c i18n.h
 
-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) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBINTL)
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
@@ -77,13 +82,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 = \
@@ -92,12 +101,24 @@ 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
 
@@ -105,19 +126,4 @@ 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
-