X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=6ff5abf02575722e4205e1ef941fa07e2edb972d;hp=9d10e184d74876cc76b655ac2a9a58bcb080a9ad;hb=f5cf47f2bc4bb76d0d21e2467c5846cade38558f;hpb=21c6e0b09b42e61e72b741bd726856ab0bcd1d64

diff --git a/Makefile.real b/Makefile.real
index 9d10e184..6ff5abf0 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -18,7 +18,7 @@ uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
-COPYRIGHT_YEAR := 2016
+COPYRIGHT_YEAR := 2017
 
 ifeq ("$(origin O)", "command line")
 	build_dir := $(O)
@@ -33,6 +33,8 @@ 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
+lls_m4_dir := m4/lls
 m4_ggo_dir := m4/gengetopt
 test_dir := t
 
@@ -43,6 +45,8 @@ all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_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
+
 # now prefix all objects with object dir
 recv_objs := $(addprefix $(object_dir)/, $(recv_objs))
 filter_objs := $(addprefix $(object_dir)/, $(filter_objs))
@@ -68,6 +72,7 @@ all: $(prefixed_executables) $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
 
+include $(lls_m4_dir)/makefile
 include $(m4_ggo_dir)/makefile
 include $(test_dir)/makefile.test
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
@@ -76,7 +81,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 endif
 
 $(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-		$(help2man_dir) $(cmdlist_dir):
+		$(help2man_dir) $(cmdlist_dir) $(lls_suite_dir):
 	$(Q) $(MKDIR_P) $@
 
 # When in doubt, use brute force (Ken Thompson)
@@ -96,6 +101,8 @@ 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)
 
 CFLAGS += -Os
 CFLAGS += -Wuninitialized
@@ -168,7 +175,7 @@ $(cmdlist_dir)/audiod.completion.h \
 
 server_command_lists := $(cmdlist_dir)/server.command_list.man \
 	$(cmdlist_dir)/afs.command_list.man
-audiod_command_lists := $(cmdlist_dir)/audiod.command_list.man
+audiod_command_lists := $(lls_suite_dir)/audiod_cmd.lsg.man
 play_command_lists := $(cmdlist_dir)/play.command_list.man
 
 $(man_dir)/para_server.1: $(server_command_lists)
@@ -179,8 +186,9 @@ $(man_dir)/para_server.1: man_util_command_lists := $(server_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_%.1: $(ggo_dir)/%.ggo man_util.bash \
-		git-version.h | $(man_dir) $(help2man_dir)
+$(man_dir)/para_%.1: $(man_util_command_lists) git-version.h \
+		$(ggo_dir)/%.ggo man_util.bash \
+		| $(man_dir) $(help2man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
 	$(Q) \
 		COMMAND_LISTS="$(man_util_command_lists)" \
@@ -278,6 +286,7 @@ $(dep_dir)/%.d: %.c | $(dep_dir)
 	$(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" > $@
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
@@ -309,6 +318,10 @@ para_fade \
 	$(oss_ldflags) \
 	$(alsa_ldflags)
 
+para_audioc \
+para_audiod \
+: LDFLAGS += $(lopsub_ldflags)
+
 para_server \
 para_filter \
 para_audiod \