diff --git a/Makefile b/Makefile index c0364984f7bbe6ef7f8888c02ed0ff8450703531..e617a3bbf60b86ec13a46ba8f01cf0e95f53f2c3 100644 --- a/Makefile +++ b/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 diff --git a/utils/Makefile b/utils/Makefile index 6ea4fc581bf9cdab1d6f732dfe61e6710fd0f128..a1e89b8c94cfbe0f1bf1d488af09f65ff24a70f3 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -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