From c49380d6389a382cdecc529269e2604bc115fb5e Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Wed, 7 Aug 2002 17:38:08 +0000
Subject: [PATCH] add OggFLAC dirs

---
 Makefile.lite       | 14 +++++++++++---
 configure.in        |  4 ++++
 include/Makefile.am |  6 +++++-
 src/Makefile.am     |  8 +++++++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Makefile.lite b/Makefile.lite
index 92b348c5..72099868 100644
--- a/Makefile.lite
+++ b/Makefile.lite
@@ -27,8 +27,8 @@
 # clean   : remove all non-distro files
 #
 
-.PHONY: doc libFLAC libFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams
-all: doc libFLAC libFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams
+.PHONY: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams
+all: doc libFLAC libFLAC++ libOggFLAC libOggFLAC++ share plugin_xmms flac metaflac test_libFLAC test_libFLAC++ test_streams
 
 DEFAULT_CONFIG = release
 
@@ -49,10 +49,16 @@ libFLAC:
 libFLAC++:
 	(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
 
+libOggFLAC:
+	(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
+
+libOggFLAC++:
+	(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
+
 share:
 	(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
 
-flac: libFLAC
+flac: libFLAC libOggFLAC
 	(cd src/$@ ; $(MAKE) -f Makefile.lite $(CONFIG))
 
 metaflac: libFLAC share
@@ -77,6 +83,8 @@ clean:
 	-(cd doc ; $(MAKE) -f Makefile.lite clean)
 	-(cd src/libFLAC ; $(MAKE) -f Makefile.lite clean)
 	-(cd src/libFLAC++ ; $(MAKE) -f Makefile.lite clean)
+	-(cd src/libOggFLAC ; $(MAKE) -f Makefile.lite clean)
+	-(cd src/libOggFLAC++ ; $(MAKE) -f Makefile.lite clean)
 	-(cd src/share ; $(MAKE) -f Makefile.lite clean)
 	-(cd src/flac ; $(MAKE) -f Makefile.lite clean)
 	-(cd src/metaflac ; $(MAKE) -f Makefile.lite clean)
diff --git a/configure.in b/configure.in
index ec8dc09d..5e60d1a8 100644
--- a/configure.in
+++ b/configure.in
@@ -226,6 +226,10 @@ AC_OUTPUT( \
 	src/libFLAC/include/private/Makefile \
 	src/libFLAC/include/protected/Makefile \
 	src/libFLAC++/Makefile \
+	src/libOggFLAC/Makefile \
+	src/libOggFLAC/include/Makefile \
+	src/libOggFLAC/include/protected/Makefile \
+	src/libOggFLAC++/Makefile \
 	src/flac/Makefile \
 	src/metaflac/Makefile \
 	src/plugin_xmms/Makefile \
diff --git a/include/Makefile.am b/include/Makefile.am
index 26710e11..0fc373ba 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,4 +16,8 @@
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #  Boston, MA  02111-1307, USA.
 
-SUBDIRS = FLAC FLAC++ OggFLAC share
+if FLaC__HAS_OGG
+OGGFLAC_DIRS = OggFLAC OggFLAC++
+endif
+
+SUBDIRS = FLAC FLAC++ $(OGGFLAC_DIRS) share
diff --git a/src/Makefile.am b/src/Makefile.am
index ef3847ef..1248f3be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,11 @@ if FLaC__HAS_XMMS
 XMMS_DIRS = plugin_xmms
 endif
 
+if FLaC__HAS_OGG
+OGGFLAC_DIRS = libOggFLAC libOggFLAC++
+#@@@ tests not written yet: OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
+endif
+
 EXTRA_DIST = \
 	monkeys_audio_utilities \
 	plugin_winamp2 \
@@ -27,11 +32,12 @@ EXTRA_DIST = \
 SUBDIRS = \
 	libFLAC \
 	libFLAC++ \
-	libOggFLAC \
+	$(OGGFLAC_DIRS) \
 	share \
 	flac \
 	metaflac \
 	$(XMMS_DIRS) \
 	test_libFLAC \
 	test_libFLAC++ \
+	$(OGGFLAC_TEST_DIRS) \
 	test_streams