X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=53607d62dccd4c0e2179ee1a93fef8cce64263dc;hp=2dec9847f1ba02abc4c13e7f267ddf7f5822e077;hb=9b45b4b85558f012621fc97af31cd2ad6ad08383;hpb=4adde8dae3317fa83b81e7a860c9ed9133e99bb0

diff --git a/Makefile.real b/Makefile.real
index 2dec9847..53607d62 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -43,17 +43,21 @@ all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 	$(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
 	$(write_objs) $(afh_objs) $(play_objs))
 deps := $(addprefix $(dep_dir)/, $(filter-out %.cmdline.d, $(all_objs:.o=.d)))
-converted_executables := audioc client fade play
+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) client.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
-play_objs += $(addsuffix _cmd.lsg.o, recv filter play) play.lsg.o
-recv_objs += recv_cmd.lsg.o
-server_objs += server_cmd.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 := \
@@ -62,6 +66,7 @@ m4_lls_deps := \
 	play_cmd \
 	recv_cmd \
 	filter_cmd \
+	write_cmd \
 	$(converted_executables)
 m4_lls_deps := $(addprefix $(lls_suite_dir)/, $(addsuffix .m4d, $(m4_lls_deps)))
 
@@ -158,20 +163,23 @@ else
 endif
 
 audiod_command_lists := $(addprefix $(lls_suite_dir)/, \
-	$(addsuffix _cmd.lsg.man, audiod recv filter))
+	$(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)
@@ -182,22 +190,6 @@ $(man_dir)/para_%.1: $(lls_suite_dir)/%.lsg.man $(man_util_command_lists) \
 	$(Q) cat $< $(man_util_command_lists) > $@
 	$(Q) $(M4) -D COPYRIGHT_YEAR=$(COPYRIGHT_YEAR) $(lls_m4_dir)/copyright.m4 >> $@
 
-$(man_dir)/para_%.1: $(man_util_command_lists) \
-		$(ggo_dir)/%.ggo man_util.bash \
-		| $(man_dir) $(help2man_dir)
-	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) \
-		COMMAND_LISTS="$(man_util_command_lists)" \
-		FILTERS="$(filters)" \
-		GENGETOPT=$(GENGETOPT) \
-		GGO_DIR=$(ggo_dir) \
-		HELP2MAN=$(HELP2MAN) \
-		HELP2MAN_DIR=$(help2man_dir) \
-		RECEIVERS="$(receivers)" \
-		VERSION="$(GIT_VERSION)" \
-		WRITERS="$(writers)" \
-		./man_util.bash $@
-
 $(object_dir)/%.o: %.c | $(object_dir)
 
 $(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags)
@@ -312,14 +304,17 @@ para_fade \
 	$(oss_ldflags) \
 	$(alsa_ldflags)
 
+para_afh \
 para_audioc \
 para_audiod \
 para_client \
 para_fade \
 para_filter \
+para_gui \
 para_play \
 para_recv \
 para_server \
+para_write \
 : LDFLAGS += $(lopsub_ldflags)
 
 para_server \