28 files changed, 99 insertions, 60 deletions
diff --git a/Makefile.am b/Makefile.am
index 26124a8..6606f65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 # USA.
 
 EXTRA_DIST = bootstrap.sh LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4
-SUBDIRS = avahi-core avahi-discover
+SUBDIRS = avahi-common avahi-core avahi-discover
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = avahi-core.pc
diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
new file mode 100644
index 0000000..8c58757
--- /dev/null
+++ b/avahi-common/Makefile.am
@@ -0,0 +1,81 @@
+# $Id: Makefile.am 90 2005-05-23 16:15:12Z lennart $
+#
+# This file is part of avahi.
+# 
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# 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)
+
+# This cool debug trap works on i386/gcc only
+AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+
+avahi_commonincludedir=$(includedir)/avahi-common
+
+avahi_commoninclude_HEADERS =
+	strlst.h \
+	address.h \
+	alternative.h \
+	rr.h \
+	util.h \
+	dns.h
+
+noinst_PROGRAMS = \
+	strlst-test \
+	dns-test \
+	domain-test \
+	alternative-test
+
+lib_LTLIBRARIES = \
+	libavahi-common.la 
+
+libavahi_common_la_SOURCES = \
+	address.c address.h \
+	strlst.c strlst.h \
+	alternative.c alternative.h \
+	rr.c rr.h \
+	dns.c dns.h \
+	util.c util.h
+
+strlst_test_SOURCES = \
+	strlst.c strlst.h \
+        strlst-test.c
+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
+alternative_test_CFLAGS = $(AM_CFLAGS)
+alternative_test_LDADD = $(AM_LDADD)
+
+domain_test_SOURCES = \
+	util.c util.h \
+	domain-test.c
+domain_test_CFLAGS = $(AM_CFLAGS)
+domain_test_LDADD = $(AM_LDADD)
diff --git a/avahi-core/address.c b/avahi-common/address.c
index 3484707..3484707 100644
--- a/avahi-core/address.c
+++ b/avahi-common/address.c
diff --git a/avahi-core/address.h b/avahi-common/address.h
index 22cb74b..22cb74b 100644
--- a/avahi-core/address.h
+++ b/avahi-common/address.h
diff --git a/avahi-core/alternative-test.c b/avahi-common/alternative-test.c
index 9e26d24..9e26d24 100644
--- a/avahi-core/alternative-test.c
+++ b/avahi-common/alternative-test.c
diff --git a/avahi-core/alternative.c b/avahi-common/alternative.c
index c9a0f48..c9a0f48 100644
--- a/avahi-core/alternative.c
+++ b/avahi-common/alternative.c
diff --git a/avahi-core/alternative.h b/avahi-common/alternative.h
index 3aed5b2..3aed5b2 100644
--- a/avahi-core/alternative.h
+++ b/avahi-common/alternative.h
diff --git a/avahi-core/dns-test.c b/avahi-common/dns-test.c
index aa36f2a..aa36f2a 100644
--- a/avahi-core/dns-test.c
+++ b/avahi-common/dns-test.c
diff --git a/avahi-core/dns.c b/avahi-common/dns.c
index 9e19c9e..9e19c9e 100644
--- a/avahi-core/dns.c
+++ b/avahi-common/dns.c
diff --git a/avahi-core/dns.h b/avahi-common/dns.h
index 03d9798..03d9798 100644
--- a/avahi-core/dns.h
+++ b/avahi-common/dns.h
diff --git a/avahi-core/domain-test.c b/avahi-common/domain-test.c
index 240f960..240f960 100644
--- a/avahi-core/domain-test.c
+++ b/avahi-common/domain-test.c
diff --git a/avahi-core/rr.c b/avahi-common/rr.c
index c7f7d2c..c7f7d2c 100644
--- a/avahi-core/rr.c
+++ b/avahi-common/rr.c
diff --git a/avahi-core/rr.h b/avahi-common/rr.h
index c620695..404cc21 100644
--- a/avahi-core/rr.h
+++ b/avahi-common/rr.h
@@ -24,8 +24,8 @@
 
 #include <glib.h>
 
-#include <avahi-core/strlst.h>
-#include <avahi-core/address.h>
+#include <avahi-common/strlst.h>
+#include <avahi-common/address.h>
 
 enum {
     AVAHI_DNS_TYPE_A = 0x01,
diff --git a/avahi-core/strlst-test.c b/avahi-common/strlst-test.c
index afc13b1..afc13b1 100644
--- a/avahi-core/strlst-test.c
+++ b/avahi-common/strlst-test.c
diff --git a/avahi-core/strlst.c b/avahi-common/strlst.c
index 866618f..866618f 100644
--- a/avahi-core/strlst.c
+++ b/avahi-common/strlst.c
diff --git a/avahi-core/strlst.h b/avahi-common/strlst.h
index 80dfc2c..80dfc2c 100644
--- a/avahi-core/strlst.h
+++ b/avahi-common/strlst.h
diff --git a/avahi-core/util.c b/avahi-common/util.c
index a41475a..a41475a 100644
--- a/avahi-core/util.c
+++ b/avahi-common/util.c
diff --git a/avahi-core/util.h b/avahi-common/util.h
index 68d367c..68d367c 100644
--- a/avahi-core/util.h
+++ b/avahi-common/util.h
diff --git a/avahi-core.pc.in b/avahi-core.pc.in
index 442c867..1dcbb8a 100644
--- a/avahi-core.pc.in
+++ b/avahi-core.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include
 Name: avahi-core
 Description: Avahi Embeddable Multicast DNS Engine
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lavahi-core
+Libs: -L${libdir} -lavahi-core -lavahi-common
 Cflags: -D_REENTRANT -I${includedir}
diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index afc958c..b692fcc 100644
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -21,30 +21,24 @@ AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
 
 # GLIB 2.0
 AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+AM_LDADD=$(GLIB20_LIBS) ../avahi-common/libavahi-common.la
+
+AM_CFLAGS+=-I$(top_srcdir)/avahi-common
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-avahiincludedir=$(includedir)/avahi-core
+avahiincludedir=$(includedir)/avahi-core 
 
-avahiinclude_HEADERS = \
-	rr.h \
-	address.h \
-	strlst.h \
-	core.h \
-	alternative.h
+avahiinclude_HEADERS =
+	core.h
 
 lib_LTLIBRARIES = \
 	libavahi-core.la 
 
 noinst_PROGRAMS = \
-	dns-test \
-	domain-test \
 	prioq-test \
-	strlst-test \
 	avahi-test \
-	alternative-test \
 	conformance-test \
 	avahi-reflector
 
@@ -53,21 +47,15 @@ libavahi_core_la_SOURCES = \
 	iface.c iface.h \
 	netlink.c netlink.h \
 	server.c server.h \
-	address.c address.h \
-	util.c util.h \
 	prioq.c prioq.h \
 	cache.c cache.h\
-	rr.c rr.h \
-	dns.c dns.h \
 	socket.c socket.h \
 	response-sched.c response-sched.h \
 	query-sched.c query-sched.h \
 	probe-sched.c probe-sched.h \
 	announce.c announce.h \
 	browse.c browse.h \
-	strlst.c strlst.h \
 	rrlist.c rrlist.h \
-	alternative.c alternative.h \
 	resolve-host-name.c \
 	resolve-address.c \
 	browse-domain.c \
@@ -81,39 +69,12 @@ prioq_test_SOURCES = \
 prioq_test_CFLAGS = $(AM_CFLAGS)
 prioq_test_LDADD = $(AM_LDADD)
 
-strlst_test_SOURCES = \
-	strlst-test.c \
-	strlst.c strlst.h
-strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
-
-domain_test_SOURCES = \
-	domain-test.c \
-	util.c util.h
-domain_test_CFLAGS = $(AM_CFLAGS)
-domain_test_LDADD = $(AM_LDADD)
-
-dns_test_SOURCES = \
-	dns-test.c \
-	util.c util.h \
-	dns.c dns.h \
-	rr.c rr.h \
-	strlst.c strlst.h
-dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD)
-
 avahi_test_SOURCES = \
 	avahi-test.c \
 	$(libavahi_core_la_SOURCES)
 avahi_test_CFLAGS = $(AM_CFLAGS)
 avahi_test_LDADD = $(AM_LDADD)
 
-alternative_test_SOURCES = \
-	alternative-test.c \
-	alternative.c alternative.h
-alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_LDADD)
-
 conformance_test_SOURCES = \
 	conformance-test.c \
 	$(libavahi_core_la_SOURCES)
diff --git a/avahi-core/avahi-reflector.c b/avahi-core/avahi-reflector.c
index e10c43c..60e19b6 100644
--- a/avahi-core/avahi-reflector.c
+++ b/avahi-core/avahi-reflector.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 
 #include <avahi-core/core.h>
-#include <avahi-core/alternative.h>
 
 int main(int argc, char*argv[]) {
     AvahiServer *server;
diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 269b64c..63c9f08 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 
 #include <avahi-core/core.h>
-#include <avahi-core/alternative.h>
 
 static AvahiEntryGroup *group = NULL;
 static AvahiServer *server = NULL;
diff --git a/avahi-core/core.h b/avahi-core/core.h
index 961399e..6e8d9dd 100644
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -34,8 +34,9 @@ typedef struct AvahiEntry AvahiEntry;
 /** A group of locally registered DNS RRs */
 typedef struct AvahiEntryGroup AvahiEntryGroup;
 
-#include <avahi-core/address.h>
-#include <avahi-core/rr.h>
+#include <avahi-common/address.h>
+#include <avahi-common/rr.h>
+#include <avahi-common/alternative.h>
 
 /** States of a server object */
 typedef enum {
diff --git a/avahi-discover/Makefile.am b/avahi-discover/Makefile.am
index 9eca34d..8a5da9a 100644
--- a/avahi-discover/Makefile.am
+++ b/avahi-discover/Makefile.am
@@ -32,4 +32,4 @@ avahi_discover_SOURCES = \
 	main.c
 
 avahi_discover_CFLAGS = $(AM_CFLAGS)
-avahi_discover_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la
+avahi_discover_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
diff --git a/avahi-discover/main.c b/avahi-discover/main.c
index de15a44..997c8a0 100644
--- a/avahi-discover/main.c
+++ b/avahi-discover/main.c
@@ -3,7 +3,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <avahi-core/core.h>
-#include <avahi-core/strlst.h>
+#include <avahi-common/strlst.h>
 
 struct ServiceType;
 
diff --git a/configure.ac b/configure.ac
index ca6a5e0..721be81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,5 +86,5 @@ if test "x$GCC" = "xyes" ; then
    rm -f conftest.o
 fi
 
-AC_CONFIG_FILES([Makefile avahi-core.pc doxygen/Makefile doxygen/doxygen.conf avahi-core/Makefile daemon/Makefile avahi-discover/Makefile])
+AC_CONFIG_FILES([Makefile avahi-core.pc doxygen/Makefile doxygen/doxygen.conf avahi-common/Makefile avahi-core/Makefile daemon/Makefile avahi-discover/Makefile])
 AC_OUTPUT
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 7f2bc9b..8bf007d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -37,6 +37,4 @@ avahi_SOURCES = \
 	main.c
 
 avahi_CFLAGS = $(AM_CFLAGS)
-avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la
-
-
+avahi_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
diff --git a/doxygen/doxygen.conf.in b/doxygen/doxygen.conf.in
index cf0e378..28ddd0b 100644
--- a/doxygen/doxygen.conf.in
+++ b/doxygen/doxygen.conf.in
@@ -417,7 +417,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../avahi-core/core.h ../avahi-core/address.h ../avahi-core/rr.h ../avahi-core/strlst.h ../avahi-core/alternative.h
+INPUT                  = ../avahi-core/core.h ../avahi-common/address.h ../avahi-common/rr.h ../avahi-common/strlst.h ../avahi-common/alternative.h
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp