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
This commit is contained in:
parent
44bf973865
commit
1c55f8424e
3
Makefile
3
Makefile
|
@ -270,7 +270,6 @@ MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
|
|||
|
||||
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 @@ $(MOD_SUBDIRS):
|
|||
|
||||
$(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
|
||||
|
|
|
@ -30,6 +30,10 @@ ifeq ($(OSARCH),OpenBSD)
|
|||
UTILS:=$(filter-out muted,$(UTILS))
|
||||
endif
|
||||
|
||||
ifneq ($(findstring darwin,$(OSARCH)),)
|
||||
AUDIO_LIBS=-framework CoreAudio
|
||||
endif
|
||||
|
||||
ifeq ($(POPT_LIB),)
|
||||
UTILS:=$(filter-out smsq,$(UTILS))
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue