From 3b9483e397c91902a3d7ccc8fbc551ff335ff65c Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue, 4 Dec 2012 16:36:59 +0100
Subject: make 'make tail_build' work again from the toplevel

also:
- tail_build.all
- tail_build.build
- tail_build.check
---
 Makefile.top         | 4 ++--
 Module_tail_build.mk | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.top b/Makefile.top
index a5f73aecf01e..4f445cb63b08 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -29,7 +29,7 @@ endif
 # by the module being mentioned in packimages/prj/build.lst, etc, recursively.
 $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(SRCDIR)/config_host.mk
 	mkdir -p $(dir $@)
-	echo -n "gbuild_modules:= " > $@
+	echo -n "gbuild_modules:= tail_build \\" > $@
 	for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
 	echo >> $@
 	echo -n "dmake_modules:= " >> $@
@@ -49,7 +49,7 @@ $(1): bootstrap fetch
 	cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
 
 $(1).all: bootstrap fetch
-	$$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \
+	$$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules) tail_build), \
 		cd tail_build && unset MAKEFLAGS && \
 		export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)" && \
 	, \
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index e0664bb39765..58eb4f5fb281 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -22,9 +22,9 @@
 # instead of those above.
 
 
-$(eval $(call gb_Module_Module,tail_end))
+$(eval $(call gb_Module_Module,tail_build))
 
-$(eval $(call gb_Module_add_moduledirs,tail_end,\
+$(eval $(call gb_Module_add_moduledirs,tail_build,\
 	accessibility \
 	$(call gb_Helper_optional,AFMS,afms) \
 	animations \
@@ -205,7 +205,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 ))
 
 ifeq ($(MERGELIBS),TRUE)
-$(eval $(call gb_Module_add_targets,tail_end,\
+$(eval $(call gb_Module_add_targets,tail_build,\
 	Library_merged \
 ))
 endif
-- 
cgit v1.2.3