convience fixes. no longer need a 'make install' to play with example code.

make install will also NOT install example binaries, but SHOULD install
sources

svn path=/branches/branch_postbeta2/vorbis/; revision=712

4 files changed, 25 insertions, 89 deletions

diff --git a/Makefile.am b/Makefile.am
index 55efd1de..e0eca51d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-zip
 
-SUBDIRS = lib include doc
+SUBDIRS = lib include doc examples
 
 EXTRA_DIST = README COPYING todo.txt libvorbis.spec
 
diff --git a/configure.in b/configure.in
index db4c1aa5..a8eb249e 100644
--- a/configure.in
+++ b/configure.in
@@ -166,4 +166,4 @@ AC_SUBST(PROFILE)
 AC_SUBST(CC)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile doc/Makefile include/Makefile include/vorbis/Makefile include/vorbis/book/Makefile)
+AC_OUTPUT(Makefile lib/Makefile doc/Makefile include/Makefile include/vorbis/Makefile include/vorbis/book/Makefile examples/Makefile)
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 00000000..ce58d18e
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,23 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+INCLUDES = -I$(top_srcdir)/include
+
+noinst_PROGRAMS = decoder_example encoder_example chaining_example\
+		vorbisfile_example
+
+decoder_example_SOURCES = decoder_example.c
+decoder_example_LDFLAGS = -L$(top_srcdir)/lib/.libs -lvorbis
+encoder_example_SOURCES = encoder_example.c
+encoder_example_LDFLAGS = -L$(top_srcdir)/lib/.libs -lvorbis
+chaining_example_SOURCES = chaining_example.c
+chaining_example_LDFLAGS = -L$(top_srcdir)/lib/.libs -lvorbis
+vorbisfile_example_SOURCES = vorbisfile_example.c
+vorbisfile_example_LDFLAGS = -L$(top_srcdir)/lib/.libs -lvorbis
+
+debug:
+	$(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+	$(MAKE) all CFLAGS="@PROFILE@"
diff --git a/examples/Makefile.in b/examples/Makefile.in
deleted file mode 100644
index ab36bd18..00000000
--- a/examples/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-# vorbis makefile configured for use with gcc on any platform
-
-# $Id: Makefile.in,v 1.13.2.1 2000/09/27 06:20:54 jack Exp $
-
-###############################################################################
-#                                                                             #
-# To build a production vorbis (preferrably using gmake), just type 'make'.   #
-# To build with debugging or profiling information, use 'make debug' or       #
-# 'make profile' respectively.  'make clean' is a good idea between builds    #
-# with different target names, or before a final build.                       #
-#                                                                             #
-###############################################################################
-
-
-# DO NOT EDIT BELOW! ##########################################################
-# (unless, of course, you know what you are doing :) ##########################
-
-@SET_MAKE@
-FLAGS=-I. -I../include @CFLAGS@ 
-OPT=@OPT@ $(FLAGS)
-DEBUG=@DEBUG@ $(FLAGS)
-PROFILE=@PROFILE@ $(FLAGS)
-CC=@CC@
-LD=@CC@
-LDFLAGS=@LDFLAGS@ $(FLAGS)
-AR=@AR@
-RANLIB=@RANLIB@
-LIBS=@LIBS@
-
-HFILES =	../include/vorbis/codec.h ../include/vorbis/vorbisfile.h \
-		../include/vorbis/backends.h \
-		../include/vorbis/codebook.h
-OFILES =	encoder_example.o decoder_example.o chaining_example.o \
-		vorbisfile_example.o seeking_test.o
-BINFILES =      encoder_example decoder_example chaining_example \
-		vorbisfile_example seeking_test
-
-all:
-	$(MAKE) target CFLAGS="$(OPT)"
-
-debug:	
-	$(MAKE) target CFLAGS="$(DEBUG)"
-
-profile: 
-	$(MAKE) target CFLAGS="$(PROFILE)"
-
-target:	$(BINFILES)
-
-encoder_example.o:	../include/vorbis/modes.h 
-
-encoder_example:	$(OFILES) ../lib/libvorbis.a
-	$(CC) $(CFLAGS) $(LDFLAGS) encoder_example.o ../lib/libvorbis.a -o \
-			encoder_example $(LIBS)
-
-decoder_example:	$(OFILES) ../lib/libvorbis.a
-	$(CC) $(CFLAGS) $(LDFLAGS) decoder_example.o ../lib/libvorbis.a -o \
-			decoder_example $(LIBS)
-
-chaining_example:	$(OFILES) ../lib/libvorbis.a ../lib/vorbisfile.a
-	$(CC) $(CFLAGS) $(LDFLAGS) chaining_example.o \
-			../lib/vorbisfile.a ../lib/libvorbis.a \
-			-o chaining_example $(LIBS)
-vorbisfile_example:	$(OFILES) ../lib/libvorbis.a ../lib/vorbisfile.a
-	$(CC) $(CFLAGS) $(LDFLAGS) vorbisfile_example.o \
-			../lib/vorbisfile.a ../lib/libvorbis.a \
-			-o vorbisfile_example $(LIBS)
-
-seeking_test:	$(OFILES) ../lib/libvorbis.a ../lib/vorbisfile.a
-	$(CC) $(CFLAGS) $(LDFLAGS) seeking_test.o \
-			../lib/vorbisfile.a ../lib/libvorbis.a \
-			-o seeking_test $(LIBS)
-
-selftest:	
-
-$(OFILES): 	$(HFILES)
-
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-
-clean:
-	-rm -f *.o *.a test* *~ *.out ogg config.* \
-		encoder_example decoder_example chaining_example \
-		vorbisfile_example seeking_test
-
-distclean:	clean
-	-rm -f Makefile
-