X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=c229a1f0d995c994f36c2a607350947661f6a616;hp=53fa22fe6502001f9fe84ac19d48b79c4d2dc345;hb=35074cc1a527fd6a275101ba561c65cc13a0fa41;hpb=dbb31185345c74b0fb1f475d17594e94ec30db5c

diff --git a/Makefile.real b/Makefile.real
index 53fa22fe..c229a1f0 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -7,6 +7,7 @@ ifeq ("$(origin CC)", "default")
         CC := cc
 endif
 
+LOGLEVELS := LL_DEBUG,LL_INFO,LL_NOTICE,LL_WARNING,LL_ERROR,LL_CRIT,LL_EMERG
 vardir := /var/paraslash
 mandir := $(datarootdir)/man/man1
 STRIP := $(CROSS_COMPILE)strip
@@ -30,7 +31,6 @@ object_dir := $(build_dir)/objects
 dep_dir := $(build_dir)/deps
 man_dir := $(build_dir)/man/man1
 cmdline_dir := $(build_dir)/cmdline
-cmdlist_dir := $(build_dir)/cmdlist
 m4depdir := $(build_dir)/m4deps
 help2man_dir := $(build_dir)/help2man
 lls_suite_dir := $(build_dir)/lls
@@ -43,11 +43,29 @@ 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)))
-m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, $(executables)))
-
-audiod_objs += audiod_cmd.lsg.o
+converted_executables := audioc client fade play recv write
+unconverted_executables := $(filter-out $(converted_executables), $(executables))
+
+audioc_objs += audioc.lsg.o
+audiod_objs += $(addsuffix _cmd.lsg.o, recv filter audiod write) client.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 write) play.lsg.o
+recv_objs += recv_cmd.lsg.o recv.lsg.o
 server_objs += server_cmd.lsg.o
-play_objs += play_cmd.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)))
 
 # now prefix all objects with object dir
 recv_objs := $(addprefix $(object_dir)/, $(recv_objs))
@@ -80,29 +98,21 @@ 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) $(cmdlist_dir) $(lls_suite_dir):
+		$(help2man_dir) $(lls_suite_dir):
 	$(Q) $(MKDIR_P) $@
 
-# When in doubt, use brute force (Ken Thompson)
-TOUPPER = \
-$(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,\
-$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,\
-$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,\
-$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
-$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
-$(subst z,Z,$1))))))))))))))))))))))))))
-
 CPPFLAGS += -DBINDIR='"$(bindir)"'
 CPPFLAGS += -DCOPYRIGHT_YEAR='"$(COPYRIGHT_YEAR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
+CPPFLAGS += -DLOGLEVELS='$(LOGLEVELS)'
 CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
-CPPFLAGS += -I$(cmdlist_dir)
 CPPFLAGS += -I$(lls_suite_dir)
 CPPFLAGS += $(lopsub_cppflags)
 
@@ -149,45 +159,35 @@ else
 	Q := @
 endif
 
-$(cmdlist_dir)/%.command_list.h: %.cmd %.c | $(cmdlist_dir)
-	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.bash h < $< >$@
-$(cmdlist_dir)/%.command_list.man: %.cmd %.c | $(cmdlist_dir)
-	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.bash man < $< > $@
-$(cmdlist_dir)/%.completion.h: %.cmd | $(cmdlist_dir)
-	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.bash compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
-		$(strip $(call TOUPPER,$(*F)))_COMMANDS	< $< > $@
-
-$(cmdlist_dir)/server.command_list.h \
-$(cmdlist_dir)/server.command_list.man \
-$(cmdlist_dir)/server.completion.h \
-: command.c
-
-$(cmdlist_dir)/afs.command_list.h \
-$(cmdlist_dir)/afs.command_list.man \
-$(cmdlist_dir)/afs.completion.h \
-: afs.c aft.c attribute.c
-
-$(cmdlist_dir)/audiod.command_list.h \
-$(cmdlist_dir)/audiod.command_list.man \
-$(cmdlist_dir)/audiod.completion.h \
-: audiod_command.c
-
-server_command_lists := $(lls_suite_dir)/server_cmd.lsg.man
-audiod_command_lists := $(lls_suite_dir)/audiod_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) \
+		$(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) git-version.h \
+$(man_dir)/para_%.1: $(man_util_command_lists) \
 		$(ggo_dir)/%.ggo man_util.bash \
 		| $(man_dir) $(help2man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
@@ -286,9 +286,7 @@ $(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,\}\.command_list.h\)@ $(cmdlist_dir)/\1@g" \
-		-e "s@ \([a-zA-Z0-9_]\{1,\}.lsg.h\)@ $(lls_suite_dir)/\1@g" \
-		-e "s@ \([a-zA-Z0-9_]\{1,\}\.completion.h\)@ $(cmdlist_dir)/\1@g" > $@
+		-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 \
@@ -321,8 +319,13 @@ para_fade \
 
 para_audioc \
 para_audiod \
+para_client \
+para_fade \
+para_filter \
 para_play \
+para_recv \
 para_server \
+para_write \
 : LDFLAGS += $(lopsub_ldflags)
 
 para_server \