From 4fba1f791c35467be8296c09b596a3ab3c1fe94c Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Wed, 22 Dec 2004 10:04:46 +0000
Subject: [PATCH] Until we put in more fine-grain control, don't make
 libcdio_paranoia and libcdda_interface libraries if we aren't making
 cd-paranoia.

src/Makefile.am: correct way to disable cd-paranoia.
---
 lib/Makefile.am         | 6 +++++-
 lib/iso9660/Makefile.am | 7 ++++---
 src/Makefile.am         | 5 ++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f4c3726f..261963f5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.65 2004/12/18 17:29:32 rocky Exp $
+#   $Id: Makefile.am,v 1.66 2004/12/22 10:04:46 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -20,4 +20,8 @@
 # make all libraries
 ########################################################
 
+if BUILD_CD_PARANOIA
 SUBDIRS =  driver iso9660 cdda_interface paranoia
+else 
+SUBDIRS =  driver iso9660
+endif
diff --git a/lib/iso9660/Makefile.am b/lib/iso9660/Makefile.am
index 28ff3c13..80527ea1 100644
--- a/lib/iso9660/Makefile.am
+++ b/lib/iso9660/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.1 2004/12/18 17:29:32 rocky Exp $
+#   $Id: Makefile.am,v 1.2 2004/12/22 10:04:46 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -60,6 +60,7 @@ libiso9660_la_SOURCES = \
 
 libiso9660_la_LIBADD = @LIBCDIO_LIBS@
 libiso9660_la_ldflags = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_REVISION):$(libiso9660_la_AGE)
+libiso9660_la_dependencies = libcdio.la
 
 INCLUDES = $(LIBCDIO_CFLAGS)
 
@@ -124,7 +125,7 @@ INCLUDES = $(LIBCDIO_CFLAGS)
 libiso9660_la_MAJOR := $(shell expr $(libiso9660_la_CURRENT) - $(libiso9660_la_AGE))
 if BUILD_VERSIONED_LIBS
 libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags) -Wl,--version-script=libiso9660.la.ver
-libiso9660_la_DEPENDENCIES = @LIBCDIO_LIBS@ libiso9660.la.ver
+libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies) libiso9660.la.ver
 
 libiso9660.la.ver: $(libiso9660_la_OBJECTS) $(srcdir)/libiso9660.sym
 	echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@
@@ -137,5 +138,5 @@ libiso9660.la.ver: $(libiso9660_la_OBJECTS) $(srcdir)/libiso9660.sym
 MOSTLYCLEANFILES = libiso9660.la.ver
 else 
 libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags)
-libiso9660_la_DEPENDENCIES = @LIBCDIO_LIBS@
+libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies)
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index a0d2840c..14e18e86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.28 2004/12/18 21:24:25 rocky Exp $
+#   $Id: Makefile.am,v 1.29 2004/12/22 10:04:46 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -19,7 +19,10 @@
 ####################################################
 # Things to make the sample/test programs
 ####################################################
+
+if BUILD_CD_PARANOIA
 SUBDIRS =  cd-paranoia
+endif
 
 CDDB_LIBS=@CDDB_LIBS@