Merge topic branch t/sf_float into pu

[paraslash.git] / Makefile.real

diff --git a/Makefile.real b/Makefile.real
index 92a5724b3cc6543553dcaf8dbdf6385e4169e41e..fec328a6adbe8be0e8d2d18ae9d0bc3740a10499 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -37,7 +37,7 @@ test_dir := t
 yy_src_dir := yy
 yy_build_dir := $(build_dir)/yy
 
-executables := recv filter audioc write afh play
+executables := recv filter audioc write afh
 ifneq ($(CRYPTOLIB),)
        ifeq ($(HAVE_OSL),yes)
        executables += server upgrade_db
@@ -225,48 +225,48 @@ ifeq ($(HAVE_FAAD),yes)
        audio_format_handlers += aac
 endif
 
-play_objs := $(addsuffix .o, \
-       play fd sched buffer_tree time string net afh_recv afh_common \
-       wma_afh wma_common mp3_afh recv_common udp_recv http_recv dccp_recv \
-       filter_common fec bitstream imdct wav_filter compress_filter \
-       amp_filter prebuffer_filter fecdec_filter wmadec_filter write_common \
-       file_write version sync_filter lsu \
-)
-ifeq ($(NEED_OGG_OBJECTS),yes)
-       play_objs += ogg_afh_common.o
-endif
-ifeq ($(NEED_VORBIS_OBJECTS),yes)
-       play_objs += oggdec_filter.o ogg_afh.o
-endif
-ifeq ($(NEED_SPEEX_OBJECTS),yes)
-       play_objs += spxdec_filter.o spx_afh.o spx_common.o
-endif
-ifeq ($(NEED_OPUS_OBJECTS),yes)
-       play_objs += opusdec_filter.o opus_afh.o opus_common.o
-endif
-ifeq ($(NEED_FLAC_OBJECTS),yes)
-       play_objs += flacdec_filter.o flac_afh.o
-endif
-ifeq ($(HAVE_FAAD),yes)
-       play_objs += aac_afh.o aacdec_filter.o mp4.o
-endif
-ifeq ($(HAVE_MAD),yes)
-       play_objs += mp3dec_filter.o
-endif
-ifeq ($(HAVE_OSS),yes)
-       play_objs += oss_write.o
-endif
-ifeq ($(HAVE_ALSA),yes)
-       play_objs += alsa_write.o
-endif
-ifeq ($(NEED_AO_OBJECTS),yes)
-       play_objs += ao_write.o
-endif
 ifeq ($(HAVE_READLINE),yes)
-       play_objs += interactive.o
-endif
-ifeq ($(HAVE_SAMPLERATE),yes)
-       play_objs += resample_filter.o check_wav.o
+       executables += play
+       play_objs := $(addsuffix .o, \
+               play fd sched buffer_tree time string net afh_recv afh_common \
+               wma_afh wma_common mp3_afh recv_common udp_recv http_recv dccp_recv \
+               filter_common fec bitstream imdct wav_filter compress_filter \
+               amp_filter prebuffer_filter fecdec_filter wmadec_filter write_common \
+               file_write version sync_filter lsu interactive \
+       )
+       ifeq ($(NEED_OGG_OBJECTS),yes)
+               play_objs += ogg_afh_common.o
+       endif
+       ifeq ($(NEED_VORBIS_OBJECTS),yes)
+               play_objs += oggdec_filter.o ogg_afh.o
+       endif
+       ifeq ($(NEED_SPEEX_OBJECTS),yes)
+               play_objs += spxdec_filter.o spx_afh.o spx_common.o
+       endif
+       ifeq ($(NEED_OPUS_OBJECTS),yes)
+               play_objs += opusdec_filter.o opus_afh.o opus_common.o
+       endif
+       ifeq ($(NEED_FLAC_OBJECTS),yes)
+               play_objs += flacdec_filter.o flac_afh.o
+       endif
+       ifeq ($(HAVE_FAAD),yes)
+               play_objs += aac_afh.o aacdec_filter.o mp4.o
+       endif
+       ifeq ($(HAVE_MAD),yes)
+               play_objs += mp3dec_filter.o
+       endif
+       ifeq ($(HAVE_OSS),yes)
+               play_objs += oss_write.o
+       endif
+       ifeq ($(HAVE_ALSA),yes)
+               play_objs += alsa_write.o
+       endif
+       ifeq ($(NEED_AO_OBJECTS),yes)
+               play_objs += ao_write.o
+       endif
+       ifeq ($(HAVE_SAMPLERATE),yes)
+               play_objs += resample_filter.o check_wav.o
+       endif
 endif
 
 write_objs := $(addsuffix .o, write write_common file_write time fd \
@@ -475,7 +475,6 @@ $(call OD, afs aft attribute blob mood playlist score server vss command \
        CPPFLAGS += $(osl_cppflags)
 
 $(call OD, compress_filter): CFLAGS += -O3
-$(call OD, openssl): CFLAGS += -Wno-deprecated-declarations
 
 $(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h)
 define CC_CMD