X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=f6be64d0563531710417d3a43d37271154103ad8;hb=3b898d826ec5e97f287481ea1612483e6f3cc066;hp=18640f0c9ca4b824d2ccc145e9ea5615581e653e;hpb=1ff162d58059b9552c2b5594779eff9e0f215482;p=catta

diff --git a/Makefile.am b/Makefile.am
index 18640f0..f6be64d 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
@@ -22,75 +20,61 @@ ACLOCAL_AMFLAGS = -I common
 include $(srcdir)/common/doxygen.mk
 
 EXTRA_DIST = \
-	bootstrap.sh \
 	LICENSE \
 	$(DX_CONFIG) \
 	docs/INSTALL \
 	docs/TODO \
+	docs/NEWS \
 	docs/README \
 	docs/DBUS-API \
 	docs/AUTHORS \
 	docs/HACKING \
+	docs/API-CHANGES-0.6 \
+	docs/COMPAT-LAYERS \
+	docs/MALLOC \
 	docs/overview.dia \
-	avahi-core.pc.in \
-	avahi-client.pc.in \
-	avahi-glib.pc.in
+	docs/server-states.dia \
+	docs/avahi-poll.dia \
+	avahi.pc.in \
+	doxygen_to_devhelp.xsl
 
 SUBDIRS = \
 	common \
-	avahi-common \
-	avahi-glib \
-	avahi-core \
-	avahi-discover-standalone \
-	avahi-client \
-	avahi-daemon \
-	initscript \
-	avahi-dnsconfd \
-	avahi-utils \
-	examples \
-	man \
-	tests
+	avahi \
+	examples
+
+DX_INPUT = \
+	$(srcdir)/avahi/address.h \
+	$(srcdir)/avahi/malloc.h \
+	$(srcdir)/avahi/strlst.h \
+	$(srcdir)/avahi/alternative.h \
+	$(srcdir)/avahi/defs.h \
+	$(srcdir)/avahi/error.h \
+	$(srcdir)/avahi/domain.h \
+	$(srcdir)/avahi/watch.h \
+	$(srcdir)/avahi/simple-watch.h \
+	$(srcdir)/avahi/thread-watch.h \
+	$(srcdir)/avahi/core.h \
+	$(srcdir)/avahi/lookup.h \
+	$(srcdir)/avahi/publish.h \
+	$(srcdir)/avahi/rr.h \
+	$(srcdir)/avahi/log.h
+
+DX_EXAMPLE_PATH = $(srcdir)/examples
+DX_EXAMPLE_PATTERNS = *.c
 
 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,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
-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,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
-CLEANFILES += avahi-client.pc
-
-endif
+pkgconfig_DATA = avahi.pc
+CLEANFILES = avahi.pc
+CLEANFILES += avahi.devhelp
 
-if HAVE_GLIB
-
-pkgconfig_DATA += avahi-glib.pc
-
-avahi-glib.pc: avahi-glib.pc.in
-	sed -e 's,@prefix\@,$(prefix),g' \
-	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
-
-CLEANFILES += avahi-glib.pc
-
-endif
+avahi.devhelp: doxygen-run
+	xsltproc -o $@ doxygen_to_devhelp.xsl doxygen/xml/index.xml
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
-
-homepage:
-	scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\
-	    man/*.xml man/xmltoman.dtd man/xmltoman.xsl \
-	    fdo:public_html/
-	rm -rf doxygen
-	$(MAKE) doxygen-run
-	ssh fdo rm -rf public_html/doxygen
-	scp -r doxygen/html fdo:public_html/doxygen