X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile.real;h=ca2bab538cec551e46c5c03a33c9460fba9ebfb3;hb=8587981e8156ca725377792259ed653f112bcb98;hp=e4a35194a8edb3733e496512b786754fdda8e720;hpb=097a683c94cc91e9b0191fa49b8d119d689ca94d;p=paraslash.git

diff --git a/Makefile.real b/Makefile.real
index e4a35194..ca2bab53 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -35,7 +35,6 @@ m4depdir := $(build_dir)/m4deps
 help2man_dir := $(build_dir)/help2man
 lls_suite_dir := $(build_dir)/lls
 lls_m4_dir := m4/lls
-m4_ggo_dir := m4/gengetopt
 test_dir := t
 
 # sort removes duplicate words, which is all we need here
@@ -43,18 +42,20 @@ 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 recv write filter gui
+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_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_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)))
@@ -94,7 +95,6 @@ man: $(man_pages)
 tarball: $(tarball)
 
 include $(lls_m4_dir)/makefile
-include $(m4_ggo_dir)/makefile
 include $(test_dir)/makefile.test
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
@@ -188,22 +188,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)
@@ -318,6 +302,7 @@ para_fade \
 	$(oss_ldflags) \
 	$(alsa_ldflags)
 
+para_afh \
 para_audioc \
 para_audiod \
 para_client \