* Patch by Ikke <ikke@eikke.com> to make distcheck pass.

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

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index ffadb3ce7604dd4251ad21785d5fab54cb3695d3..b1188cd74cce7ee9ad3c79608002becd18bdec1d 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -35,6 +35,9 @@ avahi_commoninclude_HEADERS = \
        rr.h \
        util.h
 
+noinst_HEADERS = \
+       cdecl.h
+
 noinst_PROGRAMS = \
        strlst-test \
        domain-test \

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 8280560ef7be7f8cfa8f5aa5a061dc8bf6c0f075..0c6b1e2f3161150eee0ca6f6eb36ca4adc8f690b 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -70,7 +70,7 @@ libavahi_core_la_SOURCES = \
        core.h \
        llist.h \
        log.c log.h \
-       browse-dns-server.c browse-dns-server.h
+       browse-dns-server.c
 libavahi_core_la_CFLAGS = $(AM_CFLAGS)
 libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
 

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 9ea1733675f163336e95a206be7865c428bf84fb..3762ba531fc3c17135023d5869aeec4e5968bcac 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -62,13 +62,15 @@ service_DATA = \
 pkgdata_DATA = \
        avahi-service.dtd
 
+EXTRA_DIST = avahi-service.dtd avahi.conf example.service
+
 if ENABLE_DBUS
 avahi_SOURCES += dbus-protocol.c dbus-protocol.h
 
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = avahi-dbus.conf
 
-EXTRA_DIST = $(dbusservice_DATA)
+EXTRA_DIST += $(dbusservice_DATA)
 endif
 
 avahi_CFLAGS = $(AM_CFLAGS)

diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am
index 5e55a941cf516dccec8435b68572b88c116154d5..7a2185f1cc7d6199a502b30dc3622c8a33f0c0bd 100644 (file)
--- a/avahi-dnsconfd/Makefile.am
+++ b/avahi-dnsconfd/Makefile.am
@@ -38,7 +38,7 @@ bin_PROGRAMS = \
        avahi-dnsconfd
 
 avahi_dnsconfd_SOURCES = \
-       main.c main.h
+       main.c 
 
 avahi_dnsconfd_CFLAGS = $(AM_CFLAGS)
 avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la

diff --git a/doxygen/doxygen.conf.in b/doxygen/doxygen.conf.in
index e7a5ca25dea56abc193377d4d2f3e61d318fb02a..f165bc3a6af129637685001717e12763f95ffc64 100644 (file)
--- 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-common/cdecl.h ../avahi-core/core.h ../avahi-common/address.h ../avahi-common/rr.h ../avahi-common/strlst.h ../avahi-common/alternative.h ../avahi-core/log.h
+INPUT                  = @top_srcdir@/avahi-common/cdecl.h @top_srcdir@/avahi-core/core.h @top_srcdir@/avahi-common/address.h @top_srcdir@/avahi-common/rr.h @top_srcdir@/avahi-common/strlst.h @top_srcdir@/avahi-common/alternative.h @top_srcdir@/avahi-core/log.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 
@@ -455,7 +455,7 @@ EXCLUDE_PATTERNS       =
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = ../examples/
+EXAMPLE_PATH           = @top_srcdir@/examples/
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp