Bump version to 1.3.6

[platform/upstream/libvorbis.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8844c3b..c35131a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,44 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign dist-zip
+AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
 
-SUBDIRS = lib include doc examples win32 debian vq
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = m4 include vq lib test doc
+
+if BUILD_EXAMPLES 
+SUBDIRS += examples 
+endif 
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
 
-EXTRA_DIST = HACKING todo.txt macos macosx \
-       autogen.sh libvorbis.spec vorbis.m4
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
+
+EXTRA_DIST = \
+       CHANGES COPYING \
+       autogen.sh \
+       libvorbis.spec libvorbis.spec.in \
+       vorbis.m4 \
+       vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
+       vorbis-uninstalled.pc.in \
+       vorbisenc-uninstalled.pc.in \
+       vorbisfile-uninstalled.pc.in \
+       symbian \
+       macosx win32
+
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-docs
 
 dist-hook:
-       rm -rf `find $(distdir)/macos -name CVS`
-       rm -rf `find $(distdir)/macosx -name CVS`
+       for item in $(EXTRA_DIST); do \
+         if test -d $$item; then \
+           echo -n "cleaning $$item dir for distribution..."; \
+           rm -rf `find $(distdir)/$$item -name .svn`; \
+           echo "OK"; \
+         fi; \
+       done
 
 debug:
        $(MAKE) all CFLAGS="@DEBUG@"