X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=5df27bad934a58f04b4b6407e868e8898ded4002;hp=6a161e9e6252aedf8cc80221734f2eb63c2d16a0;hb=ac1f19d550a81c8408c8fce2e237996c950253ab;hpb=e43ca5dad846ed131404677a8ef9955ff5f55aff diff --git a/Makefile.real b/Makefile.real index 6a161e9e..5df27bad 100644 --- a/Makefile.real +++ b/Makefile.real @@ -10,7 +10,6 @@ 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 MKDIR_P := mkdir -p prefixed_executables := $(addprefix para_, $(executables)) @@ -19,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 := 2017 +COPYRIGHT_YEAR := 2019 ifeq ("$(origin O)", "command line") build_dir := $(O) @@ -33,19 +32,22 @@ 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) $(fade_objs) $(server_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 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 +mixer_objs += mixer.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 @@ -53,15 +55,16 @@ 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))) +cmd_suites := $(addsuffix _cmd, audiod server play recv filter write) +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)) @@ -70,7 +73,7 @@ client_objs := $(addprefix $(object_dir)/, $(client_objs)) gui_objs := $(addprefix $(object_dir)/, $(gui_objs)) audiod_objs := $(addprefix $(object_dir)/, $(audiod_objs)) audioc_objs := $(addprefix $(object_dir)/, $(audioc_objs)) -fade_objs := $(addprefix $(object_dir)/, $(fade_objs)) +mixer_objs := $(addprefix $(object_dir)/, $(mixer_objs)) server_objs := $(addprefix $(object_dir)/, $(server_objs)) write_objs := $(addprefix $(object_dir)/, $(write_objs)) afh_objs := $(addprefix $(object_dir)/, $(afh_objs)) @@ -81,21 +84,24 @@ man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables)) autocrap := config.h.in configure tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION) tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore) -tarball := $(tarball_pfx).tar.bz2 +tarball := $(tarball_pfx).tar.xz -.PHONY: all clean clean2 distclean maintainer-clean install man tarball all: $(prefixed_executables) $(man_pages) +.PHONY: all mostlyclean clean distclean maintainer-clean install \ + install-strip man dist tarball + man: $(man_pages) -tarball: $(tarball) 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): +$(object_dir) $(man_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir) \ + $(yy_build_dir): $(Q) $(MKDIR_P) $@ CPPFLAGS += -DBINDIR='"$(bindir)"' @@ -104,27 +110,22 @@ 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) -CFLAGS += -Os -CFLAGS += -Wuninitialized -CFLAGS += -Wchar-subscripts -CFLAGS += -Werror-implicit-function-declaration -CFLAGS += -Wmissing-noreturn -CFLAGS += -Wbad-function-cast -CFLAGS += -fno-strict-aliasing - -STRICT_CFLAGS = $(CFLAGS) -STRICT_CFLAGS += -g -Wundef -W +STRICT_CFLAGS += -fno-strict-aliasing +STRICT_CFLAGS += -g +STRICT_CFLAGS += -Os +STRICT_CFLAGS += -Wundef -W -Wuninitialized +STRICT_CFLAGS += -Wchar-subscripts +STRICT_CFLAGS += -Werror-implicit-function-declaration +STRICT_CFLAGS += -Wmissing-noreturn +STRICT_CFLAGS += -Wbad-function-cast 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) +STRICT_CFLAGS += -Wformat -Wformat-security -Wmissing-format-attribute ifeq ($(uname_s),Linux) # these cause warnings on *BSD @@ -142,6 +143,7 @@ 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 @@ -151,116 +153,107 @@ else Q := @ endif -audiod_command_lists := $(addprefix $(lls_suite_dir)/, \ +audiod_commands := $(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) \ +filter_commands := $(lls_suite_dir)/filter_cmd.lsg.man +play_commands := $(lls_suite_dir)/play_cmd.lsg.man +recv_commands := $(lls_suite_dir)/recv_cmd.lsg.man +server_commands := $(lls_suite_dir)/server_cmd.lsg.man +write_commands := $(lls_suite_dir)/write_cmd.lsg.man + +$(man_dir)/para_audiod.1: $(audiod_commands) +$(man_dir)/para_filter.1: $(filter_commands) +$(man_dir)/para_play.1: $(play_commands) +$(man_dir)/para_recv.1: $(recv_commands) +$(man_dir)/para_server.1: $(server_commands) +$(man_dir)/para_write.1: $(write_commands) + +$(man_dir)/para_audiod.1: all_commands := $(audiod_commands) +$(man_dir)/para_filter.1: all_commands := $(filter_commands) +$(man_dir)/para_play.1: all_commands := $(play_commands) +$(man_dir)/para_recv.1: all_commands := $(recv_commands) +$(man_dir)/para_server.1: all_commands := $(server_commands) +$(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 $< $(man_util_command_lists) > $@ + $(Q) cat $< $(all_commands) > $@ $(Q) $(M4) -D COPYRIGHT_YEAR=$(COPYRIGHT_YEAR) $(lls_m4_dir)/copyright.m4 >> $@ $(object_dir)/%.o: %.c | $(object_dir) -$(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags) -$(object_dir)/gui.o $(object_dir)/gui%.o $(dep_dir)/gui%.d \ +$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags) +$(object_dir)/gui.o $(object_dir)/gui%.o \ : CPPFLAGS += $(curses_cppflags) -$(object_dir)/spx%.o $(dep_dir)/spx%.d: CPPFLAGS += $(speex_cppflags) -$(object_dir)/flac%.o $(dep_dir)/flac%.d: CPPFLAGS += $(flac_cppflags) +$(object_dir)/spx%.o: CPPFLAGS += $(speex_cppflags) +$(object_dir)/flac%.o: CPPFLAGS += $(flac_cppflags) -$(object_dir)/mp3_afh.o $(dep_dir)/mp3_afh.d: CPPFLAGS += $(id3tag_cppflags) -$(object_dir)/crypt.o $(dep_dir)/crypt.d: CPPFLAGS += $(openssl_cppflags) -$(object_dir)/gcrypt.o $(dep_dir)/gcrypt.d: CPPFLAGS += $(gcrypt_cppflags) -$(object_dir)/ao_write.o $(dep_dir)/ao_write.d: CPPFLAGS += $(ao_cppflags) -$(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d: CPPFLAGS += $(mp4v2_cppflags) -$(object_dir)/alsa%.o $(dep_dir)/alsa%.d: CPPFLAGS += $(alsa_cppflags) +$(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_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) -$(object_dir)/interactive.o $(dep_dir)/interactive.d \ +$(object_dir)/interactive.o \ : CPPFLAGS += $(readline_cppflags) -$(object_dir)/resample_filter.o $(dep_dir)/resample_filter.d \ +$(object_dir)/resample_filter.o \ : CPPFLAGS += $(samplerate_cppflags) -$(object_dir)/oss_write.o $(dep_dir)/oss_write.d \ +$(object_dir)/oss_write.o \ : CPPFLAGS += $(oss_cppflags) -$(object_dir)/ao_write.o $(dep_dir)/ao_write.d \ +$(object_dir)/ao_write.o \ : CPPFLAGS += $(ao_cppflags) $(pthread_cppflags) -$(object_dir)/mp3dec_filter.o $(dep_dir)/mp3dec_filter.d \ +$(object_dir)/mp3dec_filter.o \ : CPPFLAGS += $(mad_cppflags) -$(object_dir)/aacdec_filter.o $(dep_dir)/aacdec_filter.d \ -$(object_dir)/aac_common.o $(dep_dir)/aac_common.d \ -$(object_dir)/aac_afh.o $(dep_dir)/aac_afh.d \ +$(object_dir)/aacdec_filter.o \ +$(object_dir)/aac_afh.o \ : CPPFLAGS += $(faad_cppflags) -$(object_dir)/ogg_afh.o $(dep_dir)/ogg_afh.d \ -$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \ +$(object_dir)/ogg_afh.o \ +$(object_dir)/oggdec_filter.o \ : CPPFLAGS += $(vorbis_cppflags) -$(object_dir)/spx_common.o $(dep_dir)/spx_common.d \ -$(object_dir)/spxdec_filter.o $(dep_dir)/spxdec_filter.d \ -$(object_dir)/spx_afh.o $(dep_dir)/spx_afh.d \ -$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \ -$(object_dir)/ogg_afh.o $(dep_dir)/ogg_afh.d \ -$(object_dir)/ogg_afh_common.o $(dep_dir)/ogg_afh_common.d \ -$(object_dir)/opus%.o $(dep_dir)/opus%.d \ +$(object_dir)/spx_common.o \ +$(object_dir)/spxdec_filter.o \ +$(object_dir)/spx_afh.o \ +$(object_dir)/oggdec_filter.o \ +$(object_dir)/ogg_afh.o \ +$(object_dir)/ogg_afh_common.o \ +$(object_dir)/opus%.o \ : CPPFLAGS += $(ogg_cppflags) -$(object_dir)/afs.o $(dep_dir)/afs.d \ -$(object_dir)/aft.o $(dep_dir)/aft.d \ -$(object_dir)/attribute.o $(dep_dir)/attribute.d \ -$(object_dir)/blob.o $(dep_dir)/blob.d \ -$(object_dir)/mood.o $(dep_dir)/mood.d \ -$(object_dir)/playlist.o $(dep_dir)/playlist.d \ -$(object_dir)/score.o $(dep_dir)/score.d \ -$(object_dir)/server.o $(dep_dir)/server.d \ -$(object_dir)/vss.o $(dep_dir)/vss.d \ -$(object_dir)/command.o $(dep_dir)/command.d \ -$(object_dir)/http_send.o $(dep_dir)/http_send.d \ -$(object_dir)/dccp_send.o $(dep_dir)/dccp_send.d \ -$(object_dir)/udp_send.o $(dep_dir)/udp_send.d \ -$(object_dir)/send_common.o $(dep_dir)/send_common.d \ -$(object_dir)/mm.o $(dep_dir)/mm.d \ +$(object_dir)/afs.o \ +$(object_dir)/aft.o \ +$(object_dir)/attribute.o \ +$(object_dir)/blob.o \ +$(object_dir)/mood.o \ +$(object_dir)/playlist.o \ +$(object_dir)/score.o \ +$(object_dir)/server.o \ +$(object_dir)/vss.o \ +$(object_dir)/command.o \ +$(object_dir)/http_send.o \ +$(object_dir)/dccp_send.o \ +$(object_dir)/udp_send.o \ +$(object_dir)/send_common.o \ +$(object_dir)/mm.o \ : CPPFLAGS += $(osl_cppflags) $(object_dir)/compress_filter.o: CFLAGS += -O3 -$(object_dir)/%.o: %.c | $(object_dir) +$(object_dir)/%.o: %.c | $(object_dir) $(dep_dir) $(lsg_h) $(yy_h) @[ -z "$(Q)" ] || echo 'CC $<' - $(Q) $(CC) -c -o $@ $(CPPFLAGS) $(STRICT_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,\}.lsg.h\)@ $(lls_suite_dir)/\1@g" > $@ + $(Q) $(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) para_write para_play para_audiod \ -: LDFLAGS += $(ao_ldflags) $(pthread_ldflags) $(core_audio_ldflags) +: LDFLAGS += $(ao_ldflags) $(pthread_ldflags) para_client para_audioc para_play : LDFLAGS += $(readline_ldflags) para_server: LDFLAGS += $(osl_ldflags) para_gui: LDFLAGS += $(curses_ldflags) @@ -279,10 +272,12 @@ para_play \ $(samplerate_ldflags) \ -lm +para_mixer: LDFLAGS += -lm + para_write \ para_play \ para_audiod \ -para_fade \ +para_mixer \ : LDFLAGS += \ $(oss_ldflags) \ $(alsa_ldflags) @@ -291,7 +286,7 @@ para_afh \ para_audioc \ para_audiod \ para_client \ -para_fade \ +para_mixer \ para_filter \ para_gui \ para_play \ @@ -314,13 +309,6 @@ para_recv \ $(faad_ldflags) \ $(flac_ldflags) -para_server \ -para_play \ -para_afh \ -para_recv \ -: LDFLAGS += \ - $(mp4v2_ldflags) - para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags) $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs))) @@ -328,31 +316,36 @@ $(prefixed_executables): @[ -z "$(Q)" ] || echo 'LD $@' $(Q) $(CC) $^ -o $@ $(LDFLAGS) -clean: - @[ -z "$(Q)" ] || echo 'CLEAN' +mostlyclean: + @[ -z "$(Q)" ] || echo 'MOSTLYCLEAN' $(Q) rm -f para_* $(Q) rm -rf $(object_dir) - -clean2: clean - @[ -z "$(Q)" ] || echo 'CLEAN2' +clean: mostlyclean + @[ -z "$(Q)" ] || echo 'CLEAN' $(Q) rm -rf $(build_dir) -distclean: clean2 test-clean +distclean: clean @[ -z "$(Q)" ] || echo 'DISTCLEAN' $(Q) rm -f Makefile autoscan.log config.status config.log - $(Q) rm -f GPATH GRTAGS GSYMS GTAGS - + $(Q) rm -f config.h configure config.h.in maintainer-clean: distclean @[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN' - $(Q) rm -f *.tar.bz2 config.h configure config.h.in + $(Q) rm -f *.tar.bz2 *.tar.xz + $(Q) rm -f GPATH GRTAGS GSYMS GTAGS + +INSTALL ?= install +INSTALL_PROGRAM ?= $(INSTALL) +INSTALL_DATA ?= $(INSTALL) -m 644 +ifneq ($(findstring strip, $(MAKECMDGOALS)),) + strip_option := -s +endif -install: all man - $(MKDIR_P) $(bindir) $(mandir) - $(INSTALL) -s --strip-program $(STRIP) -m 755 \ - $(prefixed_executables) $(bindir) - $(INSTALL) -m 644 $(man_pages) $(mandir) - $(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain +install install-strip: all man + $(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir) + $(INSTALL) $(strip_option) $(prefixed_executables) $(DESTDIR)$(bindir) + $(INSTALL_DATA) $(man_pages) $(DESTDIR)$(mandir) + $(MKDIR_P) $(DESTDIR)$(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain -$(tarball): +$(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 @@ -360,7 +353,7 @@ $(tarball): $(Q) ./GIT-VERSION-GEN > $(tarball_pfx)/VERSION $(Q) cp $(autocrap) $(tarball_pfx) $(Q) tar rf $(tarball_pfx).tar $(tarball_pfx)/* - $(Q) bzip2 -9 $(tarball_pfx).tar + $(Q) xz -9 $(tarball_pfx).tar $(Q) ls -l $(tarball) - $(Q) ln -sf $(tarball) paraslash-git.tar.bz2 + $(Q) ln -sf $(tarball) paraslash-git.tar.xz $(Q) rm -rf $(tarball_pfx)