diff options
58 files changed, 207 insertions, 209 deletions
diff --git a/Makefile.in b/Makefile.in index e453397bc..4969cbfa5 100644 --- 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) {} \; @@ -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) @@ -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 index 54f7a4557..920e0f81c 100644 --- 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 index 88b254c27..b8af95fe3 100644 --- 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 index 41cec858f..3d55e423a 100644 --- 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 index 8928ba381..16768db11 100644 --- 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 index 5bca2b9c5..f905c8e35 100644 --- 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 index 2f1246b20..1d1081b5b 100644 --- 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 index 3c9111e68..22dfeeb12 100644 --- 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 index 1fc768ee3..29b63f3d1 100644 --- 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 index b35efa0b1..e2a48e757 100644 --- 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 index 9facacff0..d0e60a28c 100644 --- 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 index 721fe5ec0..43b639cc5 100644 --- 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 index c31de9cd6..ac9076dd2 100644 --- 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 index 501b9084d..bceab2124 100644 --- 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 index 93367f41b..b7a2afcac 100644 --- 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 index d64a9eed3..c3a98e8cc 100644 --- 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 index 1356745d6..230e6e7a9 100644 --- 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 index 1991d04e3..689bd0bc3 100644 --- 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) diff --git a/libc/misc/mntent/Makefile.in b/libc/misc/mntent/Makefile.in index 958b119b3..36cbe6702 100644 --- a/libc/misc/mntent/Makefile.in +++ b/libc/misc/mntent/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_MNTENT_OBJ := $(MISC_MNTENT_OUT)/mntent.o libc-y += $(MISC_MNTENT_OBJ) -objclean-y += misc_mntent_objclean +objclean-y += misc_mntent_clean -misc_mntent_objclean: - $(RM) $(MISC_MNTENT_OUT)/*.{o,os} +misc_mntent_clean: + $(do_rm) $(addprefix $(MISC_MNTENT_OUT)/*., o os) diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in index 0d7a9e49d..68e17e9ce 100644 --- a/libc/misc/pthread/Makefile.in +++ b/libc/misc/pthread/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. # @@ -11,7 +11,7 @@ MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/unlock.o libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o -objclean-y += misc_pthread_objclean +objclean-y += misc_pthread_clean -misc_pthread_objclean: - $(RM) $(MISC_PTHREAD_OUT)/*.{o,os,oS} +misc_pthread_clean: + $(do_rm) $(addprefix $(MISC_PTHREAD_OUT)/*., o os oS) diff --git a/libc/misc/regex/Makefile.in b/libc/misc/regex/Makefile.in index e9d70c596..4a2e53fa2 100644 --- a/libc/misc/regex/Makefile.in +++ b/libc/misc/regex/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_REGEX_OBJ := $(patsubst %.c,$(MISC_REGEX_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_REGEX) += $(MISC_REGEX_OBJ) -objclean-y += misc_regex_objclean +objclean-y += misc_regex_clean -misc_regex_objclean: - $(RM) $(MISC_REGEX_OUT)/*.{o,os} +misc_regex_clean: + $(do_rm) $(addprefix $(MISC_REGEX_OUT)/*., o os) diff --git a/libc/misc/search/Makefile.in b/libc/misc/search/Makefile.in index 2da1d6e01..495c3cf9e 100644 --- a/libc/misc/search/Makefile.in +++ b/libc/misc/search/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. # @@ -27,7 +27,7 @@ MISC_SEARCH_OBJ := $(patsubst %.c,$(MISC_SEARCH_OUT)/%.o,$(CSRC)) libc-y += $(MISC_SEARCH_OBJ) -objclean-y += misc_search_objclean +objclean-y += misc_search_clean -misc_search_objclean: - $(RM) $(MISC_SEARCH_OUT)/*.{o,os} +misc_search_clean: + $(do_rm) $(addprefix $(MISC_SEARCH_OUT)/*., o os) diff --git a/libc/misc/statfs/Makefile.in b/libc/misc/statfs/Makefile.in index b0a8b84c9..1c4fa839b 100644 --- a/libc/misc/statfs/Makefile.in +++ b/libc/misc/statfs/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. # @@ -23,7 +23,7 @@ libc-y += $(MISC_STATFS_OBJ) libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_STATFS_OUT)/statvfs64.o $(MISC_STATFS_OUT)/fstatvfs64.o -objclean-y += misc_statfs_objclean +objclean-y += misc_statfs_clean -misc_statfs_objclean: - $(RM) $(MISC_STATFS_OUT)/*.{o,os,oS} +misc_statfs_clean: + $(do_rm) $(addprefix $(MISC_STATFS_OUT)/*., o os oS) diff --git a/libc/misc/syslog/Makefile.in b/libc/misc/syslog/Makefile.in index 8355ac0cd..90c18e6c1 100644 --- a/libc/misc/syslog/Makefile.in +++ b/libc/misc/syslog/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. # @@ -17,7 +17,7 @@ ifeq ($(UCLIBC_HAS_SYSLOG),y) libc-y += $(MISC_SYSLOG_OBJ) endif -objclean-y += misc_syslog_objclean +objclean-y += misc_syslog_clean -misc_syslog_objclean: - $(RM) $(MISC_SYSLOG_OUT)/*.{o,os} +misc_syslog_clean: + $(do_rm) $(addprefix $(MISC_SYSLOG_OUT)/*., o os) diff --git a/libc/misc/sysvipc/Makefile.in b/libc/misc/sysvipc/Makefile.in index 6b88ad6f0..c3807c07c 100644 --- a/libc/misc/sysvipc/Makefile.in +++ b/libc/misc/sysvipc/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. # @@ -24,7 +24,7 @@ MISC_SYSVIPC_OBJ := $(patsubst %.c,$(MISC_SYSVIPC_OUT)/%.o,$(CSRC)) libc-y += $(MISC_SYSVIPC_OBJ) -objclean-y += misc_sysvipc_objclean +objclean-y += misc_sysvipc_clean -misc_sysvipc_objclean: - $(RM) $(MISC_SYSVIPC_OUT)/*.{o,os} +misc_sysvipc_clean: + $(do_rm) $(addprefix $(MISC_SYSVIPC_OUT)/*., o os) diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in index 4c4d510b1..41934873a 100644 --- a/libc/misc/time/Makefile.in +++ b/libc/misc/time/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. # @@ -35,7 +35,7 @@ MISC_TIME_OBJ := $(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC)) libc-y += $(MISC_TIME_OBJ) -objclean-y += misc_time_objclean +objclean-y += misc_time_clean -misc_time_objclean: - $(RM) $(MISC_TIME_OUT)/*.{o,os} +misc_time_clean: + $(do_rm) $(addprefix $(MISC_TIME_OUT)/*., o os) diff --git a/libc/misc/ttyent/Makefile.in b/libc/misc/ttyent/Makefile.in index 288a4c09b..d20f7adbc 100644 --- a/libc/misc/ttyent/Makefile.in +++ b/libc/misc/ttyent/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_TTYENT_OBJ := $(patsubst %.c,$(MISC_TTYENT_OUT)/%.o,$(CSRC)) libc-y += $(MISC_TTYENT_OBJ) -objclean-y += misc_ttyent_objclean +objclean-y += misc_ttyent_clean -misc_ttyent_objclean: - $(RM) $(MISC_TTYENT_OUT)/*.{o,os} +misc_ttyent_clean: + $(do_rm) $(addprefix $(MISC_TTYENT_OUT)/*., o os) diff --git a/libc/misc/utmp/Makefile.in b/libc/misc/utmp/Makefile.in index ff175dc64..fcc830692 100644 --- a/libc/misc/utmp/Makefile.in +++ b/libc/misc/utmp/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_UTMP_OBJ := $(patsubst %.c,$(MISC_UTMP_OUT)/%.o,$(CSRC)) libc-y += $(MISC_UTMP_OBJ) -objclean-y += misc_utmp_objclean +objclean-y += misc_utmp_clean -misc_utmp_objclean: - $(RM) $(MISC_UTMP_OUT)/*.{o,os} +misc_utmp_clean: + $(do_rm) $(addprefix $(MISC_UTMP_OUT)/*., o os) diff --git a/libc/misc/wchar/Makefile.in b/libc/misc/wchar/Makefile.in index db01f97cc..e72e31ecc 100644 --- a/libc/misc/wchar/Makefile.in +++ b/libc/misc/wchar/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 @@ MISC_WCHAR_OBJ := $(patsubst %.c,$(MISC_WCHAR_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ) -objclean-y += misc_wchar_objclean +objclean-y += misc_wchar_clean -misc_wchar_objclean: - $(RM) $(MISC_WCHAR_OUT)/*.{o,os} +misc_wchar_clean: + $(do_rm) $(addprefix $(MISC_WCHAR_OUT)/*., o os) diff --git a/libc/misc/wctype/Makefile.in b/libc/misc/wctype/Makefile.in index f4210ebb0..e62c731bd 100644 --- a/libc/misc/wctype/Makefile.in +++ b/libc/misc/wctype/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. # @@ -28,7 +28,7 @@ MISC_WCTYPE_OBJ := $(patsubst %.c,$(MISC_WCTYPE_OUT)/%.o,$(CSRC)) libc-y += $(MISC_WCTYPE_OBJ) -objclean-y += misc_wctype_objclean +objclean-y += misc_wctype_clean -misc_wctype_objclean: - $(RM) $(MISC_WCTYPE_OUT)/*.{o,os} +misc_wctype_clean: + $(do_rm) $(addprefix $(MISC_WCTYPE_OUT)/*., o os) diff --git a/libc/misc/wordexp/Makefile.in b/libc/misc/wordexp/Makefile.in index 526807f25..262f039ed 100644 --- a/libc/misc/wordexp/Makefile.in +++ b/libc/misc/wordexp/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_WORDEXP_OBJ := $(patsubst %.c,$(MISC_WORDEXP_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_WORDEXP) += $(MISC_WORDEXP_OBJ) -objclean-y += misc_wordexp_objclean +objclean-y += misc_wordexp_clean -misc_wordexp_objclean: - $(RM) $(MISC_WORDEXP_OUT)/*.{o,os} +misc_wordexp_clean: + $(do_rm) $(addprefix $(MISC_WORDEXP_OUT)/*., o os) diff --git a/libc/pwd_grp/Makefile.in b/libc/pwd_grp/Makefile.in index f9c7149e7..6805ffebd 100644 --- a/libc/pwd_grp/Makefile.in +++ b/libc/pwd_grp/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 @@ PWDGRP_OBJ := $(patsubst %.c,$(PWDGRP_OUT)/%.o,$(CSRC)) libc-y += $(PWDGRP_OBJ) -objclean-y += pwdgrp_objclean +objclean-y += pwdgrp_clean -pwdgrp_objclean: - $(RM) $(PWDGRP_OUT)/*.{o,os} +pwdgrp_clean: + $(do_rm) $(addprefix $(PWDGRP_OUT)/*., o os) diff --git a/libc/signal/Makefile.in b/libc/signal/Makefile.in index 4451d6622..e930d7ef6 100644 --- a/libc/signal/Makefile.in +++ b/libc/signal/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. # @@ -28,7 +28,7 @@ SIGNAL_OBJ := $(patsubst %.c,$(SIGNAL_OUT)/%.o,$(CSRC)) libc-y += $(SIGNAL_OBJ) -objclean-y += signal_objclean +objclean-y += signal_clean -signal_objclean: - $(RM) $(SIGNAL_OUT)/*.{o,os} +signal_clean: + $(do_rm) $(addprefix $(SIGNAL_OUT)/*., o os) diff --git a/libc/stdio/Makefile.in b/libc/stdio/Makefile.in index 74f6d9aed..b9aecac5f 100644 --- a/libc/stdio/Makefile.in +++ b/libc/stdio/Makefile.in @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org> -# 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. # @@ -101,7 +101,7 @@ ifeq ($(UCLIBC_HAS_WCHAR),y) libc-nomulti-y += $(STDIO_OUT)/vfwprintf.o $(STDIO_OUT)/vfwscanf.o endif -objclean-y += stdio_objclean +objclean-y += stdio_clean -stdio_objclean: - $(RM) $(STDIO_OUT)/*.{o,os,oS} +stdio_clean: + $(do_rm) $(addprefix $(STDIO_OUT)/*., o os oS) diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in index dfef6d18e..75c613c79 100644 --- a/libc/stdlib/Makefile.in +++ b/libc/stdlib/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. # @@ -93,7 +93,7 @@ libc-nonshared-y += $(STDLIB_OUT)/atexit.os libc-nomulti-y += $(STDLIB_OUT)/labs.o $(STDLIB_OUT)/atol.o $(STDLIB_OUT)/_stdlib_strto_l.o $(STDLIB_OUT)/_stdlib_strto_ll.o libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STDLIB_OUT)/_stdlib_strto_l_l.o $(STDLIB_OUT)/_stdlib_strto_ll_l.o -objclean-y += stdlib_objclean +objclean-y += stdlib_clean -stdlib_objclean: - $(RM) $(STDLIB_OUT)/*.{o,os,oS} +stdlib_clean: + $(do_rm) $(addprefix $(STDLIB_OUT)/*., o os oS) diff --git a/libc/stdlib/malloc-simple/Makefile.in b/libc/stdlib/malloc-simple/Makefile.in index 51488ff58..4762d5744 100644 --- a/libc/stdlib/malloc-simple/Makefile.in +++ b/libc/stdlib/malloc-simple/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. # @@ -16,7 +16,7 @@ STDLIB_MALLOC_SIMPLE_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_SIMPLE_OUT)/%.o,$(CSR libc-$(MALLOC_SIMPLE) += $(STDLIB_MALLOC_SIMPLE_OBJ) -objclean-y += stdlib_malloc_simple_objclean +objclean-y += stdlib_malloc_simple_clean -stdlib_malloc_simple_objclean: - $(RM) $(STDLIB_MALLOC_SIMPLE_OUT)/*.{o,os} +stdlib_malloc_simple_clean: + $(do_rm) $(addprefix $(STDLIB_MALLOC_SIMPLE_OUT)/*., o os) diff --git a/libc/stdlib/malloc-standard/Makefile.in b/libc/stdlib/malloc-standard/Makefile.in index 3bbe93e08..32884d10e 100644 --- a/libc/stdlib/malloc-standard/Makefile.in +++ b/libc/stdlib/malloc-standard/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. # @@ -17,7 +17,7 @@ STDLIB_MALLOC_STANDARD_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_STANDARD_OUT)/%.o,$ libc-$(MALLOC_STANDARD) += $(STDLIB_MALLOC_STANDARD_OBJ) -objclean-y += stdlib_malloc_standard_objclean +objclean-y += stdlib_malloc_standard_clean -stdlib_malloc_standard_objclean: - $(RM) $(STDLIB_MALLOC_STANDARD_OUT)/*.{o,os} +stdlib_malloc_standard_clean: + $(do_rm) $(addprefix $(STDLIB_MALLOC_STANDARD_OUT)/*., o os) diff --git a/libc/stdlib/malloc/Makefile.in b/libc/stdlib/malloc/Makefile.in index 73e0d6419..11b250dee 100644 --- a/libc/stdlib/malloc/Makefile.in +++ b/libc/stdlib/malloc/Makefile.in @@ -2,7 +2,7 @@ # # Copyright (C) 2002-2003 NEC Electronics Corporation # Copyright (C) 2002-2003 Miles Bader <miles@gnu.org> -# 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. # @@ -27,10 +27,10 @@ STDLIB_MALLOC_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_OUT)/%.o,$(CSRC)) libc-$(MALLOC) += $(STDLIB_MALLOC_OBJ) -objclean-y += stdlib_malloc_objclean +objclean-y += stdlib_malloc_clean -stdlib_malloc_objclean: - $(RM) $(STDLIB_MALLOC_OUT)/*.{o,os} +stdlib_malloc_clean: + $(do_rm) $(addprefix $(STDLIB_MALLOC_OUT)/*., o os) malloc.o free.o realloc.o memalign.o: malloc.h # Depend on uClinux_config.h to cache changes in __UCLIBC_MALLOC_DEBUGGING__ diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in index 2f14cc0e6..5ea86f02c 100644 --- a/libc/string/Makefile.in +++ b/libc/string/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. # @@ -133,7 +133,7 @@ libc-y += $(STRING_COBJ) libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STRING_OUT)/wcsxfrm_l.o libc-nomulti-y += $(STRING_OUT)/__xpg_strerror_r.o -objclean-y += string_objclean +objclean-y += string_clean -string_objclean: - $(RM) $(STRING_OUT)/{,*/}{,*/}*.{o,os,oS} +string_clean: + $(do_rm) $(addprefix $(STRING_OUT)/,$(addprefix *., o os oS) $(addprefix */*., o os oS)) diff --git a/libc/sysdeps/linux/Makefile.commonarch b/libc/sysdeps/linux/Makefile.commonarch index 7bacc8761..99d8c85bf 100644 --- a/libc/sysdeps/linux/Makefile.commonarch +++ b/libc/sysdeps/linux/Makefile.commonarch @@ -1,6 +1,6 @@ # Makefile template to be included by sysdeps/linux/<ARCH>/Makefile.arch # -# 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. # @@ -24,7 +24,7 @@ CFLAGS-crti.S+=$(PICFLAG) CFLAGS-crtn.S+=$(PICFLAG) arch_objclean: - $(RM) $(ARCH_OUT)/*.{o,os,oS} $(CTOR_TARGETS) $(CRTS) + $(do_rm) $(addprefix $(ARCH_OUT)/*., o os oS) $(CTOR_TARGETS) $(CRTS) ifneq ($(ARCH_HEADERS),) diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 521e561fd..e9fa80271 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/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. # @@ -96,7 +96,7 @@ libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o \ $(COMMON_OUT)/stat.o libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o -objclean-y += common_objclean +objclean-y += common_clean -common_objclean: - $(RM) $(COMMON_OUT)/*.{o,os,oS} +common_clean: + $(do_rm) $(addprefix $(COMMON_OUT)/*., o os oS) diff --git a/libc/termios/Makefile.in b/libc/termios/Makefile.in index 99b1a729f..c77ee60e4 100644 --- a/libc/termios/Makefile.in +++ b/libc/termios/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. # @@ -13,7 +13,7 @@ TERMIOS_OBJ := $(patsubst $(TERMIOS_DIR)/%.c,$(TERMIOS_OUT)/%.o,$(TERMIOS_SRC)) libc-y += $(TERMIOS_OBJ) -objclean-y += termios_objclean +objclean-y += termios_clean -termios_objclean: - $(RM) $(TERMIOS_OUT)/*.{o,os} +termios_clean: + $(do_rm) $(addprefix $(TERMIOS_OUT)/*., o os) diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in index 8095aa641..b447a85e1 100644 --- a/libc/unistd/Makefile.in +++ b/libc/unistd/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. # @@ -42,7 +42,7 @@ UNISTD_OBJ := $(patsubst %.c,$(UNISTD_OUT)/%.o,$(CSRC)) libc-y += $(UNISTD_OBJ) -objclean-y += unistd_objclean +objclean-y += unistd_clean -unistd_objclean: - $(RM) $(UNISTD_OUT)/*.{o,os} +unistd_clean: + $(do_rm) $(addprefix $(UNISTD_OUT)/*., o os) diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index a74e4ec0c..f394c413e 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/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. # @@ -65,4 +65,4 @@ $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y) $(do_ar) libcrypt_clean: - $(RM) $(libcrypt_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(libcrypt_OUT)/*., o os oS a) diff --git a/libintl/Makefile.in b/libintl/Makefile.in index 238ad4466..d4da42c2a 100644 --- a/libintl/Makefile.in +++ b/libintl/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. # @@ -71,4 +71,4 @@ $(libintl_MOBJ:.o=.os): $(libintl_MSRC) $(compile.m) libintl_clean: - $(RM) $(libintl_OUT)/*.{o,os,a} + $(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a) diff --git a/libm/Makefile.in b/libm/Makefile.in index 48d5c4778..9ddd8c8a5 100644 --- a/libm/Makefile.in +++ b/libm/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. # @@ -204,4 +204,4 @@ $(libm_MOBJ2:.o=.os): $(libm_MSRC2) $(compile.m) libm_clean: - $(RM) $(libm_OUT)/{,*/,*/*/}*.{o,os,oS,a} + $(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*.,$(d)$(e)))) diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in index a66b90c6f..7cf64a6fc 100644 --- a/libnsl/Makefile.in +++ b/libnsl/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. # @@ -47,4 +47,4 @@ $(top_builddir)lib/libnsl.a: $(libnsl-a-y) $(do_ar) libnsl_clean: - $(RM) $(libnsl_OUT)/*.{o,os,a} + $(do_rm) $(addprefix $(libnsl_OUT)/*., o os a) diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index aad58170a..d504b9999 100644 --- a/libpthread/linuxthreads.old/Makefile.in +++ b/libpthread/linuxthreads.old/Makefile.in @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> -# 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. # @@ -117,7 +117,7 @@ headers-$(UCLIBC_HAS_THREADS) += $(linuxthreads_headers) objclean-y += libpthread_clean headers_clean-y += linuxthreads_headers_clean linuxthreads_headers_clean: - $(RM) $(addprefix $(top_builddir),$(linuxthreads_headers)) + $(do_rm) $(addprefix $(top_builddir),$(linuxthreads_headers)) libpthread_clean: - $(RM) $(libpthread_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(libpthread_OUT)/*., o os oS a) diff --git a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch index e4cb95b76..bf57e803c 100644 --- a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch +++ b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> -# 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. # @@ -27,4 +27,4 @@ $(libpthread_ARCH_OBJ:.o=.os): %.os : %.c $(compile.c:32media=compact) libpthread_arch_objclean: - $(RM) $(libpthread_ARCH_OUT)/*.{o,os} + $(do_rm) $(addprefix $(libpthread_ARCH_OUT)/*., o os) diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in index 818e1e027..1c89a9f0e 100644 --- a/libpthread/linuxthreads.old_db/Makefile.in +++ b/libpthread/linuxthreads.old_db/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. # @@ -70,7 +70,7 @@ objclean-y += libthread_db_clean headers_clean-y += linuxthreads_db_headers_clean linuxthreads_db_headers_clean: - $(RM) $(top_builddir)include/thread_db.h + $(do_rm) $(top_builddir)include/thread_db.h libthread_db_clean: - $(RM) $(libthread_db_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a) diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index 0529c613c..947dea917 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> -# 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. # @@ -130,7 +130,7 @@ headers-$(UCLIBC_HAS_THREADS) += $(linuxthreads_headers) objclean-y += libpthread_clean headers_clean-y += linuxthreads_headers_clean linuxthreads_headers_clean: - $(RM) $(addprefix $(top_builddir),$(linuxthreads_headers)) + $(do_rm) $(addprefix $(top_builddir),$(linuxthreads_headers)) libpthread_clean: - $(RM) $(libpthread_OUT)/{,*/,*/*/,*/*/*/,*/*/*/*/}*.{o,os,oS,a} + $(do_rm) $(addprefix $(libpthread_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*. */*/*/*.,$(d)$(e)))) diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index 75dcbc7a7..a57cb8461 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/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. # @@ -70,7 +70,7 @@ objclean-y += libthread_db_clean headers_clean-y += linuxthreads_db_headers_clean linuxthreads_db_headers_clean: - $(RM) $(top_builddir)include/thread_db.h + $(do_rm) $(top_builddir)include/thread_db.h libthread_db_clean: - $(RM) $(libthread_db_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a) diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in index cfcb9d78b..f006fe149 100644 --- a/libresolv/Makefile.in +++ b/libresolv/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. # @@ -47,4 +47,4 @@ $(top_builddir)lib/libresolv.a: $(libresolv-a-y) $(do_ar) libresolv_clean: - $(RM) $(libresolv_OUT)/*.{o,os,a} + $(do_rm) $(addprefix $(libresolv_OUT)/*., o os a) diff --git a/librt/Makefile.in b/librt/Makefile.in index 19b779551..29020064e 100644 --- a/librt/Makefile.in +++ b/librt/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. # @@ -50,4 +50,4 @@ $(top_builddir)lib/librt.a: $(librt-a-y) objclean-y += librt_clean librt_clean: - $(RM) $(librt_OUT)/*.{o,os,a} + $(do_rm) $(addprefix $(librt_OUT)/*., o os a) diff --git a/libutil/Makefile.in b/libutil/Makefile.in index ef3169906..67d973859 100644 --- a/libutil/Makefile.in +++ b/libutil/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. # @@ -63,4 +63,4 @@ $(top_builddir)lib/libutil.a: $(libutil-a-y) $(do_ar) libutil_clean: - $(RM) $(libutil_OUT)/*.{o,os,oS,a} + $(do_rm) $(addprefix $(libutil_OUT)/*., o os oS a) diff --git a/utils/Makefile.in b/utils/Makefile.in index bf3221426..37952f5a9 100644 --- a/utils/Makefile.in +++ b/utils/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. # @@ -97,4 +97,4 @@ endif objclean-y += utils_clean utils_clean: - $(RM) $(utils_OUT)/{ldconfig,ldd,readelf,iconv,locale,*.host} + $(do_rm) $(addprefix $(utils_OUT)/, ldconfig ldd readelf iconv locale *.host) |