move dns.[ch] back to avahi-core/

[catta] / avahi-core / Makefile.am

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index b692fcce33d0d0c0a87334bb81a015c4619529b8..6920e8c6627c7e9795481e0d6ce317f6014d67dc 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -21,9 +21,11 @@ AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
 
 # GLIB 2.0
 AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS) ../avahi-common/libavahi-common.la
+AM_LDADD=$(GLIB20_LIBS)
 
-AM_CFLAGS+=-I$(top_srcdir)/avahi-common
+# Import stuff from avahi-common
+AM_CFLAGS+=-I$(top_srcdir)/avahi-common 
+AM_LDADD+=../avahi-common/libavahi-common.la
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
@@ -40,7 +42,8 @@ noinst_PROGRAMS = \
        prioq-test \
        avahi-test \
        conformance-test \
-       avahi-reflector
+       avahi-reflector \
+       dns-test
 
 libavahi_core_la_SOURCES = \
        timeeventq.c timeeventq.h\
@@ -61,7 +64,8 @@ libavahi_core_la_SOURCES = \
        browse-domain.c \
        browse-service-type.c \
        browse-service.c \
-       resolve-service.c
+       resolve-service.c \
+       dns.c dns.h
 
 prioq_test_SOURCES = \
        prioq-test.c  \
@@ -87,6 +91,12 @@ avahi_reflector_SOURCES = \
 avahi_reflector_CFLAGS = $(AM_CFLAGS)
 avahi_reflector_LDADD = $(AM_LDADD)
 
+dns_test_SOURCES = \
+       dns.c dns.h \
+        dns-test.c
+dns_test_CFLAGS = $(AM_CFLAGS)
+dns_test_LDADD = $(AM_LDADD)
+
 valgrind: avahi-test
        libtool --mode=execute valgrind ./avahi-test