X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=3755e591404d543c54c72af7015c7317c27b6cea;hp=52058012114c2e47de4c3c23095a0faf013dfa61;hb=3a258056d2137c3a4c10d717c6bb2e92d91ee3e0;hpb=ac4d64b9c2d9967a59fc01f1cf905fc06e891715

diff --git a/Makefile.in b/Makefile.in
index 52058012..3755e591 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,9 +24,14 @@ GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
 m4_ggo_dir := m4/gengetopt
 test_dir := t
-build_dir := build
+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
 
@@ -85,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
@@ -105,7 +102,7 @@ dep: $(deps)
 man: $(man_pages)
 tarball: $(tarball)
 
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir):
+$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir):
 	$(Q) $(MKDIR_P) $@
 
 -include $(m4_ggo_dir)/makefile
@@ -210,14 +207,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@
+deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d))
 
 recv_objs := $(addprefix $(object_dir)/, @recv_objs@)
 filter_objs := $(addprefix $(object_dir)/, @filter_objs@)
@@ -230,12 +233,6 @@ 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)
-
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
 endif
@@ -282,16 +279,17 @@ para_afh: $(afh_objs)
 
 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_dir) $(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