X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=c35131a6e3b075487582b7bbc7acd6a5d446d5b8;hb=6192354e8059784de723767204c09450c36cee28;hp=400517107f01a4287d67db0b0a382db76c634d2e;hpb=bf6b2d77487af22658e7a5e785a49d9917f7eea8;p=platform%2Fupstream%2Flibvorbis.git

diff --git a/Makefile.am b/Makefile.am
index 4005171..c35131a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
+AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
 
-SUBDIRS = include vq lib examples doc
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = m4 include vq lib test doc
+
+if BUILD_EXAMPLES 
+SUBDIRS += examples 
+endif 
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
@@ -12,15 +18,15 @@ pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
 
 EXTRA_DIST = \
 	CHANGES COPYING \
-	todo.txt autogen.sh \
+	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 \
-	doc examples symbian vq \
-	macos macosx win32
+	symbian \
+	macosx win32
 
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-docs