server_objs += server_cmd.lsg.o server.lsg.o
write_objs += write_cmd.lsg.o write.lsg.o
-m4_lls_deps := \
- audiod_cmd \
- server_cmd \
- play_cmd \
- recv_cmd \
- filter_cmd \
- write_cmd \
- $(executables)
-m4_lls_deps := $(addprefix $(lls_suite_dir)/, $(addsuffix .m4d, $(m4_lls_deps)))
+cmd_suites := $(addsuffix _cmd, audiod server play recv filter write)
+suites := $(addprefix $(lls_suite_dir)/, $(cmd_suites) $(executables))
+m4_lls_deps := $(addsuffix .m4d, $(suites))
# now prefix all objects with object dir
recv_objs := $(addprefix $(object_dir)/, $(recv_objs))
CPPFLAGS += -I$(lls_suite_dir)
CPPFLAGS += $(lopsub_cppflags)
-CFLAGS += -Os
-CFLAGS += -Wuninitialized
-CFLAGS += -Wchar-subscripts
-CFLAGS += -Werror-implicit-function-declaration
-CFLAGS += -Wmissing-noreturn
-CFLAGS += -Wbad-function-cast
-CFLAGS += -fno-strict-aliasing
-
-STRICT_CFLAGS = $(CFLAGS)
-STRICT_CFLAGS += -g -Wundef -W
+STRICT_CFLAGS += -fno-strict-aliasing
+STRICT_CFLAGS += -g
+STRICT_CFLAGS += -Os
+STRICT_CFLAGS += -Wundef -W -Wuninitialized
+STRICT_CFLAGS += -Wchar-subscripts
+STRICT_CFLAGS += -Werror-implicit-function-declaration
+STRICT_CFLAGS += -Wmissing-noreturn
+STRICT_CFLAGS += -Wbad-function-cast
STRICT_CFLAGS += -Wredundant-decls
STRICT_CFLAGS += -Wno-sign-compare -Wno-unknown-pragmas
-STRICT_CFLAGS += -Wformat -Wformat-security
-STRICT_CFLAGS += -Wmissing-format-attribute
STRICT_CFLAGS += -Wdeclaration-after-statement
+STRICT_CFLAGS += -Wformat -Wformat-security -Wmissing-format-attribute
LDFLAGS += $(clock_gettime_ldflags)
Q := @
endif
-audiod_command_lists := $(addprefix $(lls_suite_dir)/, \
+audiod_commands := $(addprefix $(lls_suite_dir)/, \
$(addsuffix _cmd.lsg.man, audiod recv filter write))
-filter_command_lists := $(lls_suite_dir)/filter_cmd.lsg.man
-play_command_lists := $(lls_suite_dir)/play_cmd.lsg.man
-recv_command_lists := $(lls_suite_dir)/recv_cmd.lsg.man
-server_command_lists := $(lls_suite_dir)/server_cmd.lsg.man
-write_command_lists := $(lls_suite_dir)/write_cmd.lsg.man
-
-$(man_dir)/para_server.1: $(server_command_lists)
-$(man_dir)/para_filter.1: $(filter_command_lists)
-$(man_dir)/para_write.1: $(write_command_lists)
-$(man_dir)/para_audiod.1: $(audiod_command_lists)
-$(man_dir)/para_play.1: $(play_command_lists)
-$(man_dir)/para_recv.1: $(recv_command_lists)
-
-$(man_dir)/para_server.1: man_util_command_lists := $(server_command_lists)
-$(man_dir)/para_filter.1: man_util_command_lists := $(filter_command_lists)
-$(man_dir)/para_write.1: man_util_command_lists := $(write_command_lists)
-$(man_dir)/para_audiod.1: man_util_command_lists := $(audiod_command_lists)
-$(man_dir)/para_play.1: man_util_command_lists := $(play_command_lists)
-$(man_dir)/para_recv.1: man_util_command_lists := $(recv_command_lists)
+filter_commands := $(lls_suite_dir)/filter_cmd.lsg.man
+play_commands := $(lls_suite_dir)/play_cmd.lsg.man
+recv_commands := $(lls_suite_dir)/recv_cmd.lsg.man
+server_commands := $(lls_suite_dir)/server_cmd.lsg.man
+write_commands := $(lls_suite_dir)/write_cmd.lsg.man
+
+$(man_dir)/para_audiod.1: $(audiod_commands)
+$(man_dir)/para_filter.1: $(filter_commands)
+$(man_dir)/para_play.1: $(play_commands)
+$(man_dir)/para_recv.1: $(recv_commands)
+$(man_dir)/para_server.1: $(server_commands)
+$(man_dir)/para_write.1: $(write_commands)
+
+$(man_dir)/para_audiod.1: all_commands := $(audiod_commands)
+$(man_dir)/para_filter.1: all_commands := $(filter_commands)
+$(man_dir)/para_play.1: all_commands := $(play_commands)
+$(man_dir)/para_recv.1: all_commands := $(recv_commands)
+$(man_dir)/para_server.1: all_commands := $(server_commands)
+$(man_dir)/para_write.1: all_commands := $(write_commands)
$(man_dir)/para_%.1: $(lls_suite_dir)/%.lsg.man \
$(lls_m4_dir)/copyright.m4 | $(man_dir)
@[ -z "$(Q)" ] || echo 'LLSMAN $<'
- $(Q) cat $< $(man_util_command_lists) > $@
+ $(Q) cat $< $(all_commands) > $@
$(Q) $(M4) -D COPYRIGHT_YEAR=$(COPYRIGHT_YEAR) $(lls_m4_dir)/copyright.m4 >> $@
$(object_dir)/%.o: %.c | $(object_dir)
$(object_dir)/%.o: %.c | $(object_dir)
@[ -z "$(Q)" ] || echo 'CC $<'
$(Q) $(CC) -c -o $@ -MMD -MF $(dep_dir)/$(*F).d -MT $@ $(CPPFLAGS) \
- $(STRICT_CFLAGS) $<
+ $(STRICT_CFLAGS) $(CFLAGS) $<
# The compiler outputs dependencies either as foo.h or as some_directory/foo.h,
# depending on whether the latter file exists. Since make needs the directory