X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2FMakefile.am;h=2a3a591bab595f162e1a46ebb60ef9244f443e44;hb=63b016778a0a8c277f192acd6fe5fd5f56a9f170;hp=94d373c13c0ea60722977d47e3cfdeba9d2b8a34;hpb=e877dd63989740389135513745c92b253fefd3fe;p=catta

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 94d373c..2a3a591 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -17,53 +17,101 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
-
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+AM_CFLAGS=-I$(top_srcdir)
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 avahi_commonincludedir=$(includedir)/avahi-common
 
-avahi_commoninclude_HEADERS =
+avahi_commoninclude_HEADERS = \
 	strlst.h \
 	address.h \
 	alternative.h \
-	rr.h \
-	util.h
+	domain.h \
+	cdecl.h \
+	defs.h \
+	malloc.h \
+	watch.h \
+	timeval.h \
+	simple-watch.h \
+	gccmacro.h \
+	error.h \
+	llist.h \
+	rlist.h
 
+if ENABLE_TESTS
 noinst_PROGRAMS = \
 	strlst-test \
 	domain-test \
-	alternative-test
+	alternative-test \
+	timeval-test \
+	watch-test \
+	watch-test-thread
+endif
 
 lib_LTLIBRARIES = \
 	libavahi-common.la 
 
 libavahi_common_la_SOURCES = \
+	malloc.c malloc.h \
 	address.c address.h \
-	strlst.c strlst.h \
 	alternative.c alternative.h \
-	rr.c rr.h \
-	util.c util.h
+	error.c error.h \
+	strlst.c strlst.h \
+	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
+
+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 \
-        strlst-test.c
+	malloc.c malloc.h \
+	strlst-test.c
 strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
 
 alternative_test_SOURCES = \
 	alternative.c alternative.h \
-        alternative-test.c
+	malloc.c malloc.h \
+	domain.c domain.h \
+	alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
-	util.c util.h \
+	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 \
+	simple-watch.c simple-watch.h \
+	watch.h \
+	malloc.c malloc.h \
+	watch-test.c
+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) $(PTHREAD_CFLAGS)
+timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS)
+
+if HAVE_DBUS
+
+noinst_HEADERS = \
+	dbus.h \
+	dbus-watch-glue.h
+
+endif
+