X-Git-Url: http://git.meshlink.io/?p=catta;a=blobdiff_plain;f=avahi%2FMakefile.am;h=c850392d1ac231d0dd87cf32f3ee1b2d268cba88;hp=bcb101c0351008e97012a3c417a95ce6b81202dd;hb=5133886fe11d7650bc89b46746731ca2eab2185d;hpb=3b898d826ec5e97f287481ea1612483e6f3cc066

diff --git a/avahi/Makefile.am b/avahi/Makefile.am
index bcb101c..c850392 100644
--- a/avahi/Makefile.am
+++ b/avahi/Makefile.am
@@ -20,7 +20,7 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-avahiincludedir=$(includedir)/src
+avahiincludedir = $(top_srcdir)/avahi
 
 avahiinclude_HEADERS = \
 	strlst.h \
@@ -46,32 +46,6 @@ avahiinclude_HEADERS = \
 
 lib_LTLIBRARIES = libavahi.la
 
-if ENABLE_TESTS
-noinst_PROGRAMS = \
-	strlst-test \
-	domain-test \
-	alternative-test \
-	timeval-test \
-	watch-test \
-	watch-test-thread \
-	utf8-test \
-	prioq-test \
-	avahi-test \
-	conformance-test \
-	avahi-reflector \
-	dns-test \
-	dns-spin-test \
-	timeeventq-test \
-	hashmap-test \
-	querier-test \
-	update-test
-
-TESTS = \
-	dns-spin-test \
-	dns-test \
-	hashmap-test
-endif
-
 libavahi_la_SOURCES = \
 	malloc.c malloc.h \
 	address.c address.h \
@@ -136,77 +110,3 @@ endif
 libavahi_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
 libavahi_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
 libavahi_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_VERSION_INFO)
-
-strlst_test_SOURCES = strlst-test.c
-strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD) libavahi.la
-
-alternative_test_SOURCES = alternative-test.c
-alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD) libavahi.la
-
-domain_test_SOURCES = domain-test.c
-domain_test_CFLAGS = $(AM_CFLAGS)
-domain_test_LDADD = $(AM_LDADD) libavahi.la
-
-watch_test_SOURCES = watch-test.c
-watch_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-watch_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) libavahi.la
-
-watch_test_thread_SOURCES = $(watch_test_SOURCES)
-watch_test_thread_CFLAGS = $(watch_test_CFLAGS) -DUSE_THREAD
-watch_test_thread_LDADD = $(watch_test_LDADD) libavahi.la
-
-timeval_test_SOURCES = timeval-test.c
-timeval_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) libavahi.la
-
-utf8_test_SOURCES = utf8-test.c
-utf8_test_CFLAGS = $(AM_CFLAGS)
-utf8_test_LDADD = $(AM_LDADD) libavahi.la
-
-prioq_test_SOURCES = prioq-test.c
-prioq_test_CFLAGS = $(AM_CFLAGS)
-prioq_test_LDADD = $(AM_LDADD) libavahi.la
-
-avahi_test_SOURCES = avahi-test.c
-avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) libavahi.la
-
-update_test_SOURCES = update-test.c
-update_test_CFLAGS = $(AM_CFLAGS)
-update_test_LDADD = $(AM_LDADD) libavahi.la
-
-querier_test_SOURCES = querier-test.c
-querier_test_CFLAGS = $(AM_CFLAGS)
-querier_test_LDADD = $(AM_LDADD) libavahi.la
-
-conformance_test_SOURCES = conformance-test.c
-conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) libavahi.la
-
-avahi_reflector_SOURCES = avahi-reflector.c
-avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD) libavahi.la
-
-dns_test_SOURCES = dns-test.c
-dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD) libavahi.la
-
-dns_spin_test_SOURCES = dns-spin-test.c
-dns_spin_test_CFLAGS = $(AM_CFLAGS)
-dns_spin_test_LDADD = $(AM_LDADD) libavahi.la
-
-timeeventq_test_SOURCES = timeeventq-test.c
-timeeventq_test_CFLAGS = $(AM_CFLAGS)
-timeeventq_test_LDADD = $(AM_LDADD) libavahi.la
-
-hashmap_test_SOURCES = hashmap-test.c
-hashmap_test_CFLAGS = $(AM_CFLAGS)
-hashmap_test_LDADD = $(AM_LDADD) libavahi.la
-
-valgrind: avahi-test
-	libtool --mode=execute valgrind ./avahi-test
-
-gdb: avahi-test
-	libtool --mode=execute gdb ./avahi-test