Don't leak curses sound options elsewhere.

diff --git a/Makefile b/Makefile
index 0c330d00d3eae9f12a7ef3689e0ffa1080920580..8d5ce0d4d452ebee919bc50e3d14014fbed73814 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ RANLIB ?= $(shell which ranlib)
 
 # Choose your sound support
 # OPTIONS: ao, none
-SOUND ?= ao
+export SOUND ?= ao
 
 # Default sample rate for sound effects.
 # All modern sound interfaces can be expected to support 44100 Hz sample
@@ -71,14 +71,8 @@ BUFFSIZE ?= 4096
 DEFAULT_CONVERTER ?= SRC_SINC_MEDIUM_QUALITY
 
 ifeq ($(SOUND), ao)
-       LDFLAGS += -lao -ldl -lpthread -lm -lsndfile -lvorbisfile -lmodplug -lsamplerate
-       CFLAGS += -pthread
-else ifeq ($(SOUND), none)
-       CFLAGS += -DNO_SOUND
-else ifndef SOUND
-       CFLAGS += -DNO_SOUND
-else
-       @echo "Invalid sound choice $(SOUND)."
+  CURSES_LDFLAGS = -lao -ldl -lpthread -lm \
+       -lsndfile -lvorbisfile -lmodplug -lsamplerate
 endif
 
 ##########################################################################
@@ -158,7 +152,8 @@ $(SUB_CLEAN):
 # Main programs
 
 frotz: $(COMMON_LIB) $(CURSES_LIB) $(BLORB_LIB) $(COMMON_LIB)
-       $(CC) $(CFLAGS) $+ -o $@$(EXTENSION) $(CURSES) $(LDFLAGS)
+       $(CC) $(CFLAGS) $+ -o $@$(EXTENSION) $(CURSES) $(LDFLAGS) \
+               $(CURSES_LDFLAGS)
 
 dfrotz: $(COMMON_LIB) $(DUMB_LIB) $(BLORB_LIB) $(COMMON_LIB)
        $(CC) $(CFLAGS) $+ -o $@$(EXTENSION)

diff --git a/src/curses/Makefile b/src/curses/Makefile
index 3ae11095b3875bea380b0604f535d84cc008879c..15edd120532c47ed007229d91e1c32e378a0cc5c 100644 (file)
--- a/src/curses/Makefile
+++ b/src/curses/Makefile
@@ -11,6 +11,18 @@ TARGET = frotz_curses.a
 
 ARFLAGS = rc
 
+SOUND ?= ao
+
+ifeq ($(SOUND), ao)
+  CFLAGS += -pthread
+else ifeq ($(SOUND), none)
+  CFLAGS += -DNO_SOUND
+else ifndef SOUND
+  CFLAGS += -DNO_SOUND
+else
+  $(error Invalid sound choice $(SOUND))
+endif
+
 .PHONY: clean
 .DELETE_ON_ERROR: