X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=ddf85b58d06a1b0b9c87a6d8d1890a8facbf5480;hp=3631a5c9f47569c48d38df3877cea286a12e468b;hb=62c0894fbb589dd45e69b7d9ef1fd152a9960d62;hpb=9d24300965cbcdfddb9f63b6bc8018da50d7d8e1

diff --git a/Makefile.real b/Makefile.real
index 3631a5c9..ddf85b58 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -6,6 +6,8 @@ MAKEFLAGS += -Rr
 ifeq ("$(origin CC)", "default")
         CC := cc
 endif
+.ONESHELL:
+.SHELLFLAGS := -ec
 
 LOGLEVELS := LL_DEBUG,LL_INFO,LL_NOTICE,LL_WARNING,LL_ERROR,LL_CRIT,LL_EMERG
 vardir := /var/paraslash
@@ -18,7 +20,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 := 2017
+COPYRIGHT_YEAR := 2020
 
 ifeq ("$(origin O)", "command line")
 	build_dir := $(O)
@@ -32,12 +34,15 @@ m4depdir := $(build_dir)/m4deps
 lls_suite_dir := $(build_dir)/lls
 lls_m4_dir := m4/lls
 test_dir := t
+yy_src_dir = yy
+yy_build_dir = $(build_dir)/yy
 
 # 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) $(mixer_objs) $(server_objs) \
 	$(write_objs) $(afh_objs) $(play_objs))
 deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
+deps += $(addprefix $(dep_dir)/, mp.bison.d mp.flex.d)
 
 afh_objs += afh.lsg.o
 audioc_objs += audioc.lsg.o
@@ -57,6 +62,12 @@ suites := $(addprefix $(lls_suite_dir)/, $(cmd_suites) $(executables))
 m4_lls_deps := $(addsuffix .m4d, $(suites))
 lsg_h := $(addsuffix .lsg.h, $(suites))
 
+# flex/bison objects and headers are only needed if para_server is built
+ifeq ("$(findstring server, $(executables))", "server")
+	server_objs += mp.flex.o mp.bison.o
+	yy_h := $(yy_build_dir)/mp.bison.h
+endif
+
 # now prefix all objects with object dir
 recv_objs := $(addprefix $(object_dir)/, $(recv_objs))
 filter_objs := $(addprefix $(object_dir)/, $(filter_objs))
@@ -85,13 +96,15 @@ man: $(man_pages)
 
 include $(lls_m4_dir)/makefile
 include $(test_dir)/makefile.test
+include $(yy_src_dir)/makefile
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
 -include $(m4_lls_deps)
 endif
 
-$(object_dir) $(man_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir):
-	$(Q) $(MKDIR_P) $@
+$(object_dir) $(man_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir) \
+	$(yy_build_dir):
+	@$(MKDIR_P) $@
 
 CPPFLAGS += -DBINDIR='"$(bindir)"'
 CPPFLAGS += -DCOPYRIGHT_YEAR='"$(COPYRIGHT_YEAR)"'
@@ -99,8 +112,8 @@ 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$(lls_suite_dir)
+CPPFLAGS += -I$(yy_build_dir)
 CPPFLAGS += $(lopsub_cppflags)
 
 STRICT_CFLAGS += -fno-strict-aliasing
@@ -132,13 +145,14 @@ cc-option = $(shell \
 )
 
 STRICT_CFLAGS += $(call cc-option, -Wformat-signedness)
+STRICT_CFLAGS += $(call cc-option, -Wdiscarded-qualifiers)
 
 # 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")
-	Q :=
+	SAY =
 else
-	Q := @
+	SAY = @echo '$(strip $(1))'
 endif
 
 audiod_commands := $(addprefix $(lls_suite_dir)/, \
@@ -165,9 +179,9 @@ $(man_dir)/para_write.1: all_commands := $(write_commands)
 
 $(man_dir)/para_%.1: $(lls_suite_dir)/%.lsg.man \
 		$(lls_m4_dir)/copyright.m4 | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'LLSMAN $<'
-	$(Q) cat $< $(all_commands) > $@
-	$(Q) $(M4) -D COPYRIGHT_YEAR=$(COPYRIGHT_YEAR) $(lls_m4_dir)/copyright.m4 >> $@
+	$(call SAY, LLSMAN $<)
+	cat $< $(all_commands) > $@
+	$(M4) -D COPYRIGHT_YEAR=$(COPYRIGHT_YEAR) $(lls_m4_dir)/copyright.m4 >> $@
 
 $(object_dir)/%.o: %.c | $(object_dir)
 
@@ -178,7 +192,7 @@ $(object_dir)/spx%.o: CPPFLAGS += $(speex_cppflags)
 $(object_dir)/flac%.o: CPPFLAGS += $(flac_cppflags)
 
 $(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
-$(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
+$(object_dir)/openssl.o: CPPFLAGS += $(openssl_cppflags)
 $(object_dir)/gcrypt.o: CPPFLAGS += $(gcrypt_cppflags)
 $(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
 $(object_dir)/alsa%.o: CPPFLAGS += $(alsa_cppflags)
@@ -234,9 +248,9 @@ $(object_dir)/mm.o \
 
 $(object_dir)/compress_filter.o: CFLAGS += -O3
 
-$(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h)
-	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ -MMD -MF $(dep_dir)/$(*F).d -MT $@ $(CPPFLAGS) \
+$(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h)
+	$(call SAY, CC $<)
+	$(CC) -c -o $@ -MMD -MF $(dep_dir)/$(*F).d -MT $@ $(CPPFLAGS) \
 		$(STRICT_CFLAGS) $(CFLAGS) $<
 
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
@@ -301,24 +315,24 @@ para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags)
 
 $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs)))
 $(prefixed_executables):
-	@[ -z "$(Q)" ] || echo 'LD $@'
-	$(Q) $(CC) $^ -o $@ $(LDFLAGS)
+	$(call SAY, LD $@)
+	$(CC) $^ -o $@ $(LDFLAGS)
 
 mostlyclean:
-	@[ -z "$(Q)" ] || echo 'MOSTLYCLEAN'
-	$(Q) rm -f para_*
-	$(Q) rm -rf $(object_dir)
+	$(call SAY, MOSTLYCLEAN)
+	rm -f para_*
+	rm -rf $(object_dir)
 clean: mostlyclean
-	@[ -z "$(Q)" ] || echo 'CLEAN'
-	$(Q) rm -rf $(build_dir)
+	$(call SAY, CLEAN)
+	rm -rf $(build_dir)
 distclean: clean
-	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
-	$(Q) rm -f Makefile autoscan.log config.status config.log
-	$(Q) rm -f config.h configure config.h.in
+	$(call SAY, DISTCLEAN)
+	rm -f Makefile autoscan.log config.status config.log
+	rm -f config.h configure config.h.in
 maintainer-clean: distclean
-	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-	$(Q) rm -f *.tar.bz2 *.tar.xz
-	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
+	$(call SAY, MAINTAINER-CLEAN)
+	rm -f *.tar.bz2 *.tar.xz
+	rm -f GPATH GRTAGS GSYMS GTAGS
 
 INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
@@ -334,14 +348,15 @@ install install-strip: all man
 	$(MKDIR_P) $(DESTDIR)$(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 
 $(tarball) dist tarball:
-	$(Q) rm -rf $(tarball) $(tarball_pfx)
-	$(Q) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
-		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
-	$(Q) $(MKDIR_P) $(tarball_pfx)
-	$(Q) ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
-	$(Q) cp $(autocrap) $(tarball_pfx)
-	$(Q) tar rf $(tarball_pfx).tar $(tarball_pfx)/*
-	$(Q) xz -9 $(tarball_pfx).tar
-	$(Q) ls -l $(tarball)
-	$(Q) ln -sf $(tarball) paraslash-git.tar.xz
-	$(Q) rm -rf $(tarball_pfx)
+	$(call SAY, DIST)
+	rm -rf $(tarball) $(tarball_pfx)
+	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+	   | tar --delete $(tarball_delete) > $(tarball_pfx).tar
+	$(MKDIR_P) $(tarball_pfx)
+	./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
+	cp $(autocrap) $(tarball_pfx)
+	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
+	xz -9 $(tarball_pfx).tar
+	ls -l $(tarball)
+	ln -sf $(tarball) paraslash-git.tar.xz
+	rm -rf $(tarball_pfx)