X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=4d1c23239b5787d5ff9d55ed8837d830bab02dda;hp=3463553c15800ae6fd9917ef1e11701a3d038425;hb=d02f88dfc3911262174afe6017e04d70e8557a7a;hpb=2829202e393e4b0095d62739910ae56f04e83326

diff --git a/Makefile.in b/Makefile.in
index 3463553c..4d1c2323 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,6 +12,7 @@ executables := @executables@
 
 GENGETOPT := @gengetopt@
 HELP2MAN := @help2man@
+MKDIR_P := mkdir -p
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -22,11 +23,17 @@ codename := volatile relativity
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 m4_ggo_dir := m4/gengetopt
-ggo_dir := ggo
-object_dir := objects
-man_dir := man/man1
 test_dir := t
-cmdline_dir := cmdline
+ifeq ("$(origin O)", "command line")
+	build_dir := $(O)
+else
+	build_dir := build
+endif
+ggo_dir := $(build_dir)/ggo
+object_dir := $(build_dir)/objects
+dep_dir := $(build_dir)/deps
+man_dir := $(build_dir)/man/man1
+cmdline_dir := $(build_dir)/cmdline
 
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -72,7 +79,7 @@ CPPFLAGS += -I/usr/local/include
 CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
 
-man_pages := $(patsubst %, man/man1/%.1, @executables@)
+man_pages := $(patsubst %, $(man_dir)/%.1, @executables@)
 
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-$(PACKAGE_VERSION)
@@ -83,18 +90,10 @@ tarball := @PACKAGE_TARNAME@-$(PACKAGE_VERSION).tar.bz2
 
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
-ifdef V
-	ifeq ("$(origin V)", "command line")
-		BUILD_VERBOSE = $(V)
-	endif
-endif
-ifndef BUILD_VERBOSE
-	BUILD_VERBOSE = 0
-endif
-ifeq ($(BUILD_VERBOSE),0)
-	Q = @
+ifeq ("$(origin V)", "command line")
+	Q :=
 else
-	Q =
+	Q := @
 endif
 
 .PHONY: dep all clean distclean maintainer-clean install man tarball
@@ -103,6 +102,9 @@ dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir):
+	$(Q) $(MKDIR_P) $@
+
 -include $(m4_ggo_dir)/makefile
 
 # When in doubt, use brute force (Ken Thompson)
@@ -130,25 +132,22 @@ afs_command_list.h afs_command_list.man afs_completion.h: afs.c aft.c attribute.
 audiod_command_list.h audiod_command_list.man audiod_completion.h: audiod_command.c
 
 server_command_lists_man = server_command_list.man afs_command_list.man
-man/man1/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
+$(man_dir)/para_server.1: para_server $(server_command_lists_man) | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
 	$(Q) opts="-h --detailed-help -N `for i in $(server_command_lists_man); do printf "%s\n" "-i $$i"; done`"; \
 	$(HELP2MAN) $$opts ./para_server > $@
 
-man/man1/para_audiod.1: para_audiod audiod_command_list.man | $(man_dir)
+$(man_dir)/para_audiod.1: para_audiod audiod_command_list.man | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
 	$(Q) $(HELP2MAN) -h --detailed-help -N -i audiod_command_list.man ./para_audiod > $@
 
-man/man1/%.1: % | $(man_dir)
+$(man_dir)/para_play.1: para_play play_command_list.man | $(man_dir)
 	@[ -z "$(Q)" ] || echo 'MAN $<'
-	$(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@
+	$(Q) $(HELP2MAN) -h --detailed-help -N -i play_command_list.man ./para_play > $@
 
-$(object_dir):
-	mkdir -p $@
-$(man_dir):
-	mkdir -p $@
-$(ggo_dir):
-	mkdir -p $@
+$(man_dir)/%.1: % | $(man_dir)
+	@[ -z "$(Q)" ] || echo 'MAN $<'
+	$(Q) $(HELP2MAN) -h --detailed-help -N ./$< > $@
 
 $(object_dir)/crypt.o: crypt.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -212,14 +211,20 @@ $(object_dir)/%.o: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
 	$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
-$(object_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c | $(object_dir)
+$(dep_dir)/%.cmdline.d: $(cmdline_dir)/%.cmdline.c | $(dep_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
-	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
+	$(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
+		$(CPPFLAGS) $< > $@
 
-$(object_dir)/%.d: %.c | $(object_dir)
+$(dep_dir)/%.d: %.c | $(dep_dir)
 	@[ -z "$(Q)" ] || echo 'DEP $<'
-	$(Q) ./depend.sh $(object_dir) $(cmdline_dir) $(CPPFLAGS) $< > $@
+	$(Q) ./depend.sh $(dep_dir) $(object_dir) $(cmdline_dir) \
+		$(CPPFLAGS) $< > $@
 
+all_objs := @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))
 
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
@@ -231,12 +236,7 @@ fade_objs := $(addprefix $(object_dir)/, @fade_objs@)
 server_objs := $(addprefix $(object_dir)/, @server_objs@)
 write_objs := $(addprefix $(object_dir)/, @write_objs@)
 afh_objs := $(addprefix $(object_dir)/, @afh_objs@)
-
-all_objs := $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
-	$(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
-	$(write_objs) $(afh_objs)
-
-deps := $(all_objs:.o=.d)
+play_objs := $(addprefix $(object_dir)/, @play_objs@)
 
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
@@ -282,18 +282,23 @@ para_afh: $(afh_objs)
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $(LDFLAGS) -o $@ $(afh_objs) @afh_ldflags@
 
+para_play: $(play_objs)
+	@[ -z "$(Q)" ] || echo 'LD $@'
+	$(Q) $(CC) $(LDFLAGS) -o $@ $(play_objs) @play_ldflags@
+
 clean:
 	@[ -z "$(Q)" ] || echo 'CLEAN'
-	$(Q) rm -f @executables@ $(object_dir)/*.o
+	$(Q) rm -f @executables@
+	$(Q) rm -rf $(object_dir)
 
 clean2: clean
 	@[ -z "$(Q)" ] || echo 'CLEAN2'
-	$(Q) rm -rf man $(object_dir) $(cmdline_dir) $(ggo_dir)
 	$(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
-	$(Q) rm -rf autom4te.cache aclocal.m4
+	$(Q) rm -rf autom4te.cache
 	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
 
 maintainer-clean: distclean
@@ -303,16 +308,16 @@ maintainer-clean: distclean
 	rm -rf web_sync
 
 install: all man
-	mkdir -p $(BINDIR) $(MANDIR)
+	$(MKDIR_P) $(BINDIR) $(MANDIR)
 	$(install_sh) -s -m 755 @executables@ $(BINDIR)
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
-	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
+	$(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 \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
-	mkdir -p $(tarball_pfx)
+	$(MKDIR_P) $(tarball_pfx)
 	./GIT-VERSION-GEN > $(tarball_pfx)/VERSION
 	cp -r $(autocrap) $(tarball_pfx)
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*