X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=53fa22fe6502001f9fe84ac19d48b79c4d2dc345;hp=bc3bf616451eae0a716ffa2d041fc6341630a7a5;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=3ea3f8fae5150eb1b718c076071c7ca81563365f

diff --git a/Makefile.real b/Makefile.real
index bc3bf616..53fa22fe 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -1,7 +1,15 @@
-VARDIR := /var/paraslash
-MANDIR := $(datarootdir)/man/man1
+# Implicit rules are implemented in make as suffix rules. The following rule
+# empties the suffix list to disable the predefined implicit rules. This
+# increases performance and avoids hard-to-debug behaviour.
+.SUFFIXES:
+MAKEFLAGS += -Rr
+ifeq ("$(origin CC)", "default")
+        CC := cc
+endif
+
+vardir := /var/paraslash
+mandir := $(datarootdir)/man/man1
 STRIP := $(CROSS_COMPILE)strip
-HOSTCC ?= cc
 MKDIR_P := mkdir -p
 prefixed_executables := $(addprefix para_, $(executables))
 
@@ -10,6 +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
 
 ifeq ("$(origin O)", "command line")
 	build_dir := $(O)
@@ -24,7 +33,8 @@ 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
 
@@ -35,6 +45,10 @@ 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
+server_objs += server_cmd.lsg.o
+play_objs += play_cmd.lsg.o
+
 # now prefix all objects with object dir
 recv_objs := $(addprefix $(object_dir)/, $(recv_objs))
 filter_objs := $(addprefix $(object_dir)/, $(filter_objs))
@@ -51,16 +65,16 @@ play_objs := $(addprefix $(object_dir)/, $(play_objs))
 man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
-tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+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)),)
@@ -69,7 +83,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 endif
 
 $(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-		$(help2man_dir) $(hostbin_dir) $(cmdlist_dir):
+		$(help2man_dir) $(cmdlist_dir) $(lls_suite_dir):
 	$(Q) $(MKDIR_P) $@
 
 # When in doubt, use brute force (Ken Thompson)
@@ -81,15 +95,16 @@ $(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 += -DBINDIR='"$(bindir)"'
+CPPFLAGS += -DCOPYRIGHT_YEAR='"$(COPYRIGHT_YEAR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
 CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
-CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
-CPPFLAGS += $(arch_cppflags)
 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
@@ -105,11 +120,13 @@ 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)
 
 ifeq ($(uname_s),Linux)
 	# these cause warnings on *BSD
+	CPPFLAGS += -Wunused-macros
 	STRICT_CFLAGS += -fdata-sections -ffunction-sections
 	STRICT_CFLAGS += -Wstrict-prototypes
 	STRICT_CFLAGS += -Wshadow
@@ -117,6 +134,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")
@@ -131,7 +155,7 @@ $(cmdlist_dir)/%.command_list.h: %.cmd %.c | $(cmdlist_dir)
 $(cmdlist_dir)/%.command_list.man: %.cmd %.c | $(cmdlist_dir)
 	@[ -z "$(Q)" ] || echo 'GEN $@'
 	$(Q) ./command_util.bash man < $< > $@
-$(cmdlist_dir)/%.completion.h: %.cmd %.c | $(cmdlist_dir)
+$(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	< $< > $@
@@ -146,15 +170,14 @@ $(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 \
+$(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
+server_command_lists := $(lls_suite_dir)/server_cmd.lsg.man
+audiod_command_lists := $(lls_suite_dir)/audiod_cmd.lsg.man
+play_command_lists := $(lls_suite_dir)/play_cmd.lsg.man
 
 $(man_dir)/para_server.1: $(server_command_lists)
 $(man_dir)/para_audiod.1: $(audiod_command_lists)
@@ -164,7 +187,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 | $(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)" \
@@ -178,22 +203,32 @@ $(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)
-$(object_dir)/gui%.o $(dep_dir)/gui%.d: CPPFLAGS += $(curses_cppflags)
+$(object_dir)/gui.o $(object_dir)/gui%.o $(dep_dir)/gui%.d \
+: 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)/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)/interactive.o $(dep_dir)/interactive.d \
+: CPPFLAGS += $(readline_cppflags)
+
+$(object_dir)/resample_filter.o $(dep_dir)/resample_filter.d \
+: CPPFLAGS += $(samplerate_cppflags)
+
+$(object_dir)/oss_write.o $(dep_dir)/oss_write.d \
+: CPPFLAGS += $(oss_cppflags)
+
+$(object_dir)/ao_write.o $(dep_dir)/ao_write.d \
+: CPPFLAGS += $(ao_cppflags) $(pthread_cppflags)
 
 $(object_dir)/mp3dec_filter.o $(dep_dir)/mp3dec_filter.d \
 : CPPFLAGS += $(mad_cppflags)
@@ -244,13 +279,20 @@ $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $<
 
-$(dep_dir)/%.d: %.c error2.h | $(dep_dir) $(cmdlist_dir)
+# 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) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
-		$(cmdlist_dir) $(CPPFLAGS) $< > $@
+	$(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)
-para_write para_play para_audiod: LDFLAGS += $(ao_ldflags) $(core_audio_ldflags)
+para_write para_play para_audiod \
+: LDFLAGS += $(ao_ldflags) $(pthread_ldflags) $(core_audio_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
 para_server: LDFLAGS += $(osl_ldflags)
 para_gui: LDFLAGS += $(curses_ldflags)
@@ -258,14 +300,14 @@ para_server \
 para_client \
 para_audiod \
 :LDFLAGS += \
-	$(openssl_ldflags) \
-	$(gcrypt_ldflags)
+	$(crypto_ldflags)
 
 para_audiod \
 para_filter \
 para_play \
 : LDFLAGS += \
 	$(mad_ldflags) \
+	$(faad_ldflags) \
 	$(samplerate_ldflags) \
 	-lm
 
@@ -277,6 +319,12 @@ para_fade \
 	$(oss_ldflags) \
 	$(alsa_ldflags)
 
+para_audioc \
+para_audiod \
+para_play \
+para_server \
+: LDFLAGS += $(lopsub_ldflags)
+
 para_server \
 para_filter \
 para_audiod \
@@ -292,12 +340,13 @@ para_recv \
 	$(flac_ldflags)
 
 para_server \
-para_client \
-para_audioc \
-para_audiod \
+para_play \
+para_afh \
 para_recv \
 : LDFLAGS += \
-	$(socket_ldflags) $(nsl_ldflags)
+	$(mp4v2_ldflags)
+
+para_afh para_recv para_server para_play: LDFLAGS += $(iconv_ldflags)
 
 $(foreach exe,$(executables),$(eval para_$(exe): $$($(exe)_objs)))
 $(prefixed_executables):
@@ -314,20 +363,19 @@ 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 -rf autom4te.cache
+	$(Q) rm -f Makefile autoscan.log config.status config.log
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
-	rm -f *.tar.bz2 config.h configure config.h.in
-	rm -rf web_sync
+	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
+	$(Q) rm -f *.tar.bz2 config.h configure config.h.in
 
 install: all man
-	$(MKDIR_P) $(BINDIR) $(MANDIR)
+	$(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
+		$(prefixed_executables) $(bindir)
+	$(INSTALL) -m 644 $(man_pages) $(mandir)
+	$(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 
 $(tarball):
 	$(Q) rm -rf $(tarball) $(tarball_pfx)
@@ -339,4 +387,5 @@ $(tarball):
 	$(Q) tar rf $(tarball_pfx).tar $(tarball_pfx)/*
 	$(Q) bzip2 -9 $(tarball_pfx).tar
 	$(Q) ls -l $(tarball)
+	$(Q) ln -sf $(tarball) paraslash-git.tar.bz2
 	$(Q) rm -rf $(tarball_pfx)