[svn-commits] rizzo: trunk r88770 - in /trunk: Makefile utils/Makefile

[SVN commits to the Digium repositories]

Author: rizzo
Date: Mon Nov  5 15:36:11 2007
New Revision: 88770

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88770
Log:
Move AUDIO_LIBS outside the top level Makefile. This too is used only
in one place.


Modified:
    trunk/Makefile
    trunk/utils/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=88770&r1=88769&r2=88770
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Nov  5 15:36:11 2007
@@ -270,7 +270,6 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
-  AUDIO_LIBS=-framework CoreAudio
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
 else
 # These are used for all but Darwin
@@ -351,7 +350,7 @@
 
 $(OTHER_SUBDIRS):
 	@echo "   [enter SUBDIR $@/]"
-	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
 	@echo "   [exit SUBDIR $@/]"
 
 defaults.h: makeopts

Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?view=diff&rev=88770&r1=88769&r2=88770
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Mon Nov  5 15:36:11 2007
@@ -28,6 +28,10 @@
 
 ifeq ($(OSARCH),OpenBSD)
   UTILS:=$(filter-out muted,$(UTILS))
+endif
+
+ifneq ($(findstring darwin,$(OSARCH)),)
+  AUDIO_LIBS=-framework CoreAudio
 endif
 
 ifeq ($(POPT_LIB),)