core: avahi on Linux uses incorrect address for P-t-P interface

[catta] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 02e3a9c4cb77ba2258fb89e42bfb904007214171..8234d698d2b9a20a9d9bd9fc57e3a20173b81f12 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,9 @@ EXTRA_DIST = \
        avahi-compat-libdns_sd.pc.in \
        avahi-compat-howl.pc.in \
        avahi-ui.pc.in \
-       doxygen_to_devhelp.xsl
+       avahi-ui-gtk3.pc.in \
+       doxygen_to_devhelp.xsl \
+        common/introspection.m4
 
 SUBDIRS = \
        common \
@@ -153,6 +155,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 %.pc: %.pc.in
        $(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
            -e 's,@libdir\@,$(libdir),g' \
+           -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 pkgconfig_DATA = avahi-core.pc
@@ -196,6 +199,13 @@ CLEANFILES += avahi-ui.pc
 endif
 endif
 
+if HAVE_GTK3
+if HAVE_DBUS
+pkgconfig_DATA += avahi-ui-gtk3.pc
+CLEANFILES += avahi-ui-gtk3.pc
+endif
+endif
+
 if HAVE_QT3
 pkgconfig_DATA += avahi-qt3.pc
 CLEANFILES += avahi-qt3.pc
@@ -214,11 +224,13 @@ avahi.devhelp: doxygen-run
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --disable-monodoc
+       --disable-monodoc \
+       --enable-introspection \
+       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 homepage:
        $(MAKE) -C man
-       scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\
+       scp avahi-daemon/*.xml 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/
@@ -227,12 +239,5 @@ homepage:
        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