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

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@286 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 6788f31..ad8d1a7 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -32,7 +32,6 @@ avahi_commoninclude_HEADERS = \
        strlst.h \
        address.h \
        alternative.h \
-       rr.h \
        util.h \
        cdecl.h \
        defs.h
@@ -56,7 +55,6 @@ libavahi_common_la_SOURCES = \
        address.c address.h \
        strlst.c strlst.h \
        alternative.c alternative.h \
-       rr.c rr.h \
        util.c util.h \
        error.c error.h
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index af7830c..2e436a6 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -34,7 +34,8 @@ avahiincludedir=$(includedir)/avahi-core
 
 avahiinclude_HEADERS = \
        core.h \
-       log.h
+       log.h \
+       rr.h
 
 lib_LTLIBRARIES = \
        libavahi-core.la 
@@ -68,6 +69,7 @@ libavahi_core_la_SOURCES = \
        browse-service.c \
        resolve-service.c \
        dns.c dns.h \
+       rr.c rr.h \
        core.h \
        log.c log.h \
        browse-dns-server.c
@@ -98,7 +100,8 @@ avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
 dns_test_SOURCES = \
        dns.c dns.h \
        dns-test.c \
-       log.c log.h
+       log.c log.h \
+       rr.c rr.h
 dns_test_CFLAGS = $(AM_CFLAGS)
 dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
 

diff --git a/avahi-core/core.h b/avahi-core/core.h
index ec0b981..f51bd6b 100644 (file)
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -34,7 +34,6 @@
  * services using an embedded mDNS stack. */
 
 #include <avahi-common/cdecl.h>
-#include <avahi-common/defs.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
@@ -53,10 +52,11 @@ typedef struct AvahiEntryGroup AvahiEntryGroup;
 AVAHI_C_DECL_END
 #endif
 
+#include <avahi-core/rr.h>
 #include <avahi-common/address.h>
-#include <avahi-common/rr.h>
 #include <avahi-common/alternative.h>
 #include <avahi-common/error.h>
+#include <avahi-common/defs.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN

diff --git a/avahi-common/rr.c b/avahi-core/rr.c
similarity index 100%
rename from avahi-common/rr.c
rename to avahi-core/rr.c

diff --git a/avahi-common/rr.h b/avahi-core/rr.h
similarity index 100%
rename from avahi-common/rr.h
rename to avahi-core/rr.h

diff --git a/doxygen.cfg b/doxygen.cfg
index 2242c32..a2e3678 100644 (file)
--- a/doxygen.cfg
+++ b/doxygen.cfg
@@ -67,7 +67,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = $(SRCDIR)/avahi-common/cdecl.h $(SRCDIR)/avahi-core/core.h $(SRCDIR)/avahi-common/address.h $(SRCDIR)/avahi-common/rr.h $(SRCDIR)/avahi-common/strlst.h $(SRCDIR)/avahi-common/alternative.h $(SRCDIR)/avahi-core/log.h $(SRCDIR)/avahi-common/defs.h $(SRCDIR)/avahi-client/client.h $(SRCDIR)/avahi-common/error.h
+INPUT                  = $(SRCDIR)/avahi-common/cdecl.h $(SRCDIR)/avahi-core/core.h $(SRCDIR)/avahi-common/address.h $(SRCDIR)/avahi-core/rr.h $(SRCDIR)/avahi-common/strlst.h $(SRCDIR)/avahi-common/alternative.h $(SRCDIR)/avahi-core/log.h $(SRCDIR)/avahi-common/defs.h $(SRCDIR)/avahi-client/client.h $(SRCDIR)/avahi-common/error.h
 FILE_PATTERNS          =
 RECURSIVE              = NO
 EXCLUDE                =