From 1a5dff7d166883e99fe1dba62dc3c407a9f7e332 Mon Sep 17 00:00:00 2001 From: "Sven M. Hallberg" Date: Wed, 20 Aug 2014 13:23:27 +0200 Subject: [PATCH] combine avahi-core and avahi-common components into one library --- Makefile.am | 39 ++-- README | 3 - avahi-common/.gitignore | 14 -- avahi-common/Makefile.am | 121 ----------- avahi-core/Makefile.am | 173 ---------------- avahi-core.pc.in => avahi.pc.in | 4 +- {avahi-core => avahi}/.gitignore | 7 + avahi/Makefile.am | 212 ++++++++++++++++++++ {avahi-core => avahi}/addr-util.c | 0 {avahi-core => avahi}/addr-util.h | 4 +- {avahi-common => avahi}/address.c | 0 {avahi-common => avahi}/address.h | 2 +- {avahi-common => avahi}/alternative-test.c | 0 {avahi-common => avahi}/alternative.c | 0 {avahi-common => avahi}/alternative.h | 2 +- {avahi-core => avahi}/announce.c | 4 +- {avahi-core => avahi}/announce.h | 2 +- {avahi-core => avahi}/avahi-reflector.c | 4 +- {avahi-core => avahi}/avahi-test.c | 20 +- {avahi-core => avahi}/browse-dns-server.c | 6 +- {avahi-core => avahi}/browse-domain.c | 6 +- {avahi-core => avahi}/browse-service-type.c | 6 +- {avahi-core => avahi}/browse-service.c | 6 +- {avahi-core => avahi}/browse.c | 12 +- {avahi-core => avahi}/browse.h | 2 +- {avahi-core => avahi}/cache.c | 4 +- {avahi-core => avahi}/cache.h | 2 +- {avahi-common => avahi}/cdecl.h | 0 {avahi-core => avahi}/conformance-test.c | 18 +- {avahi-core => avahi}/core.h | 12 +- {avahi-common => avahi}/defs.h | 2 +- {avahi-core => avahi}/dns-spin-test.c | 0 {avahi-core => avahi}/dns-srv-rr.h | 10 +- {avahi-core => avahi}/dns-test.c | 6 +- {avahi-core => avahi}/dns.c | 6 +- {avahi-core => avahi}/dns.h | 0 {avahi-common => avahi}/domain-test.c | 0 {avahi-core => avahi}/domain-util.c | 2 +- {avahi-core => avahi}/domain-util.h | 4 +- {avahi-common => avahi}/domain.c | 0 {avahi-common => avahi}/domain.h | 2 +- {avahi-core => avahi}/entry.c | 10 +- {avahi-common => avahi}/error.c | 0 {avahi-common => avahi}/error.h | 2 +- {avahi-core => avahi}/fdutil.c | 0 {avahi-core => avahi}/fdutil.h | 2 +- {avahi-core => avahi}/findstatic.pl | 0 {avahi-common => avahi}/gccmacro.h | 2 +- {avahi-core => avahi}/hashmap-test.c | 4 +- {avahi-core => avahi}/hashmap.c | 6 +- {avahi-core => avahi}/hashmap.h | 2 +- {avahi-common => avahi}/i18n.c | 0 {avahi-common => avahi}/i18n.h | 0 {avahi-core => avahi}/iface-linux.c | 2 +- {avahi-core => avahi}/iface-linux.h | 0 {avahi-core => avahi}/iface-none.c | 0 {avahi-core => avahi}/iface-pfroute.c | 2 +- {avahi-core => avahi}/iface-pfroute.h | 2 +- {avahi-core => avahi}/iface.c | 6 +- {avahi-core => avahi}/iface.h | 4 +- {avahi-core => avahi}/internal.h | 6 +- {avahi-common => avahi}/llist.h | 2 +- {avahi-core => avahi}/log.c | 0 {avahi-core => avahi}/log.h | 4 +- {avahi-core => avahi}/lookup.h | 8 +- {avahi-common => avahi}/malloc.c | 0 {avahi-common => avahi}/malloc.h | 4 +- {avahi-core => avahi}/multicast-lookup.c | 4 +- {avahi-core => avahi}/multicast-lookup.h | 0 {avahi-core => avahi}/netlink.c | 2 +- {avahi-core => avahi}/netlink.h | 2 +- {avahi-core => avahi}/prioq-test.c | 2 +- {avahi-core => avahi}/prioq.c | 2 +- {avahi-core => avahi}/prioq.h | 0 {avahi-core => avahi}/probe-sched.c | 6 +- {avahi-core => avahi}/probe-sched.h | 2 +- {avahi-core => avahi}/publish.h | 4 +- {avahi-core => avahi}/querier-test.c | 18 +- {avahi-core => avahi}/querier.c | 8 +- {avahi-core => avahi}/querier.h | 0 {avahi-core => avahi}/query-sched.c | 4 +- {avahi-core => avahi}/query-sched.h | 2 +- {avahi-core => avahi}/resolve-address.c | 8 +- {avahi-core => avahi}/resolve-host-name.c | 8 +- {avahi-core => avahi}/resolve-service.c | 8 +- {avahi-core => avahi}/response-sched.c | 4 +- {avahi-core => avahi}/response-sched.h | 2 +- {avahi-common => avahi}/rlist.c | 0 {avahi-common => avahi}/rlist.h | 0 {avahi-core => avahi}/rr-util.h | 0 {avahi-core => avahi}/rr.c | 6 +- {avahi-core => avahi}/rr.h | 6 +- {avahi-core => avahi}/rrlist.c | 4 +- {avahi-core => avahi}/rrlist.h | 0 {avahi-core => avahi}/server.c | 8 +- {avahi-common => avahi}/simple-watch.c | 0 {avahi-common => avahi}/simple-watch.h | 4 +- {avahi-core => avahi}/socket.c | 0 {avahi-core => avahi}/socket.h | 0 {avahi-common => avahi}/strlst-test.c | 0 {avahi-common => avahi}/strlst.c | 0 {avahi-common => avahi}/strlst.h | 4 +- {avahi-common => avahi}/thread-watch.c | 0 {avahi-common => avahi}/thread-watch.h | 4 +- {avahi-core => avahi}/timeeventq-test.c | 4 +- {avahi-core => avahi}/timeeventq.c | 4 +- {avahi-core => avahi}/timeeventq.h | 2 +- {avahi-common => avahi}/timeval-test.c | 0 {avahi-common => avahi}/timeval.c | 0 {avahi-common => avahi}/timeval.h | 2 +- {avahi-core => avahi}/update-test.c | 22 +- {avahi-common => avahi}/utf8-test.c | 2 +- {avahi-common => avahi}/utf8.c | 0 {avahi-common => avahi}/utf8.h | 2 +- {avahi-core => avahi}/util.c | 2 +- {avahi-core => avahi}/util.h | 2 +- {avahi-common => avahi}/watch-test.c | 0 {avahi-common => avahi}/watch.h | 2 +- {avahi-core => avahi}/wide-area.c | 6 +- {avahi-core => avahi}/wide-area.h | 0 configure.ac | 9 +- docs/MALLOC | 2 +- examples/Makefile.am | 4 +- examples/core-browse-services.c | 10 +- examples/core-publish-service.c | 12 +- 125 files changed, 449 insertions(+), 545 deletions(-) delete mode 100644 avahi-common/.gitignore delete mode 100644 avahi-common/Makefile.am delete mode 100644 avahi-core/Makefile.am rename avahi-core.pc.in => avahi.pc.in (76%) rename {avahi-core => avahi}/.gitignore (69%) create mode 100644 avahi/Makefile.am rename {avahi-core => avahi}/addr-util.c (100%) rename {avahi-core => avahi}/addr-util.h (95%) rename {avahi-common => avahi}/address.c (100%) rename {avahi-common => avahi}/address.h (99%) rename {avahi-common => avahi}/alternative-test.c (100%) rename {avahi-common => avahi}/alternative.c (100%) rename {avahi-common => avahi}/alternative.h (98%) rename {avahi-core => avahi}/announce.c (99%) rename {avahi-core => avahi}/announce.h (98%) rename {avahi-core => avahi}/avahi-reflector.c (96%) rename {avahi-core => avahi}/avahi-test.c (97%) rename {avahi-core => avahi}/browse-dns-server.c (98%) rename {avahi-core => avahi}/browse-domain.c (98%) rename {avahi-core => avahi}/browse-service-type.c (97%) rename {avahi-core => avahi}/browse-service.c (98%) rename {avahi-core => avahi}/browse.c (98%) rename {avahi-core => avahi}/browse.h (98%) rename {avahi-core => avahi}/cache.c (99%) rename {avahi-core => avahi}/cache.h (98%) rename {avahi-common => avahi}/cdecl.h (100%) rename {avahi-core => avahi}/conformance-test.c (94%) rename {avahi-core => avahi}/core.h (97%) rename {avahi-common => avahi}/defs.h (99%) rename {avahi-core => avahi}/dns-spin-test.c (100%) rename {avahi-core => avahi}/dns-srv-rr.h (92%) rename {avahi-core => avahi}/dns-test.c (97%) rename {avahi-core => avahi}/dns.c (99%) rename {avahi-core => avahi}/dns.h (100%) rename {avahi-common => avahi}/domain-test.c (100%) rename {avahi-core => avahi}/domain-util.c (99%) rename {avahi-core => avahi}/domain-util.h (95%) rename {avahi-common => avahi}/domain.c (100%) rename {avahi-common => avahi}/domain.h (99%) rename {avahi-core => avahi}/entry.c (99%) rename {avahi-common => avahi}/error.c (100%) rename {avahi-common => avahi}/error.h (99%) rename {avahi-core => avahi}/fdutil.c (100%) rename {avahi-core => avahi}/fdutil.h (96%) rename {avahi-core => avahi}/findstatic.pl (100%) rename {avahi-common => avahi}/gccmacro.h (98%) rename {avahi-core => avahi}/hashmap-test.c (96%) rename {avahi-core => avahi}/hashmap.c (98%) rename {avahi-core => avahi}/hashmap.h (98%) rename {avahi-common => avahi}/i18n.c (100%) rename {avahi-common => avahi}/i18n.h (100%) rename {avahi-core => avahi}/iface-linux.c (99%) rename {avahi-core => avahi}/iface-linux.h (100%) rename {avahi-core => avahi}/iface-none.c (100%) rename {avahi-core => avahi}/iface-pfroute.c (99%) rename {avahi-core => avahi}/iface-pfroute.h (97%) rename {avahi-core => avahi}/iface.c (99%) rename {avahi-core => avahi}/iface.h (99%) rename {avahi-core => avahi}/internal.h (98%) rename {avahi-common => avahi}/llist.h (98%) rename {avahi-core => avahi}/log.c (100%) rename {avahi-core => avahi}/log.h (97%) rename {avahi-core => avahi}/lookup.h (98%) rename {avahi-common => avahi}/malloc.c (100%) rename {avahi-common => avahi}/malloc.h (97%) rename {avahi-core => avahi}/multicast-lookup.c (99%) rename {avahi-core => avahi}/multicast-lookup.h (100%) rename {avahi-core => avahi}/netlink.c (99%) rename {avahi-core => avahi}/netlink.h (97%) rename {avahi-core => avahi}/prioq-test.c (98%) rename {avahi-core => avahi}/prioq.c (99%) rename {avahi-core => avahi}/prioq.h (100%) rename {avahi-core => avahi}/probe-sched.c (99%) rename {avahi-core => avahi}/probe-sched.h (97%) rename {avahi-core => avahi}/publish.h (99%) rename {avahi-core => avahi}/querier-test.c (93%) rename {avahi-core => avahi}/querier.c (98%) rename {avahi-core => avahi}/querier.h (100%) rename {avahi-core => avahi}/query-sched.c (99%) rename {avahi-core => avahi}/query-sched.h (97%) rename {avahi-core => avahi}/resolve-address.c (98%) rename {avahi-core => avahi}/resolve-host-name.c (98%) rename {avahi-core => avahi}/resolve-service.c (99%) rename {avahi-core => avahi}/response-sched.c (99%) rename {avahi-core => avahi}/response-sched.h (97%) rename {avahi-common => avahi}/rlist.c (100%) rename {avahi-common => avahi}/rlist.h (100%) rename {avahi-core => avahi}/rr-util.h (100%) rename {avahi-core => avahi}/rr.c (99%) rename {avahi-core => avahi}/rr.h (98%) rename {avahi-core => avahi}/rrlist.c (98%) rename {avahi-core => avahi}/rrlist.h (100%) rename {avahi-core => avahi}/server.c (99%) rename {avahi-common => avahi}/simple-watch.c (100%) rename {avahi-common => avahi}/simple-watch.h (98%) rename {avahi-core => avahi}/socket.c (100%) rename {avahi-core => avahi}/socket.h (100%) rename {avahi-common => avahi}/strlst-test.c (100%) rename {avahi-common => avahi}/strlst.c (100%) rename {avahi-common => avahi}/strlst.h (99%) rename {avahi-common => avahi}/thread-watch.c (100%) rename {avahi-common => avahi}/thread-watch.h (98%) rename {avahi-core => avahi}/timeeventq-test.c (96%) rename {avahi-core => avahi}/timeeventq.c (98%) rename {avahi-core => avahi}/timeeventq.h (97%) rename {avahi-common => avahi}/timeval-test.c (100%) rename {avahi-common => avahi}/timeval.c (100%) rename {avahi-common => avahi}/timeval.h (98%) rename {avahi-core => avahi}/update-test.c (88%) rename {avahi-common => avahi}/utf8-test.c (96%) rename {avahi-common => avahi}/utf8.c (100%) rename {avahi-common => avahi}/utf8.h (96%) rename {avahi-core => avahi}/util.c (98%) rename {avahi-core => avahi}/util.h (97%) rename {avahi-common => avahi}/watch-test.c (100%) rename {avahi-common => avahi}/watch.h (99%) rename {avahi-core => avahi}/wide-area.c (99%) rename {avahi-core => avahi}/wide-area.h (100%) diff --git a/Makefile.am b/Makefile.am index b49ca9b..5d06840 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,31 +37,30 @@ EXTRA_DIST = \ docs/overview.dia \ docs/server-states.dia \ docs/avahi-poll.dia \ - avahi-core.pc.in \ + avahi.pc.in \ doxygen_to_devhelp.xsl SUBDIRS = \ common \ - avahi-common \ - avahi-core \ + avahi \ examples DX_INPUT = \ - $(srcdir)/avahi-common/address.h \ - $(srcdir)/avahi-common/malloc.h \ - $(srcdir)/avahi-common/strlst.h \ - $(srcdir)/avahi-common/alternative.h \ - $(srcdir)/avahi-common/defs.h \ - $(srcdir)/avahi-common/error.h \ - $(srcdir)/avahi-common/domain.h \ - $(srcdir)/avahi-common/watch.h \ - $(srcdir)/avahi-common/simple-watch.h \ - $(srcdir)/avahi-common/thread-watch.h \ - $(srcdir)/avahi-core/core.h \ - $(srcdir)/avahi-core/lookup.h \ - $(srcdir)/avahi-core/publish.h \ - $(srcdir)/avahi-core/rr.h \ - $(srcdir)/avahi-core/log.h + $(srcdir)/avahi/address.h \ + $(srcdir)/avahi/malloc.h \ + $(srcdir)/avahi/strlst.h \ + $(srcdir)/avahi/alternative.h \ + $(srcdir)/avahi/defs.h \ + $(srcdir)/avahi/error.h \ + $(srcdir)/avahi/domain.h \ + $(srcdir)/avahi/watch.h \ + $(srcdir)/avahi/simple-watch.h \ + $(srcdir)/avahi/thread-watch.h \ + $(srcdir)/avahi/core.h \ + $(srcdir)/avahi/lookup.h \ + $(srcdir)/avahi/publish.h \ + $(srcdir)/avahi/rr.h \ + $(srcdir)/avahi/log.h DX_EXAMPLE_PATH = $(srcdir)/examples DX_EXAMPLE_PATTERNS = *.c @@ -73,8 +72,8 @@ pkgconfigdir = $(libdir)/pkgconfig -e 's,@libdir\@,$(libdir),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@ -pkgconfig_DATA = avahi-core.pc -CLEANFILES = avahi-core.pc +pkgconfig_DATA = avahi.pc +CLEANFILES = avahi.pc CLEANFILES += avahi.devhelp avahi.devhelp: doxygen-run diff --git a/README b/README index eba8f3c..24d9cab 100644 --- a/README +++ b/README @@ -22,6 +22,3 @@ CONFIGURE SWITCHES: --enable-tests build some test programs, including those for 'make check'. - ---enable-core-docs -include files from 'avahi-core' when building the doxygen docs. diff --git a/avahi-common/.gitignore b/avahi-common/.gitignore deleted file mode 100644 index b523810..0000000 --- a/avahi-common/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -*.o -*.lo -*.la -Makefile -Makefile.in -.deps -.libs -alternative-test -domain-test -strlst-test -timeval-test -utf8-test -watch-test -watch-test-thread diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am deleted file mode 100644 index c78e34a..0000000 --- a/avahi-common/Makefile.am +++ /dev/null @@ -1,121 +0,0 @@ -# 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) - -# 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 \ - domain.h \ - cdecl.h \ - defs.h \ - malloc.h \ - watch.h \ - timeval.h \ - simple-watch.h \ - thread-watch.h \ - gccmacro.h \ - error.h \ - llist.h \ - rlist.h - -if ENABLE_TESTS -noinst_PROGRAMS = \ - strlst-test \ - domain-test \ - alternative-test \ - timeval-test \ - watch-test \ - watch-test-thread \ - utf8-test -endif - -lib_LTLIBRARIES = \ - libavahi-common.la - -libavahi_common_la_SOURCES = \ - malloc.c malloc.h \ - address.c address.h \ - alternative.c alternative.h \ - error.c error.h \ - strlst.c strlst.h \ - domain.c domain.h \ - timeval.c timeval.h \ - simple-watch.c simple-watch.h \ - thread-watch.c thread-watch.h \ - watch.h gccmacro.h \ - rlist.h rlist.c \ - utf8.c utf8.h \ - i18n.c i18n.h - -libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\" -libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS) -libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMMON_VERSION_INFO) - -strlst_test_SOURCES = \ - strlst.c strlst.h \ - malloc.c malloc.h \ - strlst-test.c -strlst_test_CFLAGS = $(AM_CFLAGS) - -alternative_test_SOURCES = \ - alternative.c alternative.h \ - malloc.c malloc.h \ - domain.c domain.h \ - address.c address.h \ - alternative-test.c \ - utf8.c utf8.h -alternative_test_CFLAGS = $(AM_CFLAGS) - -domain_test_SOURCES = \ - domain.c domain.h \ - malloc.c malloc.h \ - address.c address.h \ - domain-test.c \ - utf8.c utf8.h -domain_test_CFLAGS = $(AM_CFLAGS) - -watch_test_SOURCES = \ - timeval.c timeval.h \ - simple-watch.c simple-watch.h \ - watch.h \ - malloc.c malloc.h \ - watch-test.c -watch_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -watch_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) - -watch_test_thread_SOURCES = $(watch_test_SOURCES) thread-watch.c thread-watch.h -watch_test_thread_CFLAGS = $(watch_test_CFLAGS) -DUSE_THREAD -watch_test_thread_LDADD = $(watch_test_LDADD) - -timeval_test_SOURCES = \ - timeval.c timeval.h \ - timeval-test.c -timeval_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) - -utf8_test_SOURCES = \ - utf8-test.c \ - utf8.c utf8.h -utf8_test_CFLAGS = $(AM_CFLAGS) -utf8_test_LDADD = $(AM_LDADD) diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am deleted file mode 100644 index 2f09596..0000000 --- a/avahi-core/Makefile.am +++ /dev/null @@ -1,173 +0,0 @@ -# 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) - -# This cool debug trap works on i386/gcc only -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' - -avahiincludedir=$(includedir)/avahi-core - -avahiinclude_HEADERS = \ - core.h \ - log.h \ - rr.h \ - publish.h \ - lookup.h - -lib_LTLIBRARIES = \ - libavahi-core.la - -if ENABLE_TESTS -noinst_PROGRAMS = \ - prioq-test \ - avahi-test \ - conformance-test \ - avahi-reflector \ - dns-test \ - dns-spin-test \ - timeeventq-test \ - hashmap-test \ - querier-test \ - update-test - -TESTS = \ - dns-spin-test \ - dns-test \ - hashmap-test -endif - -libavahi_core_la_SOURCES = \ - timeeventq.c timeeventq.h\ - iface.c iface.h \ - server.c internal.h entry.c \ - prioq.c prioq.h \ - cache.c cache.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 \ - rrlist.c rrlist.h \ - resolve-host-name.c \ - resolve-address.c \ - browse-domain.c \ - browse-service-type.c \ - browse-service.c \ - resolve-service.c \ - dns.c dns.h \ - rr.c rr.h rr-util.h \ - core.h lookup.h publish.h \ - log.c log.h \ - browse-dns-server.c \ - fdutil.h fdutil.c \ - util.c util.h \ - hashmap.c hashmap.h \ - wide-area.c wide-area.h \ - multicast-lookup.c multicast-lookup.h \ - querier.c querier.h \ - addr-util.h addr-util.c \ - domain-util.h domain-util.c \ - dns-srv-rr.h - -if HAVE_NETLINK -libavahi_core_la_SOURCES += \ - iface-linux.c iface-linux.h \ - netlink.c netlink.h -else -if HAVE_PF_ROUTE -libavahi_core_la_SOURCES += \ - iface-pfroute.c iface-pfroute.h -else -libavahi_core_la_SOURCES += \ - iface-none.c -endif -endif - -libavahi_core_la_CFLAGS = $(AM_CFLAGS) -libavahi_core_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la -libavahi_core_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_CORE_VERSION_INFO) - -prioq_test_SOURCES = \ - prioq-test.c \ - prioq.c prioq.h -prioq_test_CFLAGS = $(AM_CFLAGS) -prioq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la - -avahi_test_SOURCES = \ - avahi-test.c -avahi_test_CFLAGS = $(AM_CFLAGS) -avahi_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la - -update_test_SOURCES = \ - update-test.c -update_test_CFLAGS = $(AM_CFLAGS) -update_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la - -querier_test_SOURCES = \ - querier-test.c -querier_test_CFLAGS = $(AM_CFLAGS) -querier_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la - -conformance_test_SOURCES = \ - conformance-test.c -conformance_test_CFLAGS = $(AM_CFLAGS) -conformance_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la - -avahi_reflector_SOURCES = \ - avahi-reflector.c -avahi_reflector_CFLAGS = $(AM_CFLAGS) -avahi_reflector_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la libavahi-core.la - -dns_test_SOURCES = \ - dns.c dns.h \ - dns-test.c \ - log.c log.h \ - util.c util.h \ - rr.c rr.h \ - hashmap.c hashmap.h \ - domain-util.c domain-util.h \ - addr-util.c addr-util.h -dns_test_CFLAGS = $(AM_CFLAGS) -dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la - -dns_spin_test_SOURCES = \ - dns-spin-test.c -dns_spin_test_CFLAGS = $(AM_CFLAGS) -dns_spin_test_LDADD = $(AM_LDADD) libavahi-core.la - -timeeventq_test_SOURCES = \ - timeeventq-test.c \ - timeeventq.h timeeventq.c \ - prioq.h prioq.c \ - log.c log.h -timeeventq_test_CFLAGS = $(AM_CFLAGS) -timeeventq_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la - -hashmap_test_SOURCES = \ - hashmap-test.c \ - hashmap.h hashmap.c \ - util.h util.c -hashmap_test_CFLAGS = $(AM_CFLAGS) -hashmap_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la - -valgrind: avahi-test - libtool --mode=execute valgrind ./avahi-test - -gdb: avahi-test - libtool --mode=execute gdb ./avahi-test diff --git a/avahi-core.pc.in b/avahi.pc.in similarity index 76% rename from avahi-core.pc.in rename to avahi.pc.in index 52491b4..8be903c 100644 --- a/avahi-core.pc.in +++ b/avahi.pc.in @@ -3,8 +3,8 @@ exec_prefix=${prefix} libdir=@libdir@ includedir=${prefix}/include -Name: avahi-core +Name: avahi Description: Avahi Multicast DNS Responder (Embeddable Stack) Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lavahi-common -lavahi-core +Libs: -L${libdir} -lavahi Cflags: -D_REENTRANT -I${includedir} diff --git a/avahi-core/.gitignore b/avahi/.gitignore similarity index 69% rename from avahi-core/.gitignore rename to avahi/.gitignore index 847b855..49b7739 100644 --- a/avahi-core/.gitignore +++ b/avahi/.gitignore @@ -5,6 +5,13 @@ Makefile Makefile.in .deps .libs +alternative-test +domain-test +strlst-test +timeval-test +utf8-test +watch-test +watch-test-thread avahi-reflector avahi-test conformance-test diff --git a/avahi/Makefile.am b/avahi/Makefile.am new file mode 100644 index 0000000..bcb101c --- /dev/null +++ b/avahi/Makefile.am @@ -0,0 +1,212 @@ +# 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) + +# This cool debug trap works on i386/gcc only +AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' + +avahiincludedir=$(includedir)/src + +avahiinclude_HEADERS = \ + strlst.h \ + address.h \ + alternative.h \ + domain.h \ + cdecl.h \ + defs.h \ + malloc.h \ + watch.h \ + timeval.h \ + simple-watch.h \ + thread-watch.h \ + gccmacro.h \ + error.h \ + llist.h \ + rlist.h \ + core.h \ + log.h \ + rr.h \ + publish.h \ + lookup.h + +lib_LTLIBRARIES = libavahi.la + +if ENABLE_TESTS +noinst_PROGRAMS = \ + strlst-test \ + domain-test \ + alternative-test \ + timeval-test \ + watch-test \ + watch-test-thread \ + utf8-test \ + prioq-test \ + avahi-test \ + conformance-test \ + avahi-reflector \ + dns-test \ + dns-spin-test \ + timeeventq-test \ + hashmap-test \ + querier-test \ + update-test + +TESTS = \ + dns-spin-test \ + dns-test \ + hashmap-test +endif + +libavahi_la_SOURCES = \ + malloc.c malloc.h \ + address.c address.h \ + alternative.c alternative.h \ + error.c error.h \ + strlst.c strlst.h \ + domain.c domain.h \ + timeval.c timeval.h \ + simple-watch.c simple-watch.h \ + thread-watch.c thread-watch.h \ + watch.h gccmacro.h \ + rlist.h rlist.c \ + utf8.c utf8.h \ + i18n.c i18n.h \ + timeeventq.c timeeventq.h\ + iface.c iface.h \ + server.c internal.h entry.c \ + prioq.c prioq.h \ + cache.c cache.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 \ + rrlist.c rrlist.h \ + resolve-host-name.c \ + resolve-address.c \ + browse-domain.c \ + browse-service-type.c \ + browse-service.c \ + resolve-service.c \ + dns.c dns.h \ + rr.c rr.h rr-util.h \ + core.h lookup.h publish.h \ + log.c log.h \ + browse-dns-server.c \ + fdutil.h fdutil.c \ + util.c util.h \ + hashmap.c hashmap.h \ + wide-area.c wide-area.h \ + multicast-lookup.c multicast-lookup.h \ + querier.c querier.h \ + addr-util.h addr-util.c \ + domain-util.h domain-util.c \ + dns-srv-rr.h + +if HAVE_NETLINK +libavahi_la_SOURCES += \ + iface-linux.c iface-linux.h \ + netlink.c netlink.h +else +if HAVE_PF_ROUTE +libavahi_la_SOURCES += \ + iface-pfroute.c iface-pfroute.h +else +libavahi_la_SOURCES += \ + iface-none.c +endif +endif + +libavahi_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\" +libavahi_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS) +libavahi_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_VERSION_INFO) + +strlst_test_SOURCES = strlst-test.c +strlst_test_CFLAGS = $(AM_CFLAGS) +strlst_test_LDADD = $(AM_LDADD) libavahi.la + +alternative_test_SOURCES = alternative-test.c +alternative_test_CFLAGS = $(AM_CFLAGS) +alternative_test_LDADD = $(AM_LDADD) libavahi.la + +domain_test_SOURCES = domain-test.c +domain_test_CFLAGS = $(AM_CFLAGS) +domain_test_LDADD = $(AM_LDADD) libavahi.la + +watch_test_SOURCES = watch-test.c +watch_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +watch_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) libavahi.la + +watch_test_thread_SOURCES = $(watch_test_SOURCES) +watch_test_thread_CFLAGS = $(watch_test_CFLAGS) -DUSE_THREAD +watch_test_thread_LDADD = $(watch_test_LDADD) libavahi.la + +timeval_test_SOURCES = timeval-test.c +timeval_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) +timeval_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) libavahi.la + +utf8_test_SOURCES = utf8-test.c +utf8_test_CFLAGS = $(AM_CFLAGS) +utf8_test_LDADD = $(AM_LDADD) libavahi.la + +prioq_test_SOURCES = prioq-test.c +prioq_test_CFLAGS = $(AM_CFLAGS) +prioq_test_LDADD = $(AM_LDADD) libavahi.la + +avahi_test_SOURCES = avahi-test.c +avahi_test_CFLAGS = $(AM_CFLAGS) +avahi_test_LDADD = $(AM_LDADD) libavahi.la + +update_test_SOURCES = update-test.c +update_test_CFLAGS = $(AM_CFLAGS) +update_test_LDADD = $(AM_LDADD) libavahi.la + +querier_test_SOURCES = querier-test.c +querier_test_CFLAGS = $(AM_CFLAGS) +querier_test_LDADD = $(AM_LDADD) libavahi.la + +conformance_test_SOURCES = conformance-test.c +conformance_test_CFLAGS = $(AM_CFLAGS) +conformance_test_LDADD = $(AM_LDADD) libavahi.la + +avahi_reflector_SOURCES = avahi-reflector.c +avahi_reflector_CFLAGS = $(AM_CFLAGS) +avahi_reflector_LDADD = $(AM_LDADD) libavahi.la + +dns_test_SOURCES = dns-test.c +dns_test_CFLAGS = $(AM_CFLAGS) +dns_test_LDADD = $(AM_LDADD) libavahi.la + +dns_spin_test_SOURCES = dns-spin-test.c +dns_spin_test_CFLAGS = $(AM_CFLAGS) +dns_spin_test_LDADD = $(AM_LDADD) libavahi.la + +timeeventq_test_SOURCES = timeeventq-test.c +timeeventq_test_CFLAGS = $(AM_CFLAGS) +timeeventq_test_LDADD = $(AM_LDADD) libavahi.la + +hashmap_test_SOURCES = hashmap-test.c +hashmap_test_CFLAGS = $(AM_CFLAGS) +hashmap_test_LDADD = $(AM_LDADD) libavahi.la + +valgrind: avahi-test + libtool --mode=execute valgrind ./avahi-test + +gdb: avahi-test + libtool --mode=execute gdb ./avahi-test diff --git a/avahi-core/addr-util.c b/avahi/addr-util.c similarity index 100% rename from avahi-core/addr-util.c rename to avahi/addr-util.c diff --git a/avahi-core/addr-util.h b/avahi/addr-util.h similarity index 95% rename from avahi-core/addr-util.h rename to avahi/addr-util.h index 66a9422..313772b 100644 --- a/avahi-core/addr-util.h +++ b/avahi/addr-util.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/address.c b/avahi/address.c similarity index 100% rename from avahi-common/address.c rename to avahi/address.c diff --git a/avahi-common/address.h b/avahi/address.h similarity index 99% rename from avahi-common/address.h rename to avahi/address.h index a14104f..7051ef1 100644 --- a/avahi-common/address.h +++ b/avahi/address.h @@ -25,7 +25,7 @@ #include #include -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/alternative-test.c b/avahi/alternative-test.c similarity index 100% rename from avahi-common/alternative-test.c rename to avahi/alternative-test.c diff --git a/avahi-common/alternative.c b/avahi/alternative.c similarity index 100% rename from avahi-common/alternative.c rename to avahi/alternative.c diff --git a/avahi-common/alternative.h b/avahi/alternative.h similarity index 98% rename from avahi-common/alternative.h rename to avahi/alternative.h index 9b044de..c4a2846 100644 --- a/avahi-common/alternative.h +++ b/avahi/alternative.h @@ -22,7 +22,7 @@ /** \file alternative.h Functions to find alternative names for hosts and services in the case of name collision */ -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/announce.c b/avahi/announce.c similarity index 99% rename from avahi-core/announce.c rename to avahi/announce.c index ccdbf15..ac75ad3 100644 --- a/avahi-core/announce.c +++ b/avahi/announce.c @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include "announce.h" #include "log.h" diff --git a/avahi-core/announce.h b/avahi/announce.h similarity index 98% rename from avahi-core/announce.h rename to avahi/announce.h index fd23d8b..f57b9d7 100644 --- a/avahi-core/announce.h +++ b/avahi/announce.h @@ -22,7 +22,7 @@ typedef struct AvahiAnnouncer AvahiAnnouncer; -#include +#include #include "iface.h" #include "internal.h" #include "timeeventq.h" diff --git a/avahi-core/avahi-reflector.c b/avahi/avahi-reflector.c similarity index 96% rename from avahi-core/avahi-reflector.c rename to avahi/avahi-reflector.c index dee1e93..97032c2 100644 --- a/avahi-core/avahi-reflector.c +++ b/avahi/avahi-reflector.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) { AvahiServer *server; diff --git a/avahi-core/avahi-test.c b/avahi/avahi-test.c similarity index 97% rename from avahi-core/avahi-test.c rename to avahi/avahi-test.c index 8b2376f..31edd0c 100644 --- a/avahi-core/avahi-test.c +++ b/avahi/avahi-test.c @@ -30,16 +30,16 @@ #include #include -#include -#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include static AvahiSEntryGroup *group = NULL; static AvahiServer *server = NULL; diff --git a/avahi-core/browse-dns-server.c b/avahi/browse-dns-server.c similarity index 98% rename from avahi-core/browse-dns-server.c rename to avahi/browse-dns-server.c index a51c38f..579c51b 100644 --- a/avahi-core/browse-dns-server.c +++ b/avahi/browse-dns-server.c @@ -23,9 +23,9 @@ #include -#include -#include -#include +#include +#include +#include #include "browse.h" #include "log.h" diff --git a/avahi-core/browse-domain.c b/avahi/browse-domain.c similarity index 98% rename from avahi-core/browse-domain.c rename to avahi/browse-domain.c index 9705b2a..134c745 100644 --- a/avahi-core/browse-domain.c +++ b/avahi/browse-domain.c @@ -23,9 +23,9 @@ #include -#include -#include -#include +#include +#include +#include #include "browse.h" #include "log.h" diff --git a/avahi-core/browse-service-type.c b/avahi/browse-service-type.c similarity index 97% rename from avahi-core/browse-service-type.c rename to avahi/browse-service-type.c index 6fff071..8eb42da 100644 --- a/avahi-core/browse-service-type.c +++ b/avahi/browse-service-type.c @@ -23,9 +23,9 @@ #include -#include -#include -#include +#include +#include +#include #include "browse.h" #include "log.h" diff --git a/avahi-core/browse-service.c b/avahi/browse-service.c similarity index 98% rename from avahi-core/browse-service.c rename to avahi/browse-service.c index dde36bc..babe7a1 100644 --- a/avahi-core/browse-service.c +++ b/avahi/browse-service.c @@ -23,9 +23,9 @@ #include -#include -#include -#include +#include +#include +#include #include "browse.h" #include "log.h" diff --git a/avahi-core/browse.c b/avahi/browse.c similarity index 98% rename from avahi-core/browse.c rename to avahi/browse.c index eabd7ea..47d5f23 100644 --- a/avahi-core/browse.c +++ b/avahi/browse.c @@ -23,12 +23,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "browse.h" #include "log.h" diff --git a/avahi-core/browse.h b/avahi/browse.h similarity index 98% rename from avahi-core/browse.h rename to avahi/browse.h index a0dc207..2592b80 100644 --- a/avahi-core/browse.h +++ b/avahi/browse.h @@ -20,7 +20,7 @@ USA. ***/ -#include +#include #include "core.h" #include "timeeventq.h" diff --git a/avahi-core/cache.c b/avahi/cache.c similarity index 99% rename from avahi-core/cache.c rename to avahi/cache.c index 454aac5..fa4a24a 100644 --- a/avahi-core/cache.c +++ b/avahi/cache.c @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include "cache.h" #include "log.h" diff --git a/avahi-core/cache.h b/avahi/cache.h similarity index 98% rename from avahi-core/cache.h rename to avahi/cache.h index 49ba9b9..a1c8db3 100644 --- a/avahi-core/cache.h +++ b/avahi/cache.h @@ -22,7 +22,7 @@ typedef struct AvahiCache AvahiCache; -#include +#include #include "prioq.h" #include "internal.h" #include "timeeventq.h" diff --git a/avahi-common/cdecl.h b/avahi/cdecl.h similarity index 100% rename from avahi-common/cdecl.h rename to avahi/cdecl.h diff --git a/avahi-core/conformance-test.c b/avahi/conformance-test.c similarity index 94% rename from avahi-core/conformance-test.c rename to avahi/conformance-test.c index 632f66b..d2b40d4 100644 --- a/avahi-core/conformance-test.c +++ b/avahi/conformance-test.c @@ -31,15 +31,15 @@ #include #include -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include static char *name = NULL; static AvahiSEntryGroup *group = NULL; diff --git a/avahi-core/core.h b/avahi/core.h similarity index 97% rename from avahi-core/core.h rename to avahi/core.h index f14dc84..491def7 100644 --- a/avahi-core/core.h +++ b/avahi/core.h @@ -25,12 +25,12 @@ /** An mDNS responder object */ typedef struct AvahiServer AvahiServer; -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/defs.h b/avahi/defs.h similarity index 99% rename from avahi-common/defs.h rename to avahi/defs.h index bb73a9d..8c66700 100644 --- a/avahi-common/defs.h +++ b/avahi/defs.h @@ -22,7 +22,7 @@ /** \file defs.h Some common definitions */ -#include +#include /** \mainpage * diff --git a/avahi-core/dns-spin-test.c b/avahi/dns-spin-test.c similarity index 100% rename from avahi-core/dns-spin-test.c rename to avahi/dns-spin-test.c diff --git a/avahi-core/dns-srv-rr.h b/avahi/dns-srv-rr.h similarity index 92% rename from avahi-core/dns-srv-rr.h rename to avahi/dns-srv-rr.h index fdd9010..c52111b 100644 --- a/avahi-core/dns-srv-rr.h +++ b/avahi/dns-srv-rr.h @@ -20,17 +20,17 @@ USA. ***/ -/** \file avahi-core/dns-srv-rr.h Functions for announcing and browsing for unicast DNS servers via mDNS */ +/** \file avahi/dns-srv-rr.h Functions for announcing and browsing for unicast DNS servers via mDNS */ /** A domain service browser object. Use this to browse for * conventional unicast DNS servers which may be used to resolve * conventional domain names */ typedef struct AvahiSDNSServerBrowser AvahiSDNSServerBrowser; -#include -#include -#include -#include +#include +#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/dns-test.c b/avahi/dns-test.c similarity index 97% rename from avahi-core/dns-test.c rename to avahi/dns-test.c index ebe2305..dd95487 100644 --- a/avahi-core/dns-test.c +++ b/avahi/dns-test.c @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "dns.h" #include "log.h" diff --git a/avahi-core/dns.c b/avahi/dns.c similarity index 99% rename from avahi-core/dns.c rename to avahi/dns.c index 2fcd91f..84a0df3 100644 --- a/avahi-core/dns.c +++ b/avahi/dns.c @@ -29,9 +29,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "dns.h" #include "log.h" diff --git a/avahi-core/dns.h b/avahi/dns.h similarity index 100% rename from avahi-core/dns.h rename to avahi/dns.h diff --git a/avahi-common/domain-test.c b/avahi/domain-test.c similarity index 100% rename from avahi-common/domain-test.c rename to avahi/domain-test.c diff --git a/avahi-core/domain-util.c b/avahi/domain-util.c similarity index 99% rename from avahi-core/domain-util.c rename to avahi/domain-util.c index 6eed27f..7731dd1 100644 --- a/avahi-core/domain-util.c +++ b/avahi/domain-util.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "log.h" #include "domain-util.h" diff --git a/avahi-core/domain-util.h b/avahi/domain-util.h similarity index 95% rename from avahi-core/domain-util.h rename to avahi/domain-util.h index 082fde6..2b786df 100644 --- a/avahi-core/domain-util.h +++ b/avahi/domain-util.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/domain.c b/avahi/domain.c similarity index 100% rename from avahi-common/domain.c rename to avahi/domain.c diff --git a/avahi-common/domain.h b/avahi/domain.h similarity index 99% rename from avahi-common/domain.h rename to avahi/domain.h index a0dcd0f..b3630af 100644 --- a/avahi-common/domain.h +++ b/avahi/domain.h @@ -25,7 +25,7 @@ #include #include -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/entry.c b/avahi/entry.c similarity index 99% rename from avahi-core/entry.c rename to avahi/entry.c index 0d86213..2fbc45a 100644 --- a/avahi-core/entry.c +++ b/avahi/entry.c @@ -34,11 +34,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "internal.h" #include "iface.h" diff --git a/avahi-common/error.c b/avahi/error.c similarity index 100% rename from avahi-common/error.c rename to avahi/error.c diff --git a/avahi-common/error.h b/avahi/error.h similarity index 99% rename from avahi-common/error.h rename to avahi/error.h index 94511c9..bfab2d3 100644 --- a/avahi-common/error.h +++ b/avahi/error.h @@ -22,7 +22,7 @@ /** \file error.h Error codes and auxiliary functions */ -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/fdutil.c b/avahi/fdutil.c similarity index 100% rename from avahi-core/fdutil.c rename to avahi/fdutil.c diff --git a/avahi-core/fdutil.h b/avahi/fdutil.h similarity index 96% rename from avahi-core/fdutil.h rename to avahi/fdutil.h index 68607f8..a0e72df 100644 --- a/avahi-core/fdutil.h +++ b/avahi/fdutil.h @@ -20,7 +20,7 @@ USA. ***/ -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/findstatic.pl b/avahi/findstatic.pl similarity index 100% rename from avahi-core/findstatic.pl rename to avahi/findstatic.pl diff --git a/avahi-common/gccmacro.h b/avahi/gccmacro.h similarity index 98% rename from avahi-common/gccmacro.h rename to avahi/gccmacro.h index 4c97111..08b9980 100644 --- a/avahi-common/gccmacro.h +++ b/avahi/gccmacro.h @@ -22,7 +22,7 @@ /** \file gccmacro.h Defines some macros for GCC extensions */ -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/hashmap-test.c b/avahi/hashmap-test.c similarity index 96% rename from avahi-core/hashmap-test.c rename to avahi/hashmap-test.c index 209d0e5..54ac1b0 100644 --- a/avahi-core/hashmap-test.c +++ b/avahi/hashmap-test.c @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include "hashmap.h" #include "util.h" diff --git a/avahi-core/hashmap.c b/avahi/hashmap.c similarity index 98% rename from avahi-core/hashmap.c rename to avahi/hashmap.c index 9b55bd3..ae03416 100644 --- a/avahi-core/hashmap.c +++ b/avahi/hashmap.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "hashmap.h" #include "util.h" diff --git a/avahi-core/hashmap.h b/avahi/hashmap.h similarity index 98% rename from avahi-core/hashmap.h rename to avahi/hashmap.h index 9d7e81f..16adf6f 100644 --- a/avahi-core/hashmap.h +++ b/avahi/hashmap.h @@ -20,7 +20,7 @@ USA. ***/ -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/i18n.c b/avahi/i18n.c similarity index 100% rename from avahi-common/i18n.c rename to avahi/i18n.c diff --git a/avahi-common/i18n.h b/avahi/i18n.h similarity index 100% rename from avahi-common/i18n.h rename to avahi/i18n.h diff --git a/avahi-core/iface-linux.c b/avahi/iface-linux.c similarity index 99% rename from avahi-core/iface-linux.c rename to avahi/iface-linux.c index da497bc..37a371b 100644 --- a/avahi-core/iface-linux.c +++ b/avahi/iface-linux.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "log.h" #include "iface.h" diff --git a/avahi-core/iface-linux.h b/avahi/iface-linux.h similarity index 100% rename from avahi-core/iface-linux.h rename to avahi/iface-linux.h diff --git a/avahi-core/iface-none.c b/avahi/iface-none.c similarity index 100% rename from avahi-core/iface-none.c rename to avahi/iface-none.c diff --git a/avahi-core/iface-pfroute.c b/avahi/iface-pfroute.c similarity index 99% rename from avahi-core/iface-pfroute.c rename to avahi/iface-pfroute.c index 9a2e953..7a885ab 100644 --- a/avahi-core/iface-pfroute.c +++ b/avahi/iface-pfroute.c @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include diff --git a/avahi-core/iface-pfroute.h b/avahi/iface-pfroute.h similarity index 97% rename from avahi-core/iface-pfroute.h rename to avahi/iface-pfroute.h index 3766cb0..15c2dcb 100644 --- a/avahi-core/iface-pfroute.h +++ b/avahi/iface-pfroute.h @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ -#include +#include typedef struct AvahiPfRoute AvahiPfRoute; struct AvahiPfRoute { diff --git a/avahi-core/iface.c b/avahi/iface.c similarity index 99% rename from avahi-core/iface.c rename to avahi/iface.c index 60a4f49..c17f994 100644 --- a/avahi-core/iface.c +++ b/avahi/iface.c @@ -29,9 +29,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "iface.h" #include "dns.h" diff --git a/avahi-core/iface.h b/avahi/iface.h similarity index 99% rename from avahi-core/iface.h rename to avahi/iface.h index c3f24af..88d75c2 100644 --- a/avahi-core/iface.h +++ b/avahi/iface.h @@ -25,8 +25,8 @@ typedef struct AvahiInterfaceAddress AvahiInterfaceAddress; typedef struct AvahiInterface AvahiInterface; typedef struct AvahiHwInterface AvahiHwInterface; -#include -#include +#include +#include #include "internal.h" #include "cache.h" diff --git a/avahi-core/internal.h b/avahi/internal.h similarity index 98% rename from avahi-core/internal.h rename to avahi/internal.h index b8f9302..5ddaade 100644 --- a/avahi-core/internal.h +++ b/avahi/internal.h @@ -23,9 +23,9 @@ /** A locally registered DNS resource record */ typedef struct AvahiEntry AvahiEntry; -#include -#include -#include +#include +#include +#include #include "core.h" #include "iface.h" diff --git a/avahi-common/llist.h b/avahi/llist.h similarity index 98% rename from avahi-common/llist.h rename to avahi/llist.h index e37056d..5101353 100644 --- a/avahi-common/llist.h +++ b/avahi/llist.h @@ -24,7 +24,7 @@ #include -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/log.c b/avahi/log.c similarity index 100% rename from avahi-core/log.c rename to avahi/log.c diff --git a/avahi-core/log.h b/avahi/log.h similarity index 97% rename from avahi-core/log.h rename to avahi/log.h index 878f07a..df9b6f1 100644 --- a/avahi-core/log.h +++ b/avahi/log.h @@ -22,8 +22,8 @@ #include -#include -#include +#include +#include /** \file log.h Extensible logging subsystem */ diff --git a/avahi-core/lookup.h b/avahi/lookup.h similarity index 98% rename from avahi-core/lookup.h rename to avahi/lookup.h index 06dec6e..5a04ff9 100644 --- a/avahi-core/lookup.h +++ b/avahi/lookup.h @@ -20,7 +20,7 @@ USA. ***/ -/** \file avahi-core/lookup.h Functions for browsing/resolving services and other RRs */ +/** \file avahi/lookup.h Functions for browsing/resolving services and other RRs */ /** \example core-browse-services.c Example how to browse for DNS-SD * services using an embedded mDNS stack. */ @@ -46,9 +46,9 @@ typedef struct AvahiSServiceBrowser AvahiSServiceBrowser; /** A DNS-SD service resolver. Use this to retrieve addres, port and TXT data for a DNS-SD service */ typedef struct AvahiSServiceResolver AvahiSServiceResolver; -#include -#include -#include +#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/malloc.c b/avahi/malloc.c similarity index 100% rename from avahi-common/malloc.c rename to avahi/malloc.c diff --git a/avahi-common/malloc.h b/avahi/malloc.h similarity index 97% rename from avahi-common/malloc.h rename to avahi/malloc.h index ffaac3f..3467cc2 100644 --- a/avahi-common/malloc.h +++ b/avahi/malloc.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/multicast-lookup.c b/avahi/multicast-lookup.c similarity index 99% rename from avahi-core/multicast-lookup.c rename to avahi/multicast-lookup.c index 75988bf..21f2545 100644 --- a/avahi-core/multicast-lookup.c +++ b/avahi/multicast-lookup.c @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include "internal.h" #include "browse.h" diff --git a/avahi-core/multicast-lookup.h b/avahi/multicast-lookup.h similarity index 100% rename from avahi-core/multicast-lookup.h rename to avahi/multicast-lookup.h diff --git a/avahi-core/netlink.c b/avahi/netlink.c similarity index 99% rename from avahi-core/netlink.c rename to avahi/netlink.c index acea696..8ccca2e 100644 --- a/avahi-core/netlink.c +++ b/avahi/netlink.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "netlink.h" #include "log.h" diff --git a/avahi-core/netlink.h b/avahi/netlink.h similarity index 97% rename from avahi-core/netlink.h rename to avahi/netlink.h index 9c6eb28..b11e0a4 100644 --- a/avahi-core/netlink.h +++ b/avahi/netlink.h @@ -27,7 +27,7 @@ #include #include -#include +#include typedef struct AvahiNetlink AvahiNetlink; diff --git a/avahi-core/prioq-test.c b/avahi/prioq-test.c similarity index 98% rename from avahi-core/prioq-test.c rename to avahi/prioq-test.c index 6d0fd62..3315494 100644 --- a/avahi-core/prioq-test.c +++ b/avahi/prioq-test.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "prioq.h" diff --git a/avahi-core/prioq.c b/avahi/prioq.c similarity index 99% rename from avahi-core/prioq.c rename to avahi/prioq.c index 28b5018..e4558ee 100644 --- a/avahi-core/prioq.c +++ b/avahi/prioq.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "prioq.h" diff --git a/avahi-core/prioq.h b/avahi/prioq.h similarity index 100% rename from avahi-core/prioq.h rename to avahi/prioq.h diff --git a/avahi-core/probe-sched.c b/avahi/probe-sched.c similarity index 99% rename from avahi-core/probe-sched.c rename to avahi/probe-sched.c index 1e63411..4a13b19 100644 --- a/avahi-core/probe-sched.c +++ b/avahi/probe-sched.c @@ -23,9 +23,9 @@ #include -#include -#include -#include +#include +#include +#include #include "probe-sched.h" #include "log.h" diff --git a/avahi-core/probe-sched.h b/avahi/probe-sched.h similarity index 97% rename from avahi-core/probe-sched.h rename to avahi/probe-sched.h index e47de41..4193df8 100644 --- a/avahi-core/probe-sched.h +++ b/avahi/probe-sched.h @@ -22,7 +22,7 @@ typedef struct AvahiProbeScheduler AvahiProbeScheduler; -#include +#include #include "iface.h" AvahiProbeScheduler *avahi_probe_scheduler_new(AvahiInterface *i); diff --git a/avahi-core/publish.h b/avahi/publish.h similarity index 99% rename from avahi-core/publish.h rename to avahi/publish.h index 90797de..d877249 100644 --- a/avahi-core/publish.h +++ b/avahi/publish.h @@ -29,8 +29,8 @@ /** A group of locally registered DNS RRs */ typedef struct AvahiSEntryGroup AvahiSEntryGroup; -#include -#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/querier-test.c b/avahi/querier-test.c similarity index 93% rename from avahi-core/querier-test.c rename to avahi/querier-test.c index e1ce913..a6f16ac 100644 --- a/avahi-core/querier-test.c +++ b/avahi/querier-test.c @@ -24,15 +24,15 @@ #include #include -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include #define DOMAIN NULL #define SERVICE_TYPE "_http._tcp" diff --git a/avahi-core/querier.c b/avahi/querier.c similarity index 98% rename from avahi-core/querier.c rename to avahi/querier.c index d9dc1fb..f4666b6 100644 --- a/avahi-core/querier.c +++ b/avahi/querier.c @@ -23,10 +23,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "querier.h" #include "log.h" diff --git a/avahi-core/querier.h b/avahi/querier.h similarity index 100% rename from avahi-core/querier.h rename to avahi/querier.h diff --git a/avahi-core/query-sched.c b/avahi/query-sched.c similarity index 99% rename from avahi-core/query-sched.c rename to avahi/query-sched.c index ff833f9..9c0e7e1 100644 --- a/avahi-core/query-sched.c +++ b/avahi/query-sched.c @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include "query-sched.h" #include "log.h" diff --git a/avahi-core/query-sched.h b/avahi/query-sched.h similarity index 97% rename from avahi-core/query-sched.h rename to avahi/query-sched.h index b45520c..9dfe3b5 100644 --- a/avahi-core/query-sched.h +++ b/avahi/query-sched.h @@ -22,7 +22,7 @@ typedef struct AvahiQueryScheduler AvahiQueryScheduler; -#include +#include #include "iface.h" AvahiQueryScheduler *avahi_query_scheduler_new(AvahiInterface *i); diff --git a/avahi-core/resolve-address.c b/avahi/resolve-address.c similarity index 98% rename from avahi-core/resolve-address.c rename to avahi/resolve-address.c index dd4adbc..f24bee9 100644 --- a/avahi-core/resolve-address.c +++ b/avahi/resolve-address.c @@ -23,10 +23,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "browse.h" diff --git a/avahi-core/resolve-host-name.c b/avahi/resolve-host-name.c similarity index 98% rename from avahi-core/resolve-host-name.c rename to avahi/resolve-host-name.c index 08f209b..a577d48 100644 --- a/avahi-core/resolve-host-name.c +++ b/avahi/resolve-host-name.c @@ -23,10 +23,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "browse.h" #include "log.h" diff --git a/avahi-core/resolve-service.c b/avahi/resolve-service.c similarity index 99% rename from avahi-core/resolve-service.c rename to avahi/resolve-service.c index 3377a50..eaac8bb 100644 --- a/avahi-core/resolve-service.c +++ b/avahi/resolve-service.c @@ -25,10 +25,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "browse.h" #include "log.h" diff --git a/avahi-core/response-sched.c b/avahi/response-sched.c similarity index 99% rename from avahi-core/response-sched.c rename to avahi/response-sched.c index abac0a1..1c8887d 100644 --- a/avahi-core/response-sched.c +++ b/avahi/response-sched.c @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include "response-sched.h" #include "log.h" diff --git a/avahi-core/response-sched.h b/avahi/response-sched.h similarity index 97% rename from avahi-core/response-sched.h rename to avahi/response-sched.h index 548839e..a3eb608 100644 --- a/avahi-core/response-sched.h +++ b/avahi/response-sched.h @@ -22,7 +22,7 @@ typedef struct AvahiResponseScheduler AvahiResponseScheduler; -#include +#include #include "iface.h" AvahiResponseScheduler *avahi_response_scheduler_new(AvahiInterface *i); diff --git a/avahi-common/rlist.c b/avahi/rlist.c similarity index 100% rename from avahi-common/rlist.c rename to avahi/rlist.c diff --git a/avahi-common/rlist.h b/avahi/rlist.h similarity index 100% rename from avahi-common/rlist.h rename to avahi/rlist.h diff --git a/avahi-core/rr-util.h b/avahi/rr-util.h similarity index 100% rename from avahi-core/rr-util.h rename to avahi/rr-util.h diff --git a/avahi-core/rr.c b/avahi/rr.c similarity index 99% rename from avahi-core/rr.c rename to avahi/rr.c index 7fa0bee..0f516fd 100644 --- a/avahi-core/rr.c +++ b/avahi/rr.c @@ -28,9 +28,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "rr.h" #include "log.h" diff --git a/avahi-core/rr.h b/avahi/rr.h similarity index 98% rename from avahi-core/rr.h rename to avahi/rr.h index 794b83f..3cf99dd 100644 --- a/avahi-core/rr.h +++ b/avahi/rr.h @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/rrlist.c b/avahi/rrlist.c similarity index 98% rename from avahi-core/rrlist.c rename to avahi/rrlist.c index 0a794ab..016edbf 100644 --- a/avahi-core/rrlist.c +++ b/avahi/rrlist.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include "rrlist.h" #include "log.h" diff --git a/avahi-core/rrlist.h b/avahi/rrlist.h similarity index 100% rename from avahi-core/rrlist.h rename to avahi/rrlist.h diff --git a/avahi-core/server.c b/avahi/server.c similarity index 99% rename from avahi-core/server.c rename to avahi/server.c index b348269..e0a0e44 100644 --- a/avahi-core/server.c +++ b/avahi/server.c @@ -33,10 +33,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "internal.h" #include "iface.h" diff --git a/avahi-common/simple-watch.c b/avahi/simple-watch.c similarity index 100% rename from avahi-common/simple-watch.c rename to avahi/simple-watch.c diff --git a/avahi-common/simple-watch.h b/avahi/simple-watch.h similarity index 98% rename from avahi-common/simple-watch.h rename to avahi/simple-watch.h index 72c1905..108cadf 100644 --- a/avahi-common/simple-watch.h +++ b/avahi/simple-watch.h @@ -23,8 +23,8 @@ /** \file simple-watch.h Simple poll() based main loop implementation */ #include -#include -#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/socket.c b/avahi/socket.c similarity index 100% rename from avahi-core/socket.c rename to avahi/socket.c diff --git a/avahi-core/socket.h b/avahi/socket.h similarity index 100% rename from avahi-core/socket.h rename to avahi/socket.h diff --git a/avahi-common/strlst-test.c b/avahi/strlst-test.c similarity index 100% rename from avahi-common/strlst-test.c rename to avahi/strlst-test.c diff --git a/avahi-common/strlst.c b/avahi/strlst.c similarity index 100% rename from avahi-common/strlst.c rename to avahi/strlst.c diff --git a/avahi-common/strlst.h b/avahi/strlst.h similarity index 99% rename from avahi-common/strlst.h rename to avahi/strlst.h index 94adcea..c726405 100644 --- a/avahi-common/strlst.h +++ b/avahi/strlst.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/thread-watch.c b/avahi/thread-watch.c similarity index 100% rename from avahi-common/thread-watch.c rename to avahi/thread-watch.c diff --git a/avahi-common/thread-watch.h b/avahi/thread-watch.h similarity index 98% rename from avahi-common/thread-watch.h rename to avahi/thread-watch.h index dec0cf3..855edbc 100644 --- a/avahi-common/thread-watch.h +++ b/avahi/thread-watch.h @@ -23,8 +23,8 @@ /** \file thread-watch.h Threaded poll() based main loop implementation */ #include -#include -#include +#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/timeeventq-test.c b/avahi/timeeventq-test.c similarity index 96% rename from avahi-core/timeeventq-test.c rename to avahi/timeeventq-test.c index d7b2e39..91116ff 100644 --- a/avahi-core/timeeventq-test.c +++ b/avahi/timeeventq-test.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include "timeeventq.h" #include "log.h" diff --git a/avahi-core/timeeventq.c b/avahi/timeeventq.c similarity index 98% rename from avahi-core/timeeventq.c rename to avahi/timeeventq.c index 2799bf2..2de3380 100644 --- a/avahi-core/timeeventq.c +++ b/avahi/timeeventq.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include "timeeventq.h" #include "log.h" diff --git a/avahi-core/timeeventq.h b/avahi/timeeventq.h similarity index 97% rename from avahi-core/timeeventq.h rename to avahi/timeeventq.h index a695b6a..14ad393 100644 --- a/avahi-core/timeeventq.h +++ b/avahi/timeeventq.h @@ -25,7 +25,7 @@ typedef struct AvahiTimeEventQueue AvahiTimeEventQueue; typedef struct AvahiTimeEvent AvahiTimeEvent; -#include +#include #include "prioq.h" diff --git a/avahi-common/timeval-test.c b/avahi/timeval-test.c similarity index 100% rename from avahi-common/timeval-test.c rename to avahi/timeval-test.c diff --git a/avahi-common/timeval.c b/avahi/timeval.c similarity index 100% rename from avahi-common/timeval.c rename to avahi/timeval.c diff --git a/avahi-common/timeval.h b/avahi/timeval.h similarity index 98% rename from avahi-common/timeval.h rename to avahi/timeval.h index 6470f01..618801a 100644 --- a/avahi-common/timeval.h +++ b/avahi/timeval.h @@ -25,7 +25,7 @@ #include #include -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/update-test.c b/avahi/update-test.c similarity index 88% rename from avahi-core/update-test.c rename to avahi/update-test.c index feb884a..dcbba80 100644 --- a/avahi-core/update-test.c +++ b/avahi/update-test.c @@ -24,17 +24,17 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include static AvahiSEntryGroup *group = NULL; diff --git a/avahi-common/utf8-test.c b/avahi/utf8-test.c similarity index 96% rename from avahi-common/utf8-test.c rename to avahi/utf8-test.c index d12ed58..ee928de 100644 --- a/avahi-common/utf8-test.c +++ b/avahi/utf8-test.c @@ -23,7 +23,7 @@ #include -#include +#include #include "utf8.h" diff --git a/avahi-common/utf8.c b/avahi/utf8.c similarity index 100% rename from avahi-common/utf8.c rename to avahi/utf8.c diff --git a/avahi-common/utf8.h b/avahi/utf8.h similarity index 96% rename from avahi-common/utf8.h rename to avahi/utf8.h index dc1ce4b..42ed288 100644 --- a/avahi-common/utf8.h +++ b/avahi/utf8.h @@ -22,7 +22,7 @@ #include -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/util.c b/avahi/util.c similarity index 98% rename from avahi-core/util.c rename to avahi/util.c index 21ef94c..8f4c435 100644 --- a/avahi-core/util.c +++ b/avahi/util.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "util.h" void avahi_hexdump(const void* p, size_t size) { diff --git a/avahi-core/util.h b/avahi/util.h similarity index 97% rename from avahi-core/util.h rename to avahi/util.h index e13c334..787aa89 100644 --- a/avahi-core/util.h +++ b/avahi/util.h @@ -22,7 +22,7 @@ #include -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-common/watch-test.c b/avahi/watch-test.c similarity index 100% rename from avahi-common/watch-test.c rename to avahi/watch-test.c diff --git a/avahi-common/watch.h b/avahi/watch.h similarity index 99% rename from avahi-common/watch.h rename to avahi/watch.h index 86e63d3..6cade5d 100644 --- a/avahi-common/watch.h +++ b/avahi/watch.h @@ -25,7 +25,7 @@ #include #include -#include +#include AVAHI_C_DECL_BEGIN diff --git a/avahi-core/wide-area.c b/avahi/wide-area.c similarity index 99% rename from avahi-core/wide-area.c rename to avahi/wide-area.c index d5e64e5..ab1369d 100644 --- a/avahi-core/wide-area.c +++ b/avahi/wide-area.c @@ -27,9 +27,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "internal.h" #include "browse.h" diff --git a/avahi-core/wide-area.h b/avahi/wide-area.h similarity index 100% rename from avahi-core/wide-area.h rename to avahi/wide-area.h diff --git a/configure.ac b/configure.ac index 6abc045..5dcefae 100644 --- a/configure.ac +++ b/configure.ac @@ -20,15 +20,14 @@ AC_PREREQ(2.63) AC_INIT([avahi],[0.6.31],[avahi (at) lists (dot) freedesktop (dot) org]) -AC_CONFIG_SRCDIR([avahi-core/server.c]) +AC_CONFIG_SRCDIR([avahi/server.c]) AC_CONFIG_MACRO_DIR([common]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) AC_SUBST(PACKAGE_URL, [http://avahi.org/]) -AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:3:5]) -AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [7:2:0]) +AC_SUBST(LIBAVAHI_VERSION_INFO, [7:2:0]) AC_CANONICAL_HOST @@ -324,8 +323,7 @@ AM_CONDITIONAL([ENABLE_TESTS], [test "x$ENABLE_TESTS" = "xyes"]) # ========================================================================== AC_CONFIG_FILES([ Makefile -avahi-common/Makefile -avahi-core/Makefile +avahi/Makefile examples/Makefile common/Makefile ]) @@ -344,6 +342,5 @@ echo " " echo "\ - Building libavahi-core yes Building tests: ${ENABLE_TESTS} " diff --git a/docs/MALLOC b/docs/MALLOC index 7c452af..742e409 100644 --- a/docs/MALLOC +++ b/docs/MALLOC @@ -1,5 +1,5 @@ Avahi supports pluggable memory allocator implemenations. See - for more information. + for more information. Currently, Avahi does not deal well with out-of-memory situations. Therefore we recommend the usage of memory allocators that diff --git a/examples/Makefile.am b/examples/Makefile.am index 2235000..aff7d3c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -25,8 +25,8 @@ endif core_publish_service_SOURCES = core-publish-service.c core_publish_service_CFLAGS = $(AM_CFLAGS) -core_publish_service_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la +core_publish_service_LDADD = $(AM_LDADD) ../avahi/libavahi.la core_browse_services_SOURCES = core-browse-services.c core_browse_services_CFLAGS = $(AM_CFLAGS) -core_browse_services_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la +core_browse_services_LDADD = $(AM_LDADD) ../avahi/libavahi.la diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c index a36668a..563125b 100644 --- a/examples/core-browse-services.c +++ b/examples/core-browse-services.c @@ -37,11 +37,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static AvahiSimplePoll *simple_poll = NULL; static AvahiServer *server = NULL; diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c index 8029eb8..e1afe51 100644 --- a/examples/core-publish-service.c +++ b/examples/core-publish-service.c @@ -26,12 +26,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static AvahiSEntryGroup *group = NULL; static AvahiSimplePoll *simple_poll = NULL; -- 2.39.5