X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=ee0bf447b53eb5ae957d63fb8977a0d7a5a85538;hp=b02a5f44c20b34df0430bf02708754e45fdf065d;hb=de86b880e37b54167ed21198d99156b0acb657d3;hpb=7fb39c9aeb527c03c1e3c33e158f727fb9380eaf

diff --git a/Makefile.real b/Makefile.real
index b02a5f44..ee0bf447 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -1,5 +1,14 @@
-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
@@ -10,9 +19,8 @@ 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)
 
-m4_ggo_dir := m4/gengetopt
-test_dir := t
 ifeq ("$(origin O)", "command line")
 	build_dir := $(O)
 else
@@ -23,15 +31,18 @@ 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
+m4_ggo_dir := m4/gengetopt
+test_dir := t
 
 # 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) \
 	$(write_objs) $(afh_objs) $(play_objs))
-deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
+deps := $(addprefix $(dep_dir)/, $(filter-out %.cmdline.d, $(all_objs:.o=.d)))
 m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, $(executables)))
 
 # now prefix all objects with object dir
@@ -47,68 +58,30 @@ write_objs := $(addprefix $(object_dir)/, $(write_objs))
 afh_objs := $(addprefix $(object_dir)/, $(afh_objs))
 play_objs := $(addprefix $(object_dir)/, $(play_objs))
 
-
-DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
-DEBUG_CPPFLAGS += -Wredundant-decls
-DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas
-DEBUG_CPPFLAGS += -Wformat-security
-DEBUG_CPPFLAGS += -Wmissing-format-attribute
-
-ifeq ($(uname_s),Linux)
-	CPPFLAGS += -fdata-sections -ffunction-sections
-	LDFLAGS += -Wl,--gc-sections
-	CPPFLAGS += -Wstrict-prototypes
-	CPPFLAGS += -Wshadow
-	# causes warnings on *BSD for the feature test macros
-	CPPFLAGS += -Wunused-macros
-endif
-CPPFLAGS += -Os
-CPPFLAGS += -Wuninitialized
-CPPFLAGS += -Wchar-subscripts
-CPPFLAGS += -DBINDIR='"$(BINDIR)"'
-CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
-CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
-CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
-CPPFLAGS += -Werror-implicit-function-declaration
-CPPFLAGS += -Wmissing-noreturn
-CPPFLAGS += -Wbad-function-cast
-CPPFLAGS += -fno-strict-aliasing
-CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
-CPPFLAGS += $(arch_cppflags)
-CPPFLAGS += -I/usr/local/include
-CPPFLAGS += -I$(cmdline_dir)
-CPPFLAGS += $(osl_cppflags)
-
-LDFLAGS += $(clock_gettime_ldflags)
-
 man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
-tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-tarball_delete := $(addprefix $(tarball_pfx)/,\
-	web .changelog_before_cvs .changelog_cvs .gitignore)
+tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
+tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
-# 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 :=
-else
-	Q := @
-endif
-
-.PHONY: dep all clean distclean maintainer-clean install man tarball
+.PHONY: dep all clean clean2 distclean maintainer-clean install man tarball
 all: dep $(prefixed_executables) $(man_pages)
 dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
+include $(m4_ggo_dir)/makefile
+include $(test_dir)/makefile.test
+ifeq ($(findstring clean, $(MAKECMDGOALS)),)
+-include $(deps)
+-include $(m4_deps)
+endif
+
 $(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-		$(help2man_dir) $(hostbin_dir):
+		$(help2man_dir) $(hostbin_dir) $(cmdlist_dir):
 	$(Q) $(MKDIR_P) $@
 
--include $(m4_ggo_dir)/makefile
-
 # When in doubt, use brute force (Ken Thompson)
 TOUPPER = \
 $(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,\
@@ -118,96 +91,199 @@ $(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))))))))))))))))))))))))))
 
-%_command_list.h: %.cmd %.c
+CPPFLAGS += -DBINDIR='"$(bindir)"'
+CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
+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)
+
+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 += -Wredundant-decls
+STRICT_CFLAGS += -Wno-sign-compare -Wno-unknown-pragmas
+STRICT_CFLAGS += -Wformat -Wformat-security
+STRICT_CFLAGS += -Wmissing-format-attribute
+
+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
+	STRICT_CFLAGS += -Wunused -Wall
+	LDFLAGS += -Wl,--gc-sections
+endif
+
+# 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 :=
+else
+	Q := @
+endif
+
+$(cmdlist_dir)/%.command_list.h: %.cmd %.c | $(cmdlist_dir)
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh h < $< >$@
-%_command_list.man: %.cmd %.c
+	$(Q) ./command_util.bash h < $< >$@
+$(cmdlist_dir)/%.command_list.man: %.cmd %.c | $(cmdlist_dir)
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh man < $< > $@
-%_completion.h: %.cmd %.c
+	$(Q) ./command_util.bash man < $< > $@
+$(cmdlist_dir)/%.completion.h: %.cmd | $(cmdlist_dir)
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
+	$(Q) ./command_util.bash compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
 		$(strip $(call TOUPPER,$(*F)))_COMMANDS	< $< > $@
 
-server_command_list.h server_command_list.man server_completion.h: command.c
-afs_command_list.h afs_command_list.man afs_completion.h: afs.c aft.c attribute.c
-audiod_command_list.h audiod_command_list.man audiod_completion.h: audiod_command.c
+$(cmdlist_dir)/server.command_list.h \
+$(cmdlist_dir)/server.command_list.man \
+$(cmdlist_dir)/server.completion.h \
+: command.c
 
-server_command_lists_man = server_command_list.man afs_command_list.man
-$(man_dir)/para_server.1: $(help2man_dir)/para_server $(server_command_lists_man) | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) opts="`for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
-	$(HELP2MAN) $$opts ./$< > $@
+$(cmdlist_dir)/afs.command_list.h \
+$(cmdlist_dir)/afs.command_list.man \
+$(cmdlist_dir)/afs.completion.h \
+: afs.c aft.c attribute.c
 
-$(man_dir)/para_audiod.1: $(help2man_dir)/para_audiod audiod_command_list.man | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -N -i audiod_command_list.man ./$< > $@
+$(cmdlist_dir)/audiod.command_list.h \
+$(cmdlist_dir)/audiod.command_list.man \
+$(cmdlist_dir)/audiod.completion.h \
+: audiod_command.c
 
-$(man_dir)/para_play.1: $(help2man_dir)/para_play play_command_list.man | $(man_dir)
-	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -N -i play_command_list.man ./$< > $@
+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
 
-$(man_dir)/%.1: $(help2man_dir)/% | $(man_dir)
+$(man_dir)/para_server.1: $(server_command_lists)
+$(man_dir)/para_audiod.1: $(audiod_command_lists)
+$(man_dir)/para_play.1: $(play_command_lists)
+
+$(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)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -N ./$< > $@
+	$(Q) \
+		COMMAND_LISTS="$(man_util_command_lists)" \
+		FILTERS="$(filters)" \
+		GENGETOPT=$(GENGETOPT) \
+		GGO_DIR=$(ggo_dir) \
+		HELP2MAN=$(HELP2MAN) \
+		HELP2MAN_DIR=$(help2man_dir) \
+		RECEIVERS="$(receivers)" \
+		VERSION="$(GIT_VERSION)" \
+		WRITERS="$(writers)" \
+		./man_util.bash $@
 
 $(hostbin_dir)/error2: error2.c | $(hostbin_dir)
 	@[ -z "$(Q)" ] || echo 'HCC $<'
 	$(Q) $(HOSTCC) -o $@ $<
-error2.h: $(hostbin_dir)/error2
+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: CPPFLAGS += $(opus_cppflags)
-$(object_dir)/gui%.o: CPPFLAGS += $(curses_cppflags)
-$(object_dir)/spx%.o: CPPFLAGS += $(speex_cppflags)
-$(object_dir)/%.cmdline.o: CPPFLAGS += -Wno-unused-function
-
-$(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
-$(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
-$(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags)
-$(object_dir)/compress_filter.o: CPPFLAGS += -O3
-$(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
-
-$(object_dir)/aacdec_filter.o \
-$(object_dir)/aac_common.o \
-$(object_dir)/aac_afh.o \
+
+$(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_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)
+
+$(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 \
 : CPPFLAGS += $(faad_cppflags)
 
-$(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)/ogg_afh.o $(dep_dir)/ogg_afh.d \
+$(object_dir)/oggdec_filter.o $(dep_dir)/oggdec_filter.d \
+: 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 \
 : 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 \
+: CPPFLAGS += $(osl_cppflags)
+
+$(object_dir)/%.cmdline.o: CFLAGS += -Wno-unused-function
+$(object_dir)/compress_filter.o: CFLAGS += -O3
+
 $(object_dir)/%.o: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(STRICT_CFLAGS) $<
 
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
-
-$(dep_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c error2.h | $(dep_dir)
-	@[ -z "$(Q)" ] || echo 'DEP $<'
-	$(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
-		$(CPPFLAGS) $< > $@
+	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(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 error2.h | $(dep_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
-	$(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
-		$(CPPFLAGS) $< > $@
-
-ifeq ($(findstring clean, $(MAKECMDGOALS)),)
--include $(deps)
--include $(m4_deps)
-endif
+	$(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" > $@
 
 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)
@@ -215,14 +291,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
 
@@ -248,6 +324,13 @@ para_recv \
 	$(faad_ldflags) \
 	$(flac_ldflags)
 
+para_server \
+para_play \
+para_afh \
+para_recv \
+: LDFLAGS += \
+	$(mp4v2_ldflags)
+
 para_server \
 para_client \
 para_audioc \
@@ -256,6 +339,8 @@ 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)))
 $(prefixed_executables):
 	@[ -z "$(Q)" ] || echo 'LD $@'
@@ -263,39 +348,37 @@ $(prefixed_executables):
 
 clean:
 	@[ -z "$(Q)" ] || echo 'CLEAN'
-	$(Q) rm -f $(prefixed_executables)
+	$(Q) rm -f para_*
 	$(Q) rm -rf $(object_dir)
 
 clean2: clean
 	@[ -z "$(Q)" ] || echo 'CLEAN2'
-	$(Q) rm -f *_command_list.* *_completion.h
 	$(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 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):
-	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
-	git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+	$(Q) rm -rf $(tarball) $(tarball_pfx)
+	$(Q) 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 -r $(autocrap) $(tarball_pfx)
-	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
-	bzip2 -9 $(tarball_pfx).tar
-	ls -l $(tarball_pfx).tar.bz2
-	rm -rf $(tarball_pfx)
-include $(test_dir)/makefile.test
+	$(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) bzip2 -9 $(tarball_pfx).tar
+	$(Q) ls -l $(tarball)
+	$(Q) ln -sf $(tarball) paraslash-git.tar.bz2
+	$(Q) rm -rf $(tarball_pfx)