X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=03117f4ee2b17bf885502c44325bc6308179cd76;hb=f25465433f0f835a5caccacffe026c2b658c924b;hp=12465c5b631804bb7a0828b1b24bda8eea17c4d1;hpb=7badca4113bc8289755cd536593d8f3287aae9d5;p=catta

diff --git a/Makefile.am b/Makefile.am
index 12465c5..03117f4 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,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,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
@@ -95,16 +99,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 +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
@@ -155,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 = \
@@ -177,8 +201,8 @@ homepage:
 	$(MAKE) -C man
 	scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\
 	    man/*.xml man/xmltoman.dtd man/xmltoman.xsl \
-	    fdo:public_html/
+	    tango:www/avahi.org/tree/download/
 	rm -rf doxygen
 	$(MAKE) doxygen-run
-	ssh fdo rm -rf public_html/doxygen
-	scp -r doxygen/html fdo:public_html/doxygen
+	ssh tango rm -rf www/avahi.org/tree/download/doxygen
+	scp -r doxygen/html tango:www/avahi.org/tree/download/doxygen