build avahi-gobject only when avahi-client is also built

[catta] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1173f2a76f6da70427bd4e18385db7d115bb6750..1b5b7d36bf158c452d0d76c09b890be844782297 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,10 @@ EXTRA_DIST = \
        avahi-compat-libdns_sd.pc.in \
        avahi-compat-howl.pc.in \
        avahi-ui.pc.in \
-       doxygen_to_devhelp.xsl
+       doxygen_to_devhelp.xsl \
+       intltool-merge.in \
+        intltool-update.in \
+        intltool-extract.in
 
 SUBDIRS = \
        common \
@@ -75,7 +78,8 @@ SUBDIRS = \
        avahi-compat-howl \
        avahi-autoipd \
        avahi-ui \
-       avahi-ui-sharp
+       avahi-ui-sharp \
+       po
 
 DX_INPUT = \
        $(srcdir)/avahi-common/address.h \
@@ -108,16 +112,18 @@ DX_INPUT += \
        $(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-errors.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 += \
@@ -300,3 +306,16 @@ 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 = \
+        intltool-extract \
+        intltool-merge \
+        intltool-update \
+       po/.intltool-merge-cache