From c5544522f6409095627dc3d1129560195ab4ec40 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Sat, 4 Jun 2005 18:56:52 +0000 Subject: [PATCH] * Split out a fair bit of avahi-core into avahi-common for use by the client library git-svn-id: file:///home/lennart/svn/public/avahi/trunk@98 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- Makefile.am | 2 +- avahi-common/Makefile.am | 81 +++++++++++++++++++ {avahi-core => avahi-common}/address.c | 0 {avahi-core => avahi-common}/address.h | 0 .../alternative-test.c | 0 {avahi-core => avahi-common}/alternative.c | 0 {avahi-core => avahi-common}/alternative.h | 0 {avahi-core => avahi-common}/dns-test.c | 0 {avahi-core => avahi-common}/dns.c | 0 {avahi-core => avahi-common}/dns.h | 0 {avahi-core => avahi-common}/domain-test.c | 0 {avahi-core => avahi-common}/rr.c | 0 {avahi-core => avahi-common}/rr.h | 4 +- {avahi-core => avahi-common}/strlst-test.c | 0 {avahi-core => avahi-common}/strlst.c | 0 {avahi-core => avahi-common}/strlst.h | 0 {avahi-core => avahi-common}/util.c | 0 {avahi-core => avahi-common}/util.h | 0 avahi-core.pc.in | 2 +- avahi-core/Makefile.am | 51 ++---------- avahi-core/avahi-reflector.c | 1 - avahi-core/avahi-test.c | 1 - avahi-core/core.h | 5 +- avahi-discover/Makefile.am | 2 +- avahi-discover/main.c | 2 +- configure.ac | 2 +- daemon/Makefile.am | 4 +- doxygen/doxygen.conf.in | 2 +- 28 files changed, 99 insertions(+), 60 deletions(-) create mode 100644 avahi-common/Makefile.am rename {avahi-core => avahi-common}/address.c (100%) rename {avahi-core => avahi-common}/address.h (100%) rename {avahi-core => avahi-common}/alternative-test.c (100%) rename {avahi-core => avahi-common}/alternative.c (100%) rename {avahi-core => avahi-common}/alternative.h (100%) rename {avahi-core => avahi-common}/dns-test.c (100%) rename {avahi-core => avahi-common}/dns.c (100%) rename {avahi-core => avahi-common}/dns.h (100%) rename {avahi-core => avahi-common}/domain-test.c (100%) rename {avahi-core => avahi-common}/rr.c (100%) rename {avahi-core => avahi-common}/rr.h (98%) rename {avahi-core => avahi-common}/strlst-test.c (100%) rename {avahi-core => avahi-common}/strlst.c (100%) rename {avahi-core => avahi-common}/strlst.h (100%) rename {avahi-core => avahi-common}/util.c (100%) rename {avahi-core => avahi-common}/util.h (100%) 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 similarity index 100% rename from avahi-core/address.c rename to avahi-common/address.c diff --git a/avahi-core/address.h b/avahi-common/address.h similarity index 100% rename from avahi-core/address.h rename to avahi-common/address.h diff --git a/avahi-core/alternative-test.c b/avahi-common/alternative-test.c similarity index 100% rename from avahi-core/alternative-test.c rename to avahi-common/alternative-test.c diff --git a/avahi-core/alternative.c b/avahi-common/alternative.c similarity index 100% rename from avahi-core/alternative.c rename to avahi-common/alternative.c diff --git a/avahi-core/alternative.h b/avahi-common/alternative.h similarity index 100% rename from avahi-core/alternative.h rename to avahi-common/alternative.h diff --git a/avahi-core/dns-test.c b/avahi-common/dns-test.c similarity index 100% rename from avahi-core/dns-test.c rename to avahi-common/dns-test.c diff --git a/avahi-core/dns.c b/avahi-common/dns.c similarity index 100% rename from avahi-core/dns.c rename to avahi-common/dns.c diff --git a/avahi-core/dns.h b/avahi-common/dns.h similarity index 100% rename from avahi-core/dns.h rename to avahi-common/dns.h diff --git a/avahi-core/domain-test.c b/avahi-common/domain-test.c similarity index 100% rename from avahi-core/domain-test.c rename to avahi-common/domain-test.c diff --git a/avahi-core/rr.c b/avahi-common/rr.c similarity index 100% rename from avahi-core/rr.c rename to avahi-common/rr.c diff --git a/avahi-core/rr.h b/avahi-common/rr.h similarity index 98% rename from avahi-core/rr.h rename to avahi-common/rr.h index c620695..404cc21 100644 --- a/avahi-core/rr.h +++ b/avahi-common/rr.h @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include enum { AVAHI_DNS_TYPE_A = 0x01, diff --git a/avahi-core/strlst-test.c b/avahi-common/strlst-test.c similarity index 100% rename from avahi-core/strlst-test.c rename to avahi-common/strlst-test.c diff --git a/avahi-core/strlst.c b/avahi-common/strlst.c similarity index 100% rename from avahi-core/strlst.c rename to avahi-common/strlst.c diff --git a/avahi-core/strlst.h b/avahi-common/strlst.h similarity index 100% rename from avahi-core/strlst.h rename to avahi-common/strlst.h diff --git a/avahi-core/util.c b/avahi-common/util.c similarity index 100% rename from avahi-core/util.c rename to avahi-common/util.c diff --git a/avahi-core/util.h b/avahi-common/util.h similarity index 100% rename from avahi-core/util.h rename to 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 #include -#include 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 #include -#include 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 -#include +#include +#include +#include /** 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 #include #include -#include +#include 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 -- 2.39.5