Merge tag 'upstream/0.8' into tizen

[platform/upstream/avahi.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a800687..474cca1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I common
 
 include $(srcdir)/common/doxygen.mk
 
-EXTRA_DIST = \
+EXTRA_DIST = config.rpath  \
        autogen.sh \
        bootstrap.sh \
        LICENSE \
@@ -40,9 +40,11 @@ EXTRA_DIST = \
        avahi-core.pc.in \
        avahi-client.pc.in \
        avahi-glib.pc.in \
+       avahi-libevent.pc.in \
        avahi-gobject.pc.in \
        avahi-qt3.pc.in \
        avahi-qt4.pc.in \
+       avahi-qt5.pc.in \
        avahi-sharp.pc.in \
        avahi-ui-sharp.pc.in \
        avahi-compat-libdns_sd.pc.in \
@@ -76,6 +78,7 @@ SUBDIRS = \
        avahi-autoipd \
        avahi-ui \
        avahi-ui-sharp \
+       avahi-libevent \
        po
 
 DX_INPUT = \
@@ -101,6 +104,10 @@ if HAVE_QT4
 DX_INPUT += \
        $(srcdir)/avahi-qt/qt-watch.h
 endif
+if HAVE_QT5
+DX_INPUT += \
+       $(srcdir)/avahi-qt/qt-watch.h
+endif
 endif
 
 if HAVE_GLIB
@@ -150,11 +157,17 @@ DX_INPUT += \
        $(srcdir)/avahi-ui/avahi-ui.h
 endif
 
+if HAVE_LIBEVENT
+DX_INPUT += \
+       $(srcdir)/avahi-libevent/libevent-watch.h
+endif
+
 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
@@ -215,6 +228,16 @@ pkgconfig_DATA += avahi-qt4.pc
 CLEANFILES += avahi-qt4.pc
 endif
 
+if HAVE_QT5
+pkgconfig_DATA += avahi-qt5.pc
+CLEANFILES += avahi-qt5.pc
+endif
+
+if HAVE_LIBEVENT
+pkgconfig_DATA += avahi-libevent.pc
+CLEANFILES += avahi-libevent.pc
+endif
+
 CLEANFILES += avahi.devhelp
 
 avahi.devhelp: doxygen-run
@@ -229,7 +252,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 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/
@@ -237,6 +260,3 @@ 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
-
-DISTCLEANFILES = \
-       po/.intltool-merge-cache