X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=c35131a6e3b075487582b7bbc7acd6a5d446d5b8;hb=c1c2831fc7306d5fbd7bc800324efd12b28d327f;hp=0ec16b56804bde22ea966132d9f3ee560ae121e2;hpb=f50cbf1c60038da1baa9f7439e2d2c1eb38d082d;p=platform%2Fupstream%2Flibvorbis.git

diff --git a/Makefile.am b/Makefile.am
index 0ec16b5..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 = lib include doc examples 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
@@ -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