diff options
| author | Monty <xiphmont@xiph.org> | 2010-03-24 09:08:33 +0000 |
|---|---|---|
| committer | Monty <xiphmont@xiph.org> | 2010-03-24 09:08:33 +0000 |
| commit | 2d50a24ee1dcbe9ef7aeee8026166a256b06db4d (patch) | |
| tree | c6e532c886a9539e333ffa11f0eaa6d629cd8a2d | |
| parent | 0a274ec153484420081f153ebb8a22a8b97b74ff (diff) | |
| download | libvorbis-git-2d50a24ee1dcbe9ef7aeee8026166a256b06db4d.tar.gz | |
Add patch to disable building examples by default, test Makefile.am fix
Closes Trac #1571
svn path=/trunk/vorbis/; revision=17018
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 1ac8620b..89efb5df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2 -SUBDIRS = m4 include vq lib examples test doc +SUBDIRS = m4 include vq lib test doc + +if BUILD_EXAMPLES +SUBDIRS += examples +endif m4datadir = $(datadir)/aclocal m4data_DATA = vorbis.m4 diff --git a/configure.ac b/configure.ac index ccb34f15..70ee7629 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,11 @@ fi AM_CONDITIONAL(BUILD_DOCS, [test "x$enable_docs" = xyes]) +AC_ARG_ENABLE(examples, + AS_HELP_STRING([--enable-examples], [build the examples])) + +AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$enable_examples" = xyes]) + dnl -------------------------------------------------- dnl Set build flags based on environment dnl -------------------------------------------------- diff --git a/test/Makefile.am b/test/Makefile.am index 128bf212..5f7e32af 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@ -noinst_PROGRAMS = test +check_PROGRAMS = test -check: $(noinst_PROGRAMS) +check: $(check_PROGRAMS) ./test$(EXEEXT) test_SOURCES = util.c util.h write_read.c write_read.h test.c |