X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=bc05c75d1472645f26792715b842f1ad95bbcab2;hp=2d381ad328a2cc777e9e49b8c7e03f1f05760c30;hb=6ada557fe7963d41fbcfe1dd12b320fcd1a0c36c;hpb=fc8dfbb416ff07cca08fbf4e13efcaa25e17cc54

diff --git a/Makefile.real b/Makefile.real
index 2d381ad3..bc05c75d 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -26,34 +26,41 @@ ifeq ("$(origin O)", "command line")
 else
 	build_dir := build
 endif
-ggo_dir := $(build_dir)/ggo
 object_dir := $(build_dir)/objects
 dep_dir := $(build_dir)/deps
 man_dir := $(build_dir)/man/man1
-cmdline_dir := $(build_dir)/cmdline
 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
 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
-unconverted_executables := $(filter-out $(converted_executables), $(executables))
+deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
 
+afh_objs += afh.lsg.o
 audioc_objs += audioc.lsg.o
-audiod_objs += audiod_cmd.lsg.o recv_cmd.lsg.o
-server_objs += server_cmd.lsg.o
-play_objs += play_cmd.lsg.o recv_cmd.lsg.o
-recv_objs += recv_cmd.lsg.o
-
-m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, $(unconverted_executables)))
-m4_lls_deps := audiod_cmd server_cmd play_cmd recv_cmd $(converted_executables)
+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_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)))
 
 # now prefix all objects with object dir
@@ -82,16 +89,13 @@ 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)
--include $(m4_deps)
 -include $(m4_lls_deps)
 endif
 
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-		$(help2man_dir) $(lls_suite_dir):
+$(object_dir) $(man_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir):
 	$(Q) $(MKDIR_P) $@
 
 CPPFLAGS += -DBINDIR='"$(bindir)"'
@@ -101,7 +105,6 @@ CPPFLAGS += -DLOGLEVELS='$(LOGLEVELS)'
 CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -I/usr/local/include
-CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += -I$(lls_suite_dir)
 CPPFLAGS += $(lopsub_cppflags)
 
@@ -148,45 +151,34 @@ else
 	Q := @
 endif
 
-server_command_lists := $(lls_suite_dir)/server_cmd.lsg.man
-audiod_command_lists := \
-	$(lls_suite_dir)/audiod_cmd.lsg.man \
-	$(lls_suite_dir)/recv_cmd.lsg.man
+audiod_command_lists := $(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)
 
-$(man_dir)/para_%.1: $(lls_suite_dir)/%.lsg.man $(man_util_command_lists) \
+$(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) $(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)
@@ -252,25 +244,19 @@ $(object_dir)/send_common.o $(dep_dir)/send_common.d \
 $(object_dir)/mm.o $(dep_dir)/mm.d \
 : CPPFLAGS += $(osl_cppflags)
 
-$(object_dir)/%.cmdline.o: CFLAGS += -Wno-unused-function
 $(object_dir)/compress_filter.o: CFLAGS += -O3
 
 $(object_dir)/%.o: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(STRICT_CFLAGS) $<
 
-$(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(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
 # part we prefix the dependency as appropriate.
 $(dep_dir)/%.d: %.c | $(dep_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
 	$(Q) $(CC) $(CPPFLAGS) -MM -MG -MP -MT $@ -MT $(object_dir)/$(*F).o $< \
-		| sed -e "s@ \([a-zA-Z0-9_]\{1,\}\.cmdline.h\)@ $(cmdline_dir)/\1@g" \
-		-e "s@ \([a-zA-Z0-9_]\{1,\}.lsg.h\)@ $(lls_suite_dir)/\1@g" > $@
+		| sed -e "s@ \([a-zA-Z0-9_]\{1,\}.lsg.h\)@ $(lls_suite_dir)/\1@g" > $@
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod \
@@ -301,11 +287,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 \