X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=Makefile.am;h=f338c5809ab01f59360a4ab395d9a8dca96c968d;hb=63b016778a0a8c277f192acd6fe5fd5f56a9f170;hp=2d32ea641de033a62a7d2e2ce32e9f5ce4aecf68;hpb=6db4ef959b20614f8c71d2d2e9dd652610cf7a9a;p=catta diff --git a/Makefile.am b/Makefile.am index 2d32ea6..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 \ @@ -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,14 +61,16 @@ SUBDIRS = \ initscript \ avahi-dnsconfd \ avahi-utils \ + avahi-python \ examples \ man \ tests \ - service-type-database + service-type-database \ + avahi-compat-libdns_sd \ + 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 \ @@ -74,18 +81,17 @@ 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-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 @@ -111,6 +117,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 @@ -149,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 = \