audioc: Avoid double free in audioc_i9e_line_handler().

[paraslash.git] / Makefile.real

diff --git a/Makefile.real b/Makefile.real
index 669a469ffc8e836feff56e42daa8e5913d5c4c32..a2e6a423dd6624c4538954637feca67bbe9dbc44 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -36,7 +36,7 @@ test_dir := t
 
 # sort removes duplicate words, which is all we need here
 all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
-       $(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
+       $(audiod_objs) $(audioc_objs) $(mixer_objs) $(server_objs) \
        $(write_objs) $(afh_objs) $(play_objs))
 deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
 
@@ -45,7 +45,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
-fade_objs += fade.lsg.o
+mixer_objs += mixer.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
@@ -65,7 +65,7 @@ client_objs := $(addprefix $(object_dir)/, $(client_objs))
 gui_objs := $(addprefix $(object_dir)/, $(gui_objs))
 audiod_objs := $(addprefix $(object_dir)/, $(audiod_objs))
 audioc_objs := $(addprefix $(object_dir)/, $(audioc_objs))
-fade_objs := $(addprefix $(object_dir)/, $(fade_objs))
+mixer_objs := $(addprefix $(object_dir)/, $(mixer_objs))
 server_objs := $(addprefix $(object_dir)/, $(server_objs))
 write_objs := $(addprefix $(object_dir)/, $(write_objs))
 afh_objs := $(addprefix $(object_dir)/, $(afh_objs))
@@ -264,10 +264,12 @@ para_play \
        $(samplerate_ldflags) \
        -lm
 
+para_mixer: LDFLAGS += -lm
+
 para_write \
 para_play \
 para_audiod \
-para_fade \
+para_mixer \
 : LDFLAGS += \
        $(oss_ldflags) \
        $(alsa_ldflags)
@@ -276,7 +278,7 @@ para_afh \
 para_audioc \
 para_audiod \
 para_client \
-para_fade \
+para_mixer \
 para_filter \
 para_gui \
 para_play \