From e877dd63989740389135513745c92b253fefd3fe Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Jun 2005 09:34:19 +0000
Subject: [PATCH] move dns.[ch] back to avahi-core/

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@104 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-common/Makefile.am                | 14 +-------------
 avahi-common/rr.c                       |  1 -
 avahi-core/Makefile.am                  | 18 ++++++++++++++----
 {avahi-common => avahi-core}/dns-test.c |  0
 {avahi-common => avahi-core}/dns.c      |  0
 {avahi-common => avahi-core}/dns.h      |  0
 6 files changed, 15 insertions(+), 18 deletions(-)
 rename {avahi-common => avahi-core}/dns-test.c (100%)
 rename {avahi-common => avahi-core}/dns.c (100%)
 rename {avahi-common => avahi-core}/dns.h (100%)

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 8c58757..94d373c 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -33,12 +33,10 @@ avahi_commoninclude_HEADERS =
 	address.h \
 	alternative.h \
 	rr.h \
-	util.h \
-	dns.h
+	util.h
 
 noinst_PROGRAMS = \
 	strlst-test \
-	dns-test \
 	domain-test \
 	alternative-test
 
@@ -50,7 +48,6 @@ libavahi_common_la_SOURCES = \
 	strlst.c strlst.h \
 	alternative.c alternative.h \
 	rr.c rr.h \
-	dns.c dns.h \
 	util.c util.h
 
 strlst_test_SOURCES = \
@@ -59,15 +56,6 @@ strlst_test_SOURCES = \
 strlst_test_CFLAGS = $(AM_CFLAGS)
 strlst_test_LDADD = $(AM_LDADD)
 
-dns_test_SOURCES = \
-	util.c util.h \
-	dns.c dns.h \
-	rr.c rr.h \
-	strlst.c strlst \
-	dns-test.c
-dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD)
-
 alternative_test_SOURCES = \
 	alternative.c alternative.h \
         alternative-test.c
diff --git a/avahi-common/rr.c b/avahi-common/rr.c
index c7f7d2c..7e974c4 100644
--- a/avahi-common/rr.c
+++ b/avahi-common/rr.c
@@ -31,7 +31,6 @@
 
 #include "util.h"
 #include "rr.h"
-#include "dns.h"
 
 AvahiKey *avahi_key_new(const gchar *name, guint16 class, guint16 type) {
     AvahiKey *k;
diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index b692fcc..6920e8c 100644
--- 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
 
diff --git a/avahi-common/dns-test.c b/avahi-core/dns-test.c
similarity index 100%
rename from avahi-common/dns-test.c
rename to avahi-core/dns-test.c
diff --git a/avahi-common/dns.c b/avahi-core/dns.c
similarity index 100%
rename from avahi-common/dns.c
rename to avahi-core/dns.c
diff --git a/avahi-common/dns.h b/avahi-core/dns.h
similarity index 100%
rename from avahi-common/dns.h
rename to avahi-core/dns.h
-- 
2.39.5