* Include some new files from docs/ into the tarballs (incl API-CHANGES-0.6)

[catta] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 12465c5b631804bb7a0828b1b24bda8eea17c4d1..f9e95a1734b65486f00f6245bc6a6e190cc56d6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,9 @@ EXTRA_DIST = \
        docs/DBUS-API \
        docs/AUTHORS \
        docs/HACKING \
+       docs/API-CHANGES-0.6 \
+       docs/COMPAT-LAYERS \
+       docs/MALLOC \
        docs/overview.dia \
        docs/server-states.dia \
        docs/avahi-poll.dia \
@@ -41,7 +44,9 @@ EXTRA_DIST = \
        avahi-glib.pc.in \
        avahi-qt3.pc.in \
        avahi-qt4.pc.in \
-       avahi-sharp.pc.in
+       avahi-sharp.pc.in \
+       avahi-compat-libdns_sd.pc.in \
+       avahi-compat-howl.pc.in
 
 SUBDIRS = \
        common \
@@ -56,16 +61,16 @@ SUBDIRS = \
        initscript \
        avahi-dnsconfd \
        avahi-utils \
+       avahi-python \
        examples \
        man \
        tests \
        service-type-database \
        avahi-compat-libdns_sd \
-       avahi-compat-howl
+       avahi-compat-howl 
 
 
 DX_INPUT = \
-       $(srcdir)/avahi-common/cdecl.h \
        $(srcdir)/avahi-core/core.h \
        $(srcdir)/avahi-core/lookup.h \
        $(srcdir)/avahi-core/publish.h \
@@ -76,18 +81,16 @@ DX_INPUT = \
        $(srcdir)/avahi-core/log.h \
        $(srcdir)/avahi-common/defs.h \
        $(srcdir)/avahi-client/client.h \
+       $(srcdir)/avahi-client/lookup.h \
+       $(srcdir)/avahi-client/publish.h \
        $(srcdir)/avahi-common/error.h \
        $(srcdir)/avahi-common/malloc.h \
        $(srcdir)/avahi-common/domain.h \
-       $(srcdir)/avahi-common/gccmacro.h \
        $(srcdir)/avahi-common/watch.h \
-       $(srcdir)/avahi-common/llist.h \
-       $(srcdir)/avahi-common/rlist.h \
        $(srcdir)/avahi-common/simple-watch.h \
        $(srcdir)/avahi-glib/glib-watch.h \
        $(srcdir)/avahi-glib/glib-malloc.h \
        $(srcdir)/avahi-common/timeval.h \
-       $(srcdir)/avahi-common/dbus.h \
        $(srcdir)/avahi-qt/qt-watch.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples
@@ -95,16 +98,12 @@ DX_EXAMPLE_PATH = $(srcdir)/examples
 DX_EXAMPLE_PATTERNS = *.c
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = avahi-core.pc avahi-compat-libdns_sd.pc
+pkgconfig_DATA = avahi-core.pc
 
 avahi-core.pc: avahi-core.pc.in
        sed -e 's,@prefix\@,$(prefix),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
-avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
-       sed -e 's,@prefix\@,$(prefix),g' \
-           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
 CLEANFILES = avahi-core.pc
 
 if HAVE_DBUS
@@ -117,6 +116,43 @@ avahi-client.pc: avahi-client.pc.in
 
 CLEANFILES += avahi-client.pc
 
+if ENABLE_COMPAT_HOWL
+
+pkgconfig_DATA += avahi-compat-howl.pc
+
+avahi-compat-howl.pc: avahi-compat-howl.pc.in
+       sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
+
+CLEANFILES += avahi-compat-howl.pc
+
+endif
+
+if ENABLE_COMPAT_LIBDNS_SD
+
+pkgconfig_DATA += avahi-compat-libdns_sd.pc
+
+avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
+       sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+CLEANFILES += avahi-compat-libdns_sd.pc
+
+endif
+
+if HAVE_MONO
+
+pkgconfig_DATA += avahi-sharp.pc
+
+avahi-sharp.pc: avahi-sharp.pc.in
+       sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+           -e 's,@libdir\@,$(libdir),g' $< > $@
+
+CLEANFILES += avahi-sharp.pc
+
+endif
+
 endif
 
 if HAVE_GLIB
@@ -155,19 +191,6 @@ CLEANFILES += avahi-qt4.pc
 
 endif
 
-if HAVE_MONO
-
-pkgconfig_DATA += avahi-sharp.pc
-
-avahi-sharp.pc: avahi-sharp.pc.in
-       sed -e 's,@prefix\@,$(prefix),g' \
-           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-           -e 's,@libdir\@,$(libdir),g' $< > $@
-
-CLEANFILES += avahi-sharp.pc
-
-endif
-
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 DISTCHECK_CONFIGURE_FLAGS = \