[asterisk-commits] file: trunk r44943 - in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Oct 12 11:11:32 2006
New Revision: 44943

URL: http://svn.digium.com/view/asterisk?rev=44943&view=rev
Log:
Merged revisions 44942 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44942 | file | 2006-10-12 12:08:50 -0400 (Thu, 12 Oct 2006) | 2 lines

Pass off AUDIO_LIBS so muted can link on OSX (issue #8135 reported by ssokol)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=44943&r1=44942&r2=44943&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Oct 12 11:11:32 2006
@@ -309,7 +309,7 @@
 	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
 
 $(OTHER_SUBDIRS):
-	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp