X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.real;h=ddf85b58d06a1b0b9c87a6d8d1890a8facbf5480;hb=refs%2Fheads%2Fnext;hp=6ab2065c654eb6655c7f6c5812db6d420df01eae;hpb=5fd6c1a5acae2a52545e081ac4b38717c7295d80;p=paraslash.git

diff --git a/Makefile.real b/Makefile.real
index 6ab2065c..21d5fc03 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -14,7 +14,6 @@ SEVERITIES := \"debug\",\"info\",\"notice\",\"warning\",\"error\",\"crit\",\"eme
 vardir := /var/paraslash
 mandir := $(datarootdir)/man/man1
 MKDIR_P := mkdir -p
-prefixed_executables := $(addprefix para_, $(executables))
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -38,8 +37,10 @@ test_dir := t
 yy_src_dir := yy
 yy_build_dir := $(build_dir)/yy
 
+executables := recv filter audioc write afh play
 ifneq ($(CRYPTOLIB),)
 	ifeq ($(HAVE_OSL),yes)
+	executables += server upgrade_db
 		server_objs := $(addsuffix .o, \
 			server afh_common mp3_afh vss command net string \
 			signal time daemon http_send close_on_fork \
@@ -76,6 +77,7 @@ ifneq ($(CRYPTOLIB),)
 	endif
 endif
 ifneq ($(CRYPTOLIB),)
+	executables += client audiod
 	client_objs := $(addsuffix .o, \
 		client net string fd lsu sched stdin stdout time sideband client_common \
 		buffer_tree crypt_common base64 version $(CRYPTOLIB) \
@@ -130,6 +132,7 @@ 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
@@ -139,6 +142,7 @@ ifneq ($(HAVE_OSS)-$(HAVE_ALSA),no-no)
 	endif
 endif
 ifeq ($(HAVE_CURSES),yes)
+	executables += gui
 	gui_objs := $(addsuffix .o, exec signal string stat ringbuffer fd \
 		gui gui_theme lsu time sched version)
 endif
@@ -221,12 +225,72 @@ 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
+endif
+
+write_objs := $(addsuffix .o, write write_common file_write time fd \
+	string sched stdin buffer_tree check_wav version)
+ifeq ($(NEED_AO_OBJECTS),yes)
+	write_objs += ao_write.o
+endif
+ifeq ($(HAVE_OSS),yes)
+	write_objs += oss_write.o
+endif
+ifeq ($(HAVE_ALSA),yes)
+	write_objs += alsa_write.o
+endif
+
+audioc_objs := $(addsuffix .o, audioc string lsu net fd time version)
+ifeq ($(HAVE_READLINE),yes)
+	audioc_objs += buffer_tree.o interactive.o sched.o
+endif
+
 # sort removes duplicate words, which is all we need here
-all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
+dep_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 	$(audiod_objs) $(audioc_objs) $(mixer_objs) $(server_objs) \
-	$(write_objs) $(afh_objs) $(play_objs))
-deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
-deps += $(addprefix $(dep_dir)/, mp.bison.d mp.flex.d)
+	$(write_objs) $(afh_objs) $(play_objs) mp.bison mp.flex)
+deps := $(addprefix $(dep_dir)/, $(dep_objs:.o=.d))
 
 afh_objs += afh.lsg.o
 audioc_objs += audioc.lsg.o
@@ -267,6 +331,7 @@ write_objs := $(addprefix $(object_dir)/, $(write_objs))
 afh_objs := $(addprefix $(object_dir)/, $(afh_objs))
 play_objs := $(addprefix $(object_dir)/, $(play_objs))
 
+prefixed_executables := $(addprefix para_, $(executables))
 man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
@@ -410,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