Add cmake as optional build system to Travis-CI configuration

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

diff --git a/Makefile.am b/Makefile.am
index 42aa87a..c35131a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,14 @@
 ## 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 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
@@ -11,22 +17,28 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
 
 EXTRA_DIST = \
-       todo.txt macos macosx autogen.sh \
+       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 \
-       debian
+       symbian \
+       macosx win32
+
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-docs
 
 dist-hook:
-       rm -rf `find $(distdir)/debian -name .svn`
-       rm -rf `find $(distdir)/debian -name "Makefile*"`
-       rm -rf `find $(distdir)/macos -name .svn`
-       rm -rf `find $(distdir)/macosx -name .svn`
+       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@"