From 42c0da71e132d83a9af4675d9fc880aaa9cf54eb Mon Sep 17 00:00:00 2001
From: trutkin <trutkin@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 25 Jan 2005 16:07:09 +0000
Subject: [PATCH] Fixed makefile support for coreaudio driver.

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@881 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 config/configure.host                |  2 +-
 configure.ac                         |  2 --
 drivers/coreaudio/Makefile.am        | 10 ++++------
 drivers/coreaudio/coreaudio_driver.h |  2 +-
 jack.pc.in                           |  2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/config/configure.host b/config/configure.host
index afb6c00..8e369b8 100644
--- a/config/configure.host
+++ b/config/configure.host
@@ -157,7 +157,7 @@ case "${host_os}" in
     JACK_CPP_VARARGS_BROKEN=1
     JACK_DO_NOT_MLOCK=1
     JACK_USE_MACH_THREADS=1
-    OS_LDFLAGS="-framework CoreAudio"
+    OS_LDFLAGS="-framework CoreAudio -framework CoreServices -framework AudioUnit"
     TRY_POSIX_SHM=yes			# POSIX shm works better
     ;;
   *)
diff --git a/configure.ac b/configure.ac
index ce50cc2..879ce07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,10 +463,8 @@ then
 	# check for coreaudio
 	AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
 		[ HAVE_COREAUDIO="true"
-		  CA_LIBS="-framework CoreAudio"
 		  JACK_DEFAULT_DRIVER=\"coreaudio\"
 		])
-	AC_SUBST(CA_LIBS)
 fi
 AM_CONDITIONAL(HAVE_COREAUDIO, $HAVE_COREAUDIO)
 
diff --git a/drivers/coreaudio/Makefile.am b/drivers/coreaudio/Makefile.am
index c220cd6..68b8c9f 100644
--- a/drivers/coreaudio/Makefile.am
+++ b/drivers/coreaudio/Makefile.am
@@ -1,14 +1,12 @@
 MAINTAINERCLEANFILES=Makefile.in
 
-AM_CFLAGS = $(JACK_CFLAGS)
+AM_CFLAGS = $(JACK_CFLAGS) -include /System/Library/Frameworks/Carbon.framework/Headers/Carbon.h
 
 plugindir = $(ADDON_DIR)
 
 plugin_LTLIBRARIES = jack_coreaudio.la
 
-jack_coreaudio_la_LDFLAGS = -module -avoid-version
-jack_coreaudio_la_SOURCES = coreaudio_driver.c coreaudio_driver.h AudioRender.cpp AudioRenderBridge.cpp
+jack_coreaudio_la_LDFLAGS = -module -avoid-version @OS_LDFLAGS@
+jack_coreaudio_la_SOURCES = coreaudio_driver.c coreaudio_driver.h 
 
-noinst_HEADERS = coreaudio_driver.h AudioRender.h AudioRenderBridge.h
-
-jack_coreaudio_la_LIBADD = $(CA_LIBS)
+noinst_HEADERS = coreaudio_driver.h 
diff --git a/drivers/coreaudio/coreaudio_driver.h b/drivers/coreaudio/coreaudio_driver.h
index f09126b..567b717 100755
--- a/drivers/coreaudio/coreaudio_driver.h
+++ b/drivers/coreaudio/coreaudio_driver.h
@@ -28,9 +28,9 @@
 #ifndef __jack_coreaudio_driver_h__
 #define __jack_coreaudio_driver_h__
 
+#include <CoreAudio/CoreAudio.h>
 #include <AudioToolbox/AudioConverter.h>
 #include <AudioUnit/AudioUnit.h>
-#include <CoreAudio/CoreAudio.h>
 
 #include <jack/types.h>
 #include <jack/hardware.h>
diff --git a/jack.pc.in b/jack.pc.in
index 196cde6..ec21bae 100644
--- a/jack.pc.in
+++ b/jack.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: jack
 Description: the Jack Audio Connection Kit: a low-latency synchronous callback-based media server
 Version: @JACK_VERSION@
-Libs: -L${libdir} -ljack @OS_LDFLAGS@
+Libs: -L${libdir} -ljack "@OS_LDFLAGS@"
 Cflags: -I${includedir}