move public headers into their own directory

[catta] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b49ca9b36dac6a402bd27cbba059d2b030dcbc29..26ce6bd2c3f4725a5dbced4bbbb151006bb096d3 100644 (file)
--- 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,31 +35,32 @@ 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 \
+       src \
+    include \
+       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-core/core.h \
-       $(srcdir)/avahi-core/lookup.h \
-       $(srcdir)/avahi-core/publish.h \
-       $(srcdir)/avahi-core/rr.h \
-       $(srcdir)/avahi-core/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
@@ -73,8 +72,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