X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=c3cc8232ed3ae985b8f58ef5dcbd4b989e5da0c5;hb=389f2b7628b3bb7516d0725cff6f8fcdf0bd8f2a;hp=23888b27948cceeb887cfff8a64569236d111d4c;hpb=de6fc99ef5a1767fae07fbea9bc384f512639e57;p=catta

diff --git a/Makefile.am b/Makefile.am
index 23888b2..c3cc823 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -40,42 +38,15 @@ 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 = \
 	$(srcdir)/avahi-common/address.h \
@@ -92,36 +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
-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 \
@@ -131,144 +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
-pkgconfig_DATA = avahi-core.pc
 
-avahi-core.pc: avahi-core.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
+%.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
-
-avahi-client.pc: avahi-client.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
-	    -e 's,@libdir\@,$(libdir),g' \
-	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
-CLEANFILES += avahi-client.pc
-
-if ENABLE_COMPAT_HOWL
-
-pkgconfig_DATA += avahi-compat-howl.pc
-
-avahi-compat-howl.pc: avahi-compat-howl.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
-	    -e 's,@libdir\@,$(libdir),g' \
-	    -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
-
-CLEANFILES += avahi-compat-howl.pc
-
-endif
-
-if ENABLE_COMPAT_LIBDNS_SD
-
-pkgconfig_DATA += avahi-compat-libdns_sd.pc
-
-avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
-	    -e 's,@libdir\@,$(libdir),g' \
-	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
-CLEANFILES += avahi-compat-libdns_sd.pc
-
-endif
-
-if HAVE_MONO
-
-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' $< > $@
-
-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
-
-endif
-
-if HAVE_GLIB
-
-pkgconfig_DATA += avahi-glib.pc
-
-avahi-glib.pc: avahi-glib.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
-	    -e 's,@libdir\@,$(libdir),g' \
-	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
-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
-
-pkgconfig_DATA += avahi-qt3.pc
-
-avahi-qt3.pc: avahi-qt3.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
-	    -e 's,@libdir\@,$(libdir),g' \
-	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
-CLEANFILES += avahi-qt3.pc
-
-endif
-
-if HAVE_QT4
-
-pkgconfig_DATA += avahi-qt4.pc
-
-avahi-qt4.pc: avahi-qt4.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
-	    -e 's,@libdir\@,$(libdir),g' \
-	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
-CLEANFILES += avahi-qt4.pc
-
-endif
-
 CLEANFILES += avahi.devhelp
 
 avahi.devhelp: doxygen-run
@@ -277,15 +90,9 @@ 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\
-	    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
+DISTCLEANFILES = \
+	po/.intltool-merge-cache