X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=1b5b7d36bf158c452d0d76c09b890be844782297;hb=4079dd94f3425d503b5db5faca6561151a3b209f;hp=d09f75ac9120ba9472d7aad226b8be45bd45c446;hpb=f8086b037dec60a82aa6890f19dbc3f73af46c98;p=catta

diff --git a/Makefile.am b/Makefile.am
index d09f75a..1b5b7d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,20 +42,28 @@ 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-compat-howl.pc.in \
+	avahi-ui.pc.in \
+	doxygen_to_devhelp.xsl \
+	intltool-merge.in \
+        intltool-update.in \
+        intltool-extract.in
 
 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 \
@@ -67,21 +75,23 @@ SUBDIRS = \
 	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-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
@@ -100,6 +110,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
@@ -109,6 +132,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 \
@@ -118,6 +148,11 @@ DX_INPUT += \
 	$(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
 
@@ -167,14 +202,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
 
@@ -191,6 +231,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-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
@@ -219,6 +286,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 = \
@@ -229,7 +301,21 @@ homepage:
 	scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\
 	    man/*.xml man/xmltoman.dtd man/xmltoman.xsl \
 	    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 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 = \
+        intltool-extract \
+        intltool-merge \
+        intltool-update \
+	po/.intltool-merge-cache