-m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, $(executables)))
-
-audiod_objs += audiod_cmd.lsg.o
-server_objs += server_cmd.lsg.o
-play_objs += play_cmd.lsg.o
+converted_executables := audioc client fade play recv write filter gui afh audiod server
+unconverted_executables := $(filter-out $(converted_executables), $(executables))
+
+afh_objs += afh.lsg.o
+audioc_objs += audioc.lsg.o
+audiod_objs += $(addsuffix _cmd.lsg.o, recv filter audiod write) \
+ client.lsg.o audiod.lsg.o
+client_objs += client.lsg.o
+fade_objs += fade.lsg.o
+filter_objs += filter_cmd.lsg.o filter.lsg.o
+gui_objs += gui.lsg.o
+play_objs += $(addsuffix _cmd.lsg.o, recv filter play write) play.lsg.o
+recv_objs += recv_cmd.lsg.o recv.lsg.o
+server_objs += server_cmd.lsg.o server.lsg.o
+write_objs += write_cmd.lsg.o write.lsg.o
+
+m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, $(unconverted_executables)))
+m4_lls_deps := \
+ audiod_cmd \
+ server_cmd \
+ play_cmd \
+ recv_cmd \
+ filter_cmd \
+ write_cmd \
+ $(converted_executables)
+m4_lls_deps := $(addprefix $(lls_suite_dir)/, $(addsuffix .m4d, $(m4_lls_deps)))