X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=116bb5f6468190a4e453e27d22c8693a02716234;hb=dcb4e7b6d849cb04cee7be7de37440f12bd305c7;hp=ec525a38dd4bdcc60e7fda45eda4e9e9141792a1;hpb=8abf9664e467175dd0b4005fde6b9129f3a88492;p=catta

diff --git a/Makefile.am b/Makefile.am
index ec525a3..116bb5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,13 +15,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-ACLOCAL_AMFLAGS = -I common
+ACLOCAL_AMFLAGS = -I m4
 
-include $(srcdir)/common/doxygen.mk
+include $(srcdir)/m4/doxygen.mk
 
 EXTRA_DIST = \
-	autogen.sh \
-	bootstrap.sh \
 	LICENSE \
 	$(DX_CONFIG) \
 	docs/INSTALL \
@@ -37,39 +35,35 @@ EXTRA_DIST = \
 	docs/overview.dia \
 	docs/server-states.dia \
 	docs/avahi-poll.dia \
-	avahi-core.pc.in \
+	avahi.pc.in \
 	doxygen_to_devhelp.xsl
 
 SUBDIRS = \
-	common \
-	avahi-common \
-	avahi-core \
+	m4 \
+	avahi \
+	tests \
 	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
@@ -77,8 +71,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 	    -e 's,@libdir\@,$(libdir),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