- less verbose make clean

m-labs · Nov 7, 2008 · b74c3aa · b74c3aa
1 parent c281901
commit b74c3aa
Show file tree

Hide file tree

Showing 58 changed files with 207 additions and 209 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -471,14 +471,8 @@ defconfig: extra/config/conf
 	$(Q)./extra/config/conf -d extra/Configs/Config.in \
 		-D extra/Configs/defconfigs/$(ARCH)
 
-clean:
-	$(Q)$(RM) -r lib include/bits
-	$(RM) ldso/*/*.a libpthread/*/*.a libc/*.a libcrypt/*.a libintl/*.a \
-		libm/*.a libnsl/*.a libpthread/*.a libresolv/*.a librt/*.a \
-		libutil/*.a lib/*.a \
-		include/fpu_control.h include/dl-osinfo.h include/hp-timing.h
-	+$(MAKE) -s -C test clean
-	+$(MAKE) -C utils utils_clean
+include_clean:
+	$(Q)$(RM) include/fpu_control.h include/dl-osinfo.h include/hp-timing.h
 	@set -e; \
 	for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
 		$(RM) include/sys/$$i; \
@@ -488,9 +482,14 @@ clean:
 			$(RM) include/sys/$$i; \
 		done; \
 	fi
+
+clean: include_clean
+	$(Q)$(RM) -r lib include/bits
+	@$(MAKE) -C utils utils_clean
+	+$(MAKE) -s -C test clean
 	@$(RM) include/linux include/asm*
-	$(RM) $(top_builddir)extra/scripts/unifdef
-	$(RM) -r $(LOCAL_INSTALL_PATH)
+	$(Q)$(RM) $(top_builddir)extra/scripts/unifdef
+	$(Q)$(RM) -r $(LOCAL_INSTALL_PATH)
 
 distclean: clean
 	-find . \( -name core -o -name \*.orig -o -name \*~ -o -name .\*.dep \) -exec $(RM) {} \;

diff --git a/Makerules b/Makerules
@@ -91,7 +91,7 @@ pur_disp_ln        = echo "  "LN $@
 pur_disp_mkdir     = echo "  "MKDIR $@
 pur_disp_gen       = echo "  "GEN $@
 pur_disp_unifdef   = echo "  "UNIFDEF $@
-pur_disp_rm        = echo "  "CLEAN $($@)
+pur_disp_rm        = echo "  "CLEAN $(@:_clean=)
 
 sil_disp_compile.c = true
 sil_disp_compile.i = true
@@ -129,7 +129,7 @@ ver_disp_ln        =
 ver_disp_mkdir     =
 ver_disp_gen       =
 ver_disp_unifdef   = echo $(cmd_unifdef)
-ver_disp_rm        = echo $(cmd_rm)
+ver_disp_rm        =
 
 disp_compile.c = $($(DISP)_disp_compile.c)
 disp_compile.i = $($(DISP)_disp_compile.i)
@@ -201,10 +201,10 @@ define do_ln
 endef
 
 
-#define RM
-#	@$(disp_rm)
-#	$(RM_COMMAND)
-#endef
+define do_rm
+	@$(disp_rm)
+	$(Q)$(RM)
+endef
 
 compile.c = @$(call maybe_exec,compile.c)
 compile.i =  $(call maybe_exec,compile.i)

diff --git a/Rules.mak b/Rules.mak
@@ -1,6 +1,6 @@
 # Rules.make for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -129,7 +129,7 @@ comma:=,
 space:= #
 
 ifndef CROSS
-CROSS=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
+CROSS=$(strip $(subst ",, $(CROSS_COMPILER_PREFIX)))
 endif
 
 # A nifty macro to make testing gcc features easier

diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -213,6 +213,5 @@ objclean-y += locale_clean
 
 # lmmtolso.c/gen_mmap.c/tst-*.c not used
 locale_clean:
-	$(RM) $(locale_HOBJ) $(locale_SRC) $(locale_OUT)/*.{o,os,txt}
-	$(RM) $(locale_OUT)/{uClibc_locale_data,lt_defines,c8tables,wctables,locale_tables,locale_collate}.h
-	$(RM) $(locale_OUT)/{lmmtolso,gen_mmap,locale.mmap}
+	$(do_rm) $(locale_HOBJ) $(locale_SRC) $(addprefix $(locale_OUT)/*., o os txt) \
+		$(addprefix $(locale_OUT)/,$(addsuffix .h,uClibc_locale_data lt_defines c8tables wctables locale_tables locale_collate) lmmtolso gen_mmap locale.mmap)
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -58,4 +58,4 @@ $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
 	$(do_ar)
 
 $(UCLIBC_LDSO_NAME)_clean:
-	$(RM) $($(UCLIBC_LDSO_NAME)_OUT)/*.{o,os,oS,a} $($(UCLIBC_LDSO_NAME)_OUT)/*/*.{o,os,oS}
+	$(do_rm) $(addprefix $($(UCLIBC_LDSO_NAME)_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*.,$(d)$(e))))
diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -54,4 +54,4 @@ $(top_builddir)lib/libdl.a: $(libdl-a-y)
 	$(do_ar)
 
 libdl_clean:
-	$(RM) $(libdl_OUT)/*.{o,os,a,oS}
+	$(do_rm) $(addprefix $(libdl_OUT)/*., o os oS a)
diff --git a/libc/Makefile.in b/libc/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -97,4 +97,4 @@ $(top_builddir)lib/libc.gdb: $(libc_OUT)/libc_so.a $(LINK_FLAT_CRTS)
 	$(call link-flat.so,$(@:.gdb=),$(UCLIBC_SHARED_FLAT_ID))
 
 libc_clean:
-	$(RM) $(libc_OUT)/*.{o,os,oS,a}
+	$(do_rm) $(addprefix $(libc_OUT)/*., o os oS a)
diff --git a/libc/inet/Makefile.in b/libc/inet/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -61,7 +61,7 @@ INET_OBJ := $(patsubst %.c,$(INET_OUT)/%.o,$(CSRC))
 
 libc-y += $(INET_OBJ)
 
-objclean-y += inet_objclean
+objclean-y += inet_clean
 
-inet_objclean:
-	$(RM) $(INET_OUT)/*.{o,os}
+inet_clean:
+	$(do_rm) $(addprefix $(INET_OUT)/*., o os)
diff --git a/libc/inet/rpc/Makefile.in b/libc/inet/rpc/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -39,7 +39,7 @@ libc-nomulti-$(UCLIBC_HAS_RPC) += $(INET_RPC_OUT)/rpc_thread.o
 
 libc-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OBJ)
 
-objclean-y+=inet_rpc_objclean
+objclean-y+=inet_rpc_clean
 
-inet_rpc_objclean:
-	$(RM) $(INET_RPC_OUT)/*.{o,os,oS}
+inet_rpc_clean:
+	$(do_rm) $(addprefix $(INET_RPC_OUT)/*., o os oS)
diff --git a/libc/misc/assert/Makefile.in b/libc/misc/assert/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -15,7 +15,7 @@ MISC_ASSERT_OBJ := $(MISC_ASSERT_OUT)/__assert.o
 
 libc-y += $(MISC_ASSERT_OBJ)
 
-objclean-y += misc_assert_objclean
+objclean-y += misc_assert_clean
 
-misc_assert_objclean:
-	$(RM) $(MISC_ASSERT_OUT)/*.{o,os}
+misc_assert_clean:
+	$(do_rm) $(addprefix $(MISC_ASSERT_OUT)/*., o os)
diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -32,7 +32,7 @@ MISC_CTYPE_OBJ := $(patsubst %.c,$(MISC_CTYPE_OUT)/%.o,$(CSRC))
 
 libc-y += $(MISC_CTYPE_OBJ)
 
-objclean-y += misc_ctype_objclean
+objclean-y += misc_ctype_clean
 
-misc_ctype_objclean:
-	$(RM) $(MISC_CTYPE_OUT)/*.{o,os}
+misc_ctype_clean:
+	$(do_rm) $(addprefix $(MISC_CTYPE_OUT)/*., o os)
diff --git a/libc/misc/dirent/Makefile.in b/libc/misc/dirent/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -20,7 +20,7 @@ MISC_DIRENT_OBJ := $(patsubst %.c,$(MISC_DIRENT_OUT)/%.o,$(CSRC))
 
 libc-y += $(MISC_DIRENT_OBJ)
 
-objclean-y += misc_dirent_objclean
+objclean-y += misc_dirent_clean
 
-misc_dirent_objclean:
-	$(RM) $(MISC_DIRENT_OUT)/*.{o,os}
+misc_dirent_clean:
+	$(do_rm) $(addprefix $(MISC_DIRENT_OUT)/*., o os)
diff --git a/libc/misc/error/Makefile.in b/libc/misc/error/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -21,7 +21,7 @@ MISC_ERROR_OBJ := $(patsubst %.c,$(MISC_ERROR_OUT)/%.o,$(CSRC))
 
 libc-y += $(MISC_ERROR_OBJ)
 
-objclean-y += misc_error_objclean
+objclean-y += misc_error_clean
 
-misc_error_objclean:
-	$(RM) $(MISC_ERROR_OUT)/*.{o,os}
+misc_error_clean:
+	$(do_rm) $(addprefix $(MISC_ERROR_OUT)/*., o os)
diff --git a/libc/misc/file/Makefile.in b/libc/misc/file/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -18,7 +18,7 @@ libc-y += $(MISC_FILE_OBJ)
 
 libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_FILE_OUT)/lockf64.o
 
-objclean-y += misc_file_objclean
+objclean-y += misc_file_clean
 
-misc_file_objclean:
-	$(RM) $(MISC_FILE_OUT)/*.{o,os,oS}
+misc_file_clean:
+	$(do_rm) $(addprefix $(MISC_FILE_OUT)/*., o os oS)
diff --git a/libc/misc/fnmatch/Makefile.in b/libc/misc/fnmatch/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -19,7 +19,7 @@ MISC_FNMATCH_OBJ := $(patsubst %.c,$(MISC_FNMATCH_OUT)/%.o,$(CSRC))
 
 libc-$(UCLIBC_HAS_FNMATCH) += $(MISC_FNMATCH_OBJ)
 
-objclean-y += misc_fnmatch_objclean
+objclean-y += misc_fnmatch_clean
 
-misc_fnmatch_objclean:
-	$(RM) $(MISC_FNMATCH_OUT)/*.{o,os}
+misc_fnmatch_clean:
+	$(do_rm) $(addprefix $(MISC_FNMATCH_OUT)/*., o os)
diff --git a/libc/misc/ftw/Makefile.in b/libc/misc/ftw/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -18,7 +18,7 @@ MISC_FTW_OBJ := $(patsubst %.c,$(MISC_FTW_OUT)/%.o,$(CSRC))
 
 libc-$(UCLIBC_HAS_FTW) += $(MISC_FTW_OBJ)
 
-objclean-y += misc_ftw_objclean
+objclean-y += misc_ftw_clean
 
-misc_ftw_objclean:
-	$(RM) $(MISC_FTW_OUT)/*.{o,os}
+misc_ftw_clean:
+	$(do_rm) $(addprefix $(MISC_FTW_OUT)/*., o os)
diff --git a/libc/misc/glob/Makefile.in b/libc/misc/glob/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -25,7 +25,7 @@ MISC_GLOB_OBJ := $(patsubst %.c,$(MISC_GLOB_OUT)/%.o,$(CSRC))
 
 libc-$(UCLIBC_HAS_GLOB) += $(MISC_GLOB_OBJ)
 
-objclean-y += misc_glob_objclean
+objclean-y += misc_glob_clean
 
-misc_glob_objclean:
-	$(RM) $(MISC_GLOB_OUT)/*.{o,os}
+misc_glob_clean:
+	$(do_rm) $(addprefix $(MISC_GLOB_OUT)/*., o os)
diff --git a/libc/misc/gnu/Makefile.in b/libc/misc/gnu/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -15,7 +15,7 @@ MISC_GNU_OBJ := $(MISC_GNU_OUT)/obstack.o
 
 libc-y += $(MISC_GNU_OBJ)
 
-objclean-y += misc_gnu_objclean
+objclean-y += misc_gnu_clean
 
-misc_gnu_objclean:
-	$(RM) $(MISC_GNU_OUT)/*.{o,os}
+misc_gnu_clean:
+	$(do_rm) $(addprefix $(MISC_GNU_OUT)/*., o os)
diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -33,7 +33,7 @@ libc-shared-$(UCLIBC_FORMAT_SHARED_FLAT) += \
   $(MISC_INTERNALS_OUT)/shared_flat_add_library.os
 libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o
 
-objclean-y += misc_internals_objclean
+objclean-y += misc_internals_clean
 
-misc_internals_objclean:
-	$(RM) $(MISC_INTERNALS_OUT)/*.{o,os,oS}
+misc_internals_clean:
+	$(do_rm) $(addprefix $(MISC_INTERNALS_OUT)/*., o os oS)
diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -22,7 +22,7 @@ MISC_LOCALE_OBJ := $(patsubst %.c,$(MISC_LOCALE_OUT)/%.o,$(CSRC))
 
 libc-y += $(MISC_LOCALE_OBJ)
 
-objclean-y += misc_locale_objclean
+objclean-y += misc_locale_clean
 
-misc_locale_objclean:
-	$(RM) $(MISC_LOCALE_OUT)/*.{o,os}
+misc_locale_clean:
+	$(do_rm) $(addprefix $(MISC_LOCALE_OUT)/*., o os)