X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=c19e72cea5248c6bee9df524fa10ff53bdfbd015;hb=a4572037763c65ec34ac921a6e15b936c6525b5d;hp=51791093c82b6cfe857dd402df52f83b5d7c7b44;hpb=a99da203ccf00c2d311f823276ba87d2a7ccc0f6;p=catta

diff --git a/Makefile.am b/Makefile.am
index 5179109..c19e72c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,21 +42,25 @@ EXTRA_DIST = \
 	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-ui.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 \
@@ -70,20 +74,21 @@ SUBDIRS = \
 	avahi-compat-libdns_sd \
 	avahi-compat-howl \
 	avahi-autoipd \
-	avahi-ui
+	avahi-ui \
+	avahi-ui-sharp \
+	po
 
 DX_INPUT = \
 	$(srcdir)/avahi-common/address.h \
+	$(srcdir)/avahi-common/malloc.h \
 	$(srcdir)/avahi-common/strlst.h \
 	$(srcdir)/avahi-common/alternative.h \
 	$(srcdir)/avahi-common/defs.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-common/thread-watch.h \
-	$(srcdir)/avahi-common/timeval.h
+	$(srcdir)/avahi-common/thread-watch.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples
 DX_EXAMPLE_PATTERNS = *.c
@@ -102,6 +107,19 @@ 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
@@ -111,6 +129,13 @@ DX_INPUT += \
 	$(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 \
@@ -174,14 +199,19 @@ endif
 
 if HAVE_MONO
 
-pkgconfig_DATA += avahi-sharp.pc
+pkgconfig_DATA += avahi-sharp.pc avahi-ui-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
+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
 
@@ -198,19 +228,33 @@ avahi-glib.pc: avahi-glib.pc.in
 
 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-gtk.pc
+pkgconfig_DATA += avahi-ui.pc
 
-avahi-gtk.pc: avahi-gtk.pc.in
+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-gtk.pc
+CLEANFILES += avahi-ui.pc
 
+endif
 endif
 
 if HAVE_QT3
@@ -239,6 +283,11 @@ CLEANFILES += avahi-qt4.pc
 
 endif
 
+CLEANFILES += avahi.devhelp
+
+avahi.devhelp: doxygen-run
+	xsltproc -o $@ doxygen_to_devhelp.xsl doxygen/xml/index.xml
+
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 DISTCHECK_CONFIGURE_FLAGS = \
@@ -254,3 +303,13 @@ homepage:
 	$(MAKE) doxygen-run
 	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