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

diff --git a/Makefile.real b/Makefile.real
index ee0bf447..c229a1f0 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -7,10 +7,10 @@ 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
-HOSTCC ?= cc
 MKDIR_P := mkdir -p
 prefixed_executables := $(addprefix para_, $(executables))
 
@@ -19,7 +19,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)
-build_date := $(shell date)
+COPYRIGHT_YEAR := 2017
 
 ifeq ("$(origin O)", "command line")
 	build_dir := $(O)
@@ -31,10 +31,10 @@ 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
-hostbin_dir := $(build_dir)/host/bin
+lls_suite_dir := $(build_dir)/lls
+lls_m4_dir := m4/lls
 m4_ggo_dir := m4/gengetopt
 test_dir := t
 
@@ -43,7 +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)))
+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
+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))
@@ -65,40 +87,34 @@ tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
-.PHONY: dep all clean clean2 distclean maintainer-clean install man tarball
-all: dep $(prefixed_executables) $(man_pages)
-dep: $(deps)
+.PHONY: all clean clean2 distclean maintainer-clean install man tarball
+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)),)
 -include $(deps)
 -include $(m4_deps)
+-include $(m4_lls_deps)
 endif
 
 $(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-		$(help2man_dir) $(hostbin_dir) $(cmdlist_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 += -DMAIN_INPUT_FILE_IS_$(*F)
 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
@@ -114,6 +130,7 @@ STRICT_CFLAGS += -Wredundant-decls
 STRICT_CFLAGS += -Wno-sign-compare -Wno-unknown-pragmas
 STRICT_CFLAGS += -Wformat -Wformat-security
 STRICT_CFLAGS += -Wmissing-format-attribute
+STRICT_CFLAGS += -Wdeclaration-after-statement
 
 LDFLAGS += $(clock_gettime_ldflags)
 
@@ -127,6 +144,13 @@ ifeq ($(uname_s),Linux)
 	LDFLAGS += -Wl,--gc-sections
 endif
 
+cc-option = $(shell \
+	$(CC) $(1) -Werror -c -x c /dev/null -o /dev/null > /dev/null 2>&1 \
+	&& echo "$(1)" \
+)
+
+STRICT_CFLAGS += $(call cc-option, -Wformat-signedness)
+
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
 ifeq ("$(origin V)", "command line")
@@ -135,46 +159,37 @@ 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 := $(cmdlist_dir)/server.command_list.man \
-	$(cmdlist_dir)/afs.command_list.man
-audiod_command_lists := $(cmdlist_dir)/audiod.command_list.man
-play_command_lists := $(cmdlist_dir)/play.command_list.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: $(ggo_dir)/%.ggo man_util.bash | $(man_dir) $(help2man_dir)
+$(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)" \
@@ -188,13 +203,6 @@ $(man_dir)/para_%.1: $(ggo_dir)/%.ggo man_util.bash | $(man_dir) $(help2man_dir)
 		WRITERS="$(writers)" \
 		./man_util.bash $@
 
-$(hostbin_dir)/error2: error2.c | $(hostbin_dir)
-	@[ -z "$(Q)" ] || echo 'HCC $<'
-	$(Q) $(HOSTCC) -o $@ $<
-error2.h: $(hostbin_dir)/error2 config.h
-	@[ -z "$(Q)" ] || echo 'ER2 $<'
-	@echo "$(object_executable_matrix)" | $< > $@
-
 $(object_dir)/%.o: %.c | $(object_dir)
 
 $(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags)
@@ -274,12 +282,11 @@ $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h
 # 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 error2.h | $(dep_dir)
+$(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,\}\.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 \
@@ -310,6 +317,17 @@ para_fade \
 	$(oss_ldflags) \
 	$(alsa_ldflags)
 
+para_audioc \
+para_audiod \
+para_client \
+para_fade \
+para_filter \
+para_play \
+para_recv \
+para_server \
+para_write \
+: LDFLAGS += $(lopsub_ldflags)
+
 para_server \
 para_filter \
 para_audiod \
@@ -331,14 +349,6 @@ para_recv \
 : LDFLAGS += \
 	$(mp4v2_ldflags)
 
-para_server \
-para_client \
-para_audioc \
-para_audiod \
-para_recv \
-: LDFLAGS += \
-	$(socket_ldflags) $(nsl_ldflags)
-
 para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags)
 
 $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs)))
@@ -356,7 +366,7 @@ clean2: clean
 	$(Q) rm -rf $(build_dir)
 distclean: clean2 test-clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
-	$(Q) rm -f Makefile autoscan.log config.status config.log error2.h
+	$(Q) rm -f Makefile autoscan.log config.status config.log
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean