X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=f338c5809ab01f59360a4ab395d9a8dca96c968d;hb=63b016778a0a8c277f192acd6fe5fd5f56a9f170;hp=52f1422e120047b4c3efef375b61b6121a703a7c;hpb=c1c236e751d126f3aeffe3ccf5da889dbf853b2f;p=catta

diff --git a/Makefile.am b/Makefile.am
index 52f1422..f338c58 100644
--- 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 \
@@ -58,12 +61,13 @@ 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 = \
@@ -84,10 +88,10 @@ DX_INPUT = \
 	$(srcdir)/avahi-common/domain.h \
 	$(srcdir)/avahi-common/watch.h \
 	$(srcdir)/avahi-common/simple-watch.h \
+	$(srcdir)/avahi-common/thread-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
@@ -105,21 +109,50 @@ CLEANFILES = avahi-core.pc
 
 if HAVE_DBUS
 
-pkgconfig_DATA += avahi-client.pc avahi-compat-libdns_sd.pc  avahi-compat-howl.pc
+pkgconfig_DATA += avahi-client.pc
 
 avahi-client.pc: avahi-client.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
+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' $< > $@
 
-avahi-compat-howl.pc: avahi-compat-howl.pc.in
+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,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
+	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+	    -e 's,@libdir\@,$(libdir),g' $< > $@
+
+CLEANFILES += avahi-sharp.pc
 
-CLEANFILES += avahi-client.pc avahi-compat-libdns_sd.pc avahi-compat-howl.pc
+endif
 
 endif
 
@@ -159,19 +192,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 = \