From ad93127ad25e23ad631bac117730252fedca15b1 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 22 Nov 2005 01:37:23 +0000
Subject: touchup output and move .PHONY to the shared Makerules so all subdirs
 get it

---
 Makefile.in | 16 ++--------------
 Makerules   | 11 ++++++++---
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7dd1a3c03..74f1799c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@ include $(top_builddir)Rules.mak
 
 ifeq ($(HAVE_DOT_CONFIG),y)
 
-all: finished
+all: pregen libs
 
 # In this section, we need .config
 -include .config.cmd
@@ -33,11 +33,6 @@ include $(top_srcdir)librt/Makefile.in
 include $(top_srcdir)libutil/Makefile.in
 include $(top_srcdir)libpthread/Makefile.in
 
-finished: pregen libs
-	$(SECHO)
-	$(SECHO) Finally finished compiling ...
-	$(SECHO)
-
 include/bits/uClibc_config.h: .config
 	$(RM) -r include/bits
 	$(INSTALL) -d include/bits
@@ -119,7 +114,7 @@ ifeq ($(UCLIBC_PREGENERATED_LOCALE_DATA),y)
 	$(MAKE) -C $(top_srcdir)extra/locale pregen
 endif
 
-install: install_runtime install_dev finished2
+install: install_runtime install_dev
 
 
 RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
@@ -262,11 +257,6 @@ utils:
 install_utils: utils
 	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils install
 
-finished2:
-	$(SECHO)
-	$(SECHO) Finished installing ...
-	$(SECHO)
-
 else # ifeq ($(HAVE_DOT_CONFIG),y)
 
 all: menuconfig
@@ -363,5 +353,3 @@ dist release:
 
 check:
 	$(MAKE) -C test
-
-.PHONY: dummy subdirs release dist distclean clean config oldconfig menuconfig utils
diff --git a/Makerules b/Makerules
index 281afe7a3..038222b4c 100644
--- a/Makerules
+++ b/Makerules
@@ -58,7 +58,7 @@ pur_disp_compile.c = echo "  "CC $(show_objs)
 pur_disp_compile.S = echo "  "AS $(show_objs)
 pur_disp_compile.m = $(pur_disp_compile.c)
 pur_disp_compile-m = echo "  "CC-m $(show_objs)
-pur_disp_strip     = echo "  "STRIP $(STRIP_FLAGS) $@:*
+pur_disp_strip     = echo "  "STRIP $(STRIP_FLAGS) $@
 pur_disp_ar        = echo "  "AR $(ARFLAGS) $@
 pur_disp_ld        = echo "  "LD $(1)
 
@@ -141,13 +141,13 @@ endif
 $(top_builddir)lib/$(CRT).o: $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(CRT).S
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(compile.S) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
-	@$(disp_strip) $(show_objs)
+	@$(disp_strip)
 	$(Q)$(STRIPTOOL) -x -R .note -R .comment $@
 
 $(top_builddir)lib/S$(CRT).o: $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(CRT).S
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(compile.S) $(PIEFLAG) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
-	@$(disp_strip) $(show_objs)
+	@$(disp_strip)
 	$(Q)$(STRIPTOOL) -x -R .note -R .comment $@
 
 CTOR_TARGETS=$(top_builddir)lib/crti.o $(top_builddir)lib/crtn.o
@@ -178,3 +178,8 @@ clean: objclean-y headers_clean-y
 
 objclean-y: $(objclean-y)
 headers_clean-y: $(headers_clean-y)
+
+.PHONY: \
+	all check clean distclean test \
+	config dist menuconfig oldconfig release \
+	subdirs utils
-- 
cgit v1.2.3