X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=c78e34a7b7ea8f2a6100463f264f91e42d739422;hb=f726a534b6230de7a5323d811ef375b979f5bddb;hp=1ea7ba43a6710256f26d4bb9e3a204ad803d23ce;hpb=9642bac4b85de24ce62c53ad6a8e2ab4b2dd31ba;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 1ea7ba4..c78e34a 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
@@ -22,9 +20,6 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-# Need some DBUS defines for dbus.h
-AM_CFLAGS+=$(DBUS_CFLAGS)
-
 avahi_commonincludedir=$(includedir)/avahi-common
 
 avahi_commoninclude_HEADERS = \
@@ -38,21 +33,25 @@ 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 
+	libavahi-common.la
 
 libavahi_common_la_SOURCES = \
 	malloc.c malloc.h \
@@ -63,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 \
-	dbus.c dbus.h
+	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 0:0:0
+libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
+libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
 
 strlst_test_SOURCES = \
 	strlst.c strlst.h \
@@ -79,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 = \
@@ -94,31 +101,21 @@ 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)
-
-if HAVE_DBUS
-
-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
-
+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)