X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=c19e72cea5248c6bee9df524fa10ff53bdfbd015;hb=78a76e3d5f1d9cc81fd901b8e0263483a7c707d0;hp=d557c62dd3631671cea03450101d61ab47ce7cd6;hpb=16d9e30dd7fa052bd7e6dd37927d7f27bec90ef1;p=catta

diff --git a/Makefile.am b/Makefile.am
index d557c62..c19e72c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,92 +33,187 @@ 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 \
 	avahi-core.pc.in \
 	avahi-client.pc.in \
 	avahi-glib.pc.in \
+	avahi-gobject.pc.in \
 	avahi-qt3.pc.in \
 	avahi-qt4.pc.in \
 	avahi-sharp.pc.in \
+	avahi-ui-sharp.pc.in \
 	avahi-compat-libdns_sd.pc.in \
-	avahi-compat-howl.pc.in
+	avahi-compat-howl.pc.in \
+	avahi-ui.pc.in \
+	doxygen_to_devhelp.xsl
 
 SUBDIRS = \
 	common \
 	avahi-common \
-	avahi-glib \
 	avahi-core \
-	avahi-discover-standalone \
 	avahi-qt \
 	avahi-client \
+	avahi-glib \
+	avahi-gobject \
+	avahi-discover-standalone \
 	avahi-daemon \
 	avahi-sharp \
 	initscript \
 	avahi-dnsconfd \
 	avahi-utils \
+	avahi-python \
 	examples \
 	man \
 	tests \
 	service-type-database \
 	avahi-compat-libdns_sd \
-	avahi-compat-howl 
-
+	avahi-compat-howl \
+	avahi-autoipd \
+	avahi-ui \
+	avahi-ui-sharp \
+	po
 
 DX_INPUT = \
-	$(srcdir)/avahi-core/core.h \
-	$(srcdir)/avahi-core/lookup.h \
-	$(srcdir)/avahi-core/publish.h \
 	$(srcdir)/avahi-common/address.h \
-	$(srcdir)/avahi-core/rr.h \
+	$(srcdir)/avahi-common/malloc.h \
 	$(srcdir)/avahi-common/strlst.h \
 	$(srcdir)/avahi-common/alternative.h \
-	$(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/watch.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-qt/qt-watch.h
+	$(srcdir)/avahi-common/thread-watch.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples
-
 DX_EXAMPLE_PATTERNS = *.c
 
+if HAVE_QT3
+DX_INPUT += \
+	$(srcdir)/avahi-qt/qt-watch.h
+else
+if HAVE_QT4
+DX_INPUT += \
+	$(srcdir)/avahi-qt/qt-watch.h
+endif
+endif
+
+if HAVE_GLIB
+DX_INPUT += \
+	$(srcdir)/avahi-glib/glib-watch.h \
+	$(srcdir)/avahi-glib/glib-malloc.h
+
+if HAVE_GOBJECT
+if HAVE_DBUS
+DX_INPUT += \
+	$(srcdir)/avahi-gobject/ga-client.h \
+	$(srcdir)/avahi-gobject/ga-entry-group.h \
+	$(srcdir)/avahi-gobject/ga-enums.h \
+	$(srcdir)/avahi-gobject/ga-error.h \
+	$(srcdir)/avahi-gobject/ga-record-browser.h \
+	$(srcdir)/avahi-gobject/ga-service-browser.h \
+	$(srcdir)/avahi-gobject/ga-service-resolver.h
+endif
+endif
+endif
+
+if HAVE_DBUS
+DX_INPUT += \
+	$(srcdir)/avahi-client/client.h \
+	$(srcdir)/avahi-client/lookup.h \
+	$(srcdir)/avahi-client/publish.h
+endif
+
+if HAVE_DBUS
+if HAVE_GTK
+DX_INPUT += \
+	$(srcdir)/avahi-ui/avahi-ui.h
+endif
+endif
+
+if ENABLE_CORE_DOCS
+DX_INPUT += \
+	$(srcdir)/avahi-core/core.h \
+	$(srcdir)/avahi-core/lookup.h \
+	$(srcdir)/avahi-core/publish.h \
+	$(srcdir)/avahi-core/rr.h \
+	$(srcdir)/avahi-core/log.h
+endif
+
+if HAVE_GTK
+DX_INPUT += \
+	$(srcdir)/avahi-ui/avahi-ui.h
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = avahi-core.pc
 
 avahi-core.pc: avahi-core.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 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,@libdir\@,$(libdir),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,@libdir\@,$(libdir),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,@libdir\@,$(libdir),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-ui-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-client.pc avahi-compat-libdns_sd.pc avahi-compat-howl.pc
+avahi-ui-sharp.pc: avahi-ui-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 avahi-ui-sharp.pc
+
+endif
 
 endif
 
@@ -128,10 +223,38 @@ pkgconfig_DATA += avahi-glib.pc
 
 avahi-glib.pc: avahi-glib.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-glib.pc
 
+if HAVE_GOBJECT
+
+pkgconfig_DATA += avahi-gobject.pc
+
+avahi-gobject.pc: avahi-gobject.pc.in
+	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
+	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+CLEANFILES += avahi-gobject.pc
+
+endif
+endif
+
+if HAVE_GTK
+if HAVE_DBUS
+
+pkgconfig_DATA += avahi-ui.pc
+
+avahi-ui.pc: avahi-ui.pc.in
+	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
+	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
+
+CLEANFILES += avahi-ui.pc
+
+endif
 endif
 
 if HAVE_QT3
@@ -140,6 +263,7 @@ pkgconfig_DATA += avahi-qt3.pc
 
 avahi-qt3.pc: avahi-qt3.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-qt3.pc
@@ -152,24 +276,17 @@ pkgconfig_DATA += avahi-qt4.pc
 
 avahi-qt4.pc: avahi-qt4.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 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
+CLEANFILES += avahi.devhelp
 
-endif
+avahi.devhelp: doxygen-run
+	xsltproc -o $@ doxygen_to_devhelp.xsl doxygen/xml/index.xml
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
@@ -180,8 +297,19 @@ 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/
+	scp avahi-$(PACKAGE_VERSION).tar.gz 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
+
+dist-hook:
+	if test -d .svn ; then \
+		svn update ; \
+		chmod u+w ${distdir}/ChangeLog || true ; \
+		svn2cl -o ${distdir}/ChangeLog ; \
+	fi
+
+DISTCLEANFILES = \
+	po/.intltool-merge-cache