summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 4961c8bd..d0a65563 100644
--- a/Makefile
+++ b/Makefile
@@ -217,13 +217,17 @@ ifneq ($(CRYPTOLIB),)
endif
endif
ifneq ($(HAVE_OSS)-$(HAVE_ALSA),no-no)
- executables += mixer
- mixer_objs := $(addsuffix .o, mixer exec string fd time lsu version)
- ifeq ($(HAVE_OSS),yes)
- mixer_objs += oss_mix.o
- endif
- ifeq ($(HAVE_ALSA),yes)
- mixer_objs += alsa_mix.o
+ ifneq ($(CRYPTOLIB),)
+ executables += mixer
+ mixer_objs := $(addsuffix .o, mixer string fd time lsu version \
+ audioc_common net buffer_tree crypt_common \
+ $(CRYPTOLIB) sched client_common sideband)
+ ifeq ($(HAVE_OSS),yes)
+ mixer_objs += oss_mix.o
+ endif
+ ifeq ($(HAVE_ALSA),yes)
+ mixer_objs += alsa_mix.o
+ endif
endif
endif
ifeq ($(HAVE_CURSES),yes)
@@ -388,7 +392,7 @@ audioc_objs += audioc.lsg.o
audiod_objs += $(addsuffix _cmd.lsg.o, recv filter audiod write) \
client.lsg.o audiod.lsg.o
client_objs += client.lsg.o
-mixer_objs += mixer.lsg.o
+mixer_objs += mixer.lsg.o client.lsg.o
filter_objs += filter_cmd.lsg.o filter.lsg.o
gui_objs += gui.lsg.o
play_objs += $(addsuffix _cmd.lsg.o, recv filter play write) play.lsg.o
@@ -577,6 +581,7 @@ para_gui: LDFLAGS += $(curses_ldflags)
para_server \
para_client \
para_audiod \
+para_mixer \
:LDFLAGS += \
$(crypto_ldflags)