aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-12 16:11:32 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-12 16:11:32 +0000
commit8e30fcc2a37e5ce8ce545d04f03782178e027cb7 (patch)
tree71d292c2cce092705b027204fc24ca021c43a508 /Makefile
parentb86d7cc37c6c02af5581f7b9cb0a058e061e5377 (diff)
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) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44943 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 96d2babf0..b177aa7c8 100644
--- a/Makefile
+++ b/Makefile
@@ -309,7 +309,7 @@ $(MOD_SUBDIRS):
@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