X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=c3cc8232ed3ae985b8f58ef5dcbd4b989e5da0c5;hb=f726a534b6230de7a5323d811ef375b979f5bddb;hp=02e3a9c4cb77ba2258fb89e42bfb904007214171;hpb=908e491f7d55209acfbb2595ab1ef5b24502d641;p=catta

diff --git a/Makefile.am b/Makefile.am
index 02e3a9c..c3cc823 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,42 +38,14 @@ EXTRA_DIST = \
 	docs/server-states.dia \
 	docs/avahi-poll.dia \
 	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 \
-	doxygen_to_devhelp.xsl
+	doxygen_to_devhelp.xsl \
+        common/introspection.m4
 
 SUBDIRS = \
 	common \
 	avahi-common \
 	avahi-core \
-	avahi-qt \
-	avahi-client \
-	avahi-glib \
-	avahi-gobject \
-	avahi-discover-standalone \
-	avahi-daemon \
-	avahi-sharp \
-	initscript \
-	avahi-dnsconfd \
-	avahi-utils \
-	avahi-python \
 	examples \
-	man \
-	tests \
-	service-type-database \
-	avahi-compat-libdns_sd \
-	avahi-compat-howl \
-	avahi-autoipd \
-	avahi-ui \
-	avahi-ui-sharp \
 	po
 
 DX_INPUT = \
@@ -91,49 +63,6 @@ DX_INPUT = \
 DX_EXAMPLE_PATH = $(srcdir)/examples
 DX_EXAMPLE_PATTERNS = *.c
 
-if HAVE_QT3
-DX_INPUT += \
-	$(srcdir)/avahi-qt/qt-watch.h
-else
-if HAVE_QT4
-DX_INPUT += \
-	$(srcdir)/avahi-qt/qt-watch.h
-endif
-endif
-
-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
-DX_INPUT += \
-	$(srcdir)/avahi-client/client.h \
-	$(srcdir)/avahi-client/lookup.h \
-	$(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 \
@@ -143,69 +72,16 @@ DX_INPUT += \
 	$(srcdir)/avahi-core/log.h
 endif
 
-if HAVE_GTK
-DX_INPUT += \
-	$(srcdir)/avahi-ui/avahi-ui.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
 CLEANFILES = avahi-core.pc
-
-if HAVE_DBUS
-pkgconfig_DATA += avahi-client.pc
-CLEANFILES += avahi-client.pc
-
-if ENABLE_COMPAT_HOWL
-pkgconfig_DATA += avahi-compat-howl.pc
-CLEANFILES += avahi-compat-howl.pc
-endif
-
-if ENABLE_COMPAT_LIBDNS_SD
-pkgconfig_DATA += avahi-compat-libdns_sd.pc
-CLEANFILES += avahi-compat-libdns_sd.pc
-endif
-
-if HAVE_MONO
-pkgconfig_DATA += avahi-sharp.pc avahi-ui-sharp.pc
-CLEANFILES += avahi-sharp.pc avahi-ui-sharp.pc
-endif
-
-endif
-
-if HAVE_GLIB
-pkgconfig_DATA += avahi-glib.pc
-CLEANFILES += avahi-glib.pc
-
-if HAVE_GOBJECT
-pkgconfig_DATA += avahi-gobject.pc
-CLEANFILES += avahi-gobject.pc
-endif
-endif
-
-if HAVE_GTK
-if HAVE_DBUS
-pkgconfig_DATA += avahi-ui.pc
-CLEANFILES += avahi-ui.pc
-endif
-endif
-
-if HAVE_QT3
-pkgconfig_DATA += avahi-qt3.pc
-CLEANFILES += avahi-qt3.pc
-endif
-
-if HAVE_QT4
-pkgconfig_DATA += avahi-qt4.pc
-CLEANFILES += avahi-qt4.pc
-endif
-
 CLEANFILES += avahi.devhelp
 
 avahi.devhelp: doxygen-run
@@ -214,25 +90,9 @@ avahi.devhelp: doxygen-run
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--disable-monodoc
-
-homepage:
-	$(MAKE) -C man
-	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
+	--disable-monodoc \
+	--enable-introspection \
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 DISTCLEANFILES = \
 	po/.intltool-merge-cache