Merge topic branch t/openssl-3 into next

[paraslash.git] / Makefile.real

diff --git a/Makefile.real b/Makefile.real
index 117d72fa0f5dcfcdce4b5a1a7d8e61885605a8b4..21d5fc03477145f087be31a319838d636d3df2b2 100644 (file)
--- a/Makefile.real
+++ b/Makefile.real
@@ -287,11 +287,10 @@ ifeq ($(HAVE_READLINE),yes)
 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
@@ -476,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