X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=26ce6bd2c3f4725a5dbced4bbbb151006bb096d3;hb=37d19f15523b6fe4d1fef2329abe421221b3d4b3;hp=f6be64d0563531710417d3a43d37271154103ad8;hpb=3b898d826ec5e97f287481ea1612483e6f3cc066;p=catta

diff --git a/Makefile.am b/Makefile.am
index f6be64d..26ce6bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,9 @@
 # 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 = \
 	LICENSE \
@@ -39,26 +39,28 @@ EXTRA_DIST = \
 	doxygen_to_devhelp.xsl
 
 SUBDIRS = \
-	common \
-	avahi \
+	m4 \
+	src \
+    include \
+	tests \
 	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
+	$(srcdir)/include/avahi/address.h \
+	$(srcdir)/include/avahi/malloc.h \
+	$(srcdir)/include/avahi/strlst.h \
+	$(srcdir)/include/avahi/alternative.h \
+	$(srcdir)/include/avahi/defs.h \
+	$(srcdir)/include/avahi/error.h \
+	$(srcdir)/include/avahi/domain.h \
+	$(srcdir)/include/avahi/watch.h \
+	$(srcdir)/include/avahi/simple-watch.h \
+	$(srcdir)/include/avahi/thread-watch.h \
+	$(srcdir)/include/avahi/core.h \
+	$(srcdir)/include/avahi/lookup.h \
+	$(srcdir)/include/avahi/publish.h \
+	$(srcdir)/include/avahi/rr.h \
+	$(srcdir)/include/avahi/log.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples
 DX_EXAMPLE_PATTERNS = *.c