Skip to content
Snippets Groups Projects
Commit 1c55f842 authored by Luigi Rizzo's avatar Luigi Rizzo
Browse files

Move AUDIO_LIBS outside the top level Makefile. This too is used only

in one place.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 44bf9738
No related branches found
No related tags found
No related merge requests found
...@@ -270,7 +270,6 @@ MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs) ...@@ -270,7 +270,6 @@ MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
ifneq ($(findstring darwin,$(OSARCH)),) ifneq ($(findstring darwin,$(OSARCH)),)
ASTCFLAGS+=-D__Darwin__ ASTCFLAGS+=-D__Darwin__
AUDIO_LIBS=-framework CoreAudio
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
else else
# These are used for all but Darwin # These are used for all but Darwin
...@@ -351,7 +350,7 @@ $(MOD_SUBDIRS): ...@@ -351,7 +350,7 @@ $(MOD_SUBDIRS):
$(OTHER_SUBDIRS): $(OTHER_SUBDIRS):
@echo " [enter SUBDIR $@/]" @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 $@/]" @echo " [exit SUBDIR $@/]"
defaults.h: makeopts defaults.h: makeopts
......
...@@ -30,6 +30,10 @@ ifeq ($(OSARCH),OpenBSD) ...@@ -30,6 +30,10 @@ ifeq ($(OSARCH),OpenBSD)
UTILS:=$(filter-out muted,$(UTILS)) UTILS:=$(filter-out muted,$(UTILS))
endif endif
ifneq ($(findstring darwin,$(OSARCH)),)
AUDIO_LIBS=-framework CoreAudio
endif
ifeq ($(POPT_LIB),) ifeq ($(POPT_LIB),)
UTILS:=$(filter-out smsq,$(UTILS)) UTILS:=$(filter-out smsq,$(UTILS))
endif endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment