X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=06ffd25d95ffcfb2164ff321765eb6573ec267a9;hb=f6a388c0b603fa1913da7a5db4737e2c162f9547;hp=ec34757ff53726237d5fb6803e4a1acf719a666b;hpb=a36df935a82b59544fa4fa56effef0ab123a97ce;p=catta

diff --git a/Makefile.am b/Makefile.am
index ec34757..06ffd25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,16 +58,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 \
@@ -78,18 +78,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
@@ -107,21 +105,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,@PACKAGE_VERSION\@,$(PACKAGE_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
 
@@ -161,19 +188,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 = \