kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 03:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
in one place.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2007-11-05 21:36:11 +00:00
parent 44bf973865
commit 1c55f8424e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -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):
$(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

4
utils/Makefile
View File

@@ -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