Merge topic branch t/openssl-3 into next

[paraslash.git] / Makefile.real

diff --git a/Makefile.real b/Makefile.real
index 50b9ee5be6fca5afd4327aadd17dc810dbcbc82a..21d5fc03477145f087be31a319838d636d3df2b2 100644 (file)
--- 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
@@ -265,12 +269,28 @@ 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
@@ -311,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
@@ -454,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