Move real utility programs from examples/ to new directory programs/ .

.bzrignore

@@ -39,23 +39,22 @@ config.log
 config.status
 configure
 doc/libsndfile.css
-examples/cooledit-fixer
 examples/generate
 examples/list_formats
 examples/make_sine
 examples/sfprocess
-examples/sndfile-cmp
-examples/sndfile-convert
-examples/sndfile-data-trim
-examples/sndfile-info
-examples/sndfile-jackplay
-examples/sndfile-metadata-get
-examples/sndfile-metadata-set
-examples/sndfile-play
 examples/sndfilehandle
 libsndfile-1.0.*
 libsndfile.spec
 libtool
+programs/sndfile-cmp
+programs/sndfile-convert
+programs/sndfile-data-trim
+programs/sndfile-info
+programs/sndfile-jackplay
+programs/sndfile-metadata-get
+programs/sndfile-metadata-set
+programs/sndfile-play
 regtest/sndfile-regtest
 sndfile.pc
 src/*sndfile.def

ChangeLog

@@ -3,6 +3,11 @@
     * examples/sndfile-to-text.c examples/Makefile.am
     Add a new example program and hook it into the build.
 
+    * examples/ programs/
+    Add a new directory programs and move sndfile-info, sndfile-play and other
+    real programs to the new directory, leaving example programs where they
+    were.
+
 2008-10-20  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * tests/Makefile.am

Makefile.am

@@ -6,8 +6,9 @@ if BUILD_OCTAVE_MOD
 octave_dir = Octave
 endif
 
-SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests
-DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests
+SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs
+DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs
+
 EXTRA_DIST = libsndfile.spec.in sndfile.pc.in Mingw-make-dist.sh
 
 

configure.ac

@@ -586,7 +586,7 @@ AC_CONFIG_FILES([ \
 	src/sndfile.h src/Makefile src/GSM610/Makefile src/G72x/Makefile \
 	man/Makefile examples/Makefile tests/Makefile regtest/Makefile \
 	M4/Makefile doc/Makefile Win32/Makefile Octave/Makefile \
-	doc/libsndfile.css \
+	programs/Makefile doc/libsndfile.css \
 	Makefile libsndfile.spec sndfile.pc \
 	])
 AC_OUTPUT

examples/Makefile.am

@@ -1,40 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert sndfile-jackplay sndfile-cmp \
-				sndfile-metadata-set sndfile-metadata-get sndfile-to-text
+noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle sndfile-to-text
 
-noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle
-
-# This is the BeOS version of sndfile-play. It needs to be compiled with the C++
-# compiler.
-EXTRA_DIST = sndfile-play-beos.cpp test-sndfile-metadata-set.py
-
-OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
-OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
-
-INCLUDES = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
-
-sndfile_info_SOURCES = sndfile-info.c
-sndfile_info_LDADD = $(top_builddir)/src/libsndfile.la
-
-sndfile_play_SOURCES = sndfile-play.c
-sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS)
-
-sndfile_jackplay_SOURCES = sndfile-jackplay.c
-sndfile_jackplay_CFLAGS = $(JACK_CFLAGS)
-sndfile_jackplay_LDADD = $(top_builddir)/src/libsndfile.la $(JACK_LIBS)
-
-sndfile_convert_SOURCES = sndfile-convert.c common.c common.h
-sndfile_convert_LDADD = $(top_builddir)/src/libsndfile.la
-
-sndfile_cmp_SOURCES = sndfile-cmp.c
-sndfile_cmp_LDADD = $(top_builddir)/src/libsndfile.la
-
-sndfile_metadata_set_SOURCES = sndfile-metadata-set.c common.c common.h
-sndfile_metadata_set_LDADD = $(top_builddir)/src/libsndfile.la
-
-sndfile_metadata_get_SOURCES = sndfile-metadata-get.c
-sndfile_metadata_get_LDADD = $(top_builddir)/src/libsndfile.la
+INCLUDES = -I$(top_srcdir)/src
 
 sndfile_to_text_SOURCES = sndfile-to-text.c
 sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la

programs/Makefile.am

@@ -0,0 +1,36 @@
+## Process this file with automake to produce Makefile.in
+
+bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert sndfile-jackplay sndfile-cmp \
+				sndfile-metadata-set sndfile-metadata-get
+
+OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
+OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
+
+INCLUDES = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
+
+# This is the BeOS version of sndfile-play. It needs to be compiled with the C++
+# compiler.
+EXTRA_DIST = sndfile-play-beos.cpp test-sndfile-metadata-set.py
+
+sndfile_info_SOURCES = sndfile-info.c
+sndfile_info_LDADD = $(top_builddir)/src/libsndfile.la
+
+sndfile_play_SOURCES = sndfile-play.c
+sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS)
+
+sndfile_jackplay_SOURCES = sndfile-jackplay.c
+sndfile_jackplay_CFLAGS = $(JACK_CFLAGS)
+sndfile_jackplay_LDADD = $(top_builddir)/src/libsndfile.la $(JACK_LIBS)
+
+sndfile_convert_SOURCES = sndfile-convert.c common.c common.h
+sndfile_convert_LDADD = $(top_builddir)/src/libsndfile.la
+
+sndfile_cmp_SOURCES = sndfile-cmp.c
+sndfile_cmp_LDADD = $(top_builddir)/src/libsndfile.la
+
+sndfile_metadata_set_SOURCES = sndfile-metadata-set.c common.c common.h
+sndfile_metadata_set_LDADD = $(top_builddir)/src/libsndfile.la
+
+sndfile_metadata_get_SOURCES = sndfile-metadata-get.c
+sndfile_metadata_get_LDADD = $(top_builddir)/src/libsndfile.la
+