X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=5d068402ccf3409e3e6e8b9cf13df625376a538d;hb=1a5dff7d166883e99fe1dba62dc3c407a9f7e332;hp=1f62dc3561064e00d940099a1ac66e919a60b905;hpb=5f4740c789a5cdfe45669ceb07062371575be523;p=catta

diff --git a/Makefile.am b/Makefile.am
index 1f62dc3..5d06840 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,58 +37,46 @@ EXTRA_DIST = \
 	docs/overview.dia \
 	docs/server-states.dia \
 	docs/avahi-poll.dia \
-	avahi-core.pc.in \
-	doxygen_to_devhelp.xsl \
-        common/introspection.m4
+	avahi.pc.in \
+	doxygen_to_devhelp.xsl
 
 SUBDIRS = \
 	common \
-	avahi-common \
-	avahi-core \
+	avahi \
 	examples
 
 DX_INPUT = \
-	$(srcdir)/avahi-common/address.h \
-	$(srcdir)/avahi-common/malloc.h \
-	$(srcdir)/avahi-common/strlst.h \
-	$(srcdir)/avahi-common/alternative.h \
-	$(srcdir)/avahi-common/defs.h \
-	$(srcdir)/avahi-common/error.h \
-	$(srcdir)/avahi-common/domain.h \
-	$(srcdir)/avahi-common/watch.h \
-	$(srcdir)/avahi-common/simple-watch.h \
-	$(srcdir)/avahi-common/thread-watch.h
+	$(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
 
-if ENABLE_CORE_DOCS
-DX_INPUT += \
-	$(srcdir)/avahi-core/core.h \
-	$(srcdir)/avahi-core/lookup.h \
-	$(srcdir)/avahi-core/publish.h \
-	$(srcdir)/avahi-core/rr.h \
-	$(srcdir)/avahi-core/log.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
+pkgconfig_DATA = avahi.pc
+CLEANFILES = avahi.pc
 CLEANFILES += avahi.devhelp
 
 avahi.devhelp: doxygen-run
 	xsltproc -o $@ doxygen_to_devhelp.xsl doxygen/xml/index.xml
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--disable-monodoc \
-	--enable-introspection \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)