summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-10-18 10:20:59 +0000
committerEric Andersen <andersen@codepoet.org>2003-10-18 10:20:59 +0000
commitdd3fb0f8c1c10fcee804f11a4eed84316c5f694b (patch)
tree916c96c10d0178fa6f1c8d176f2c2d0bf72338b0
parent49f0dd0fcb64746b1ef06e094f2fa8091c23637c (diff)
Peter Kjellerstedt writes:
rm.patch: * Define $(RM) as rm -f in Rules.mak and test/Rules.mak (this is the same definition as gmake uses by default). * Change all occurrences of rm and rm -f into $(RM).
-rw-r--r--Makefile76
-rw-r--r--Rules.mak1
-rw-r--r--extra/Makefile2
-rw-r--r--extra/config/Makefile6
-rw-r--r--extra/gcc-uClibc/Makefile2
-rw-r--r--extra/locale/Makefile10
-rw-r--r--ldso/Makefile4
-rw-r--r--ldso/ldso/Makefile6
-rw-r--r--ldso/libdl/Makefile7
-rw-r--r--ldso/man/Makefile2
-rw-r--r--ldso/util/Makefile2
-rw-r--r--libc/Makefile16
-rw-r--r--libc/inet/Makefile2
-rw-r--r--libc/inet/rpc/Makefile2
-rw-r--r--libc/misc/Makefile2
-rw-r--r--libc/misc/assert/Makefile2
-rw-r--r--libc/misc/ctype/Makefile2
-rw-r--r--libc/misc/dirent/Makefile2
-rw-r--r--libc/misc/error/Makefile2
-rw-r--r--libc/misc/file/Makefile2
-rw-r--r--libc/misc/fnmatch/Makefile2
-rw-r--r--libc/misc/ftw/Makefile2
-rw-r--r--libc/misc/glob/Makefile2
-rw-r--r--libc/misc/gnu/Makefile2
-rw-r--r--libc/misc/internals/Makefile2
-rw-r--r--libc/misc/intl/Makefile2
-rw-r--r--libc/misc/locale/Makefile2
-rw-r--r--libc/misc/mntent/Makefile2
-rw-r--r--libc/misc/pthread/Makefile2
-rw-r--r--libc/misc/regex/Makefile2
-rw-r--r--libc/misc/search/Makefile2
-rw-r--r--libc/misc/statfs/Makefile2
-rw-r--r--libc/misc/syslog/Makefile2
-rw-r--r--libc/misc/sysvipc/Makefile2
-rw-r--r--libc/misc/time/Makefile2
-rw-r--r--libc/misc/ttyent/Makefile2
-rw-r--r--libc/misc/utmp/Makefile2
-rw-r--r--libc/misc/wchar/Makefile2
-rw-r--r--libc/misc/wctype/Makefile2
-rw-r--r--libc/misc/wordexp/Makefile2
-rw-r--r--libc/pwd_grp/Makefile2
-rw-r--r--libc/signal/Makefile2
-rw-r--r--libc/stdio/Makefile2
-rw-r--r--libc/stdlib/Makefile2
-rw-r--r--libc/stdlib/malloc-930716/Makefile2
-rw-r--r--libc/stdlib/malloc/Makefile2
-rw-r--r--libc/string/Makefile2
-rw-r--r--libc/sysdeps/linux/alpha/Makefile4
-rw-r--r--libc/sysdeps/linux/arm/Makefile4
-rw-r--r--libc/sysdeps/linux/common/Makefile2
-rw-r--r--libc/sysdeps/linux/cris/Makefile2
-rw-r--r--libc/sysdeps/linux/e1/Makefile6
-rw-r--r--libc/sysdeps/linux/h8300/Makefile4
-rw-r--r--libc/sysdeps/linux/i386/Makefile4
-rw-r--r--libc/sysdeps/linux/i960/Makefile4
-rw-r--r--libc/sysdeps/linux/m68k/Makefile6
-rw-r--r--libc/sysdeps/linux/microblaze/Makefile4
-rw-r--r--libc/sysdeps/linux/mips/Makefile6
-rw-r--r--libc/sysdeps/linux/powerpc/Makefile4
-rw-r--r--libc/sysdeps/linux/sh/Makefile4
-rw-r--r--libc/sysdeps/linux/sh64/Makefile4
-rw-r--r--libc/sysdeps/linux/sparc/Makefile4
-rw-r--r--libc/sysdeps/linux/v850/Makefile4
-rw-r--r--libc/termios/Makefile2
-rw-r--r--libc/unistd/Makefile2
-rw-r--r--libcrypt/Makefile7
-rw-r--r--libintl/Makefile7
-rw-r--r--libm/Makefile7
-rw-r--r--libm/powerpc/Makefile2
-rw-r--r--libnsl/Makefile7
-rw-r--r--libpthread/Makefile12
-rw-r--r--libpthread/linuxthreads/Makefile2
-rw-r--r--libpthread/linuxthreads_db/Makefile2
-rw-r--r--libresolv/Makefile7
-rw-r--r--libutil/Makefile7
-rw-r--r--test/Makefile2
-rw-r--r--test/Rules.mak2
-rw-r--r--test/args/Makefile2
-rw-r--r--test/assert/Makefile2
-rw-r--r--test/crypt/Makefile2
-rw-r--r--test/ctype/Makefile2
-rw-r--r--test/dlopen/Makefile2
-rw-r--r--test/malloc/Makefile2
-rw-r--r--test/math/Makefile2
-rw-r--r--test/misc/Makefile4
-rw-r--r--test/mmap/Makefile2
-rw-r--r--test/pthread/Makefile2
-rw-r--r--test/pwd_grp/Makefile2
-rw-r--r--test/setjmp/Makefile2
-rw-r--r--test/signal/Makefile2
-rw-r--r--test/silly/Makefile4
-rw-r--r--test/stat/Makefile4
-rw-r--r--test/stdlib/Makefile2
-rw-r--r--test/string/Makefile2
-rw-r--r--test/termios/Makefile2
-rw-r--r--test/unistd/Makefile2
96 files changed, 188 insertions, 194 deletions
diff --git a/Makefile b/Makefile
index f5e345014..d698dd7de 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ include/bits/uClibc_config.h: .config
@if [ ! -x ./extra/config/conf ] ; then \
make -C extra/config conf; \
fi;
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/conf -o extra/Configs/Config.$(TARGET_ARCH)
@@ -198,58 +198,58 @@ install_dev:
tar -chf - include | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX);
ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)
# Remove floating point related headers since float support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/complex.h
- rm $(PREFIX)$(DEVEL_PREFIX)/include/fpu_control.h
- rm $(PREFIX)$(DEVEL_PREFIX)/include/ieee754.h
- rm $(PREFIX)$(DEVEL_PREFIX)/include/math.h
- rm $(PREFIX)$(DEVEL_PREFIX)/include/tgmath.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/complex.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/fpu_control.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/ieee754.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/math.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/tgmath.h
endif
ifneq ($(strip $(UCLIBC_HAS_WCHAR)),y)
# Remove wide char headers since wide char support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/wctype.h
- rm $(PREFIX)$(DEVEL_PREFIX)/include/wchar.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/wctype.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/wchar.h
endif
ifneq ($(strip $(UCLIBC_HAS_LOCALE)),y)
# Remove iconv header since locale support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/iconv.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/iconv.h
endif
ifneq ($(strip $(UCLIBC_HAS_GLIBC_CUSTOM_PRINTF)),y)
# Remove printf header since custom print specifier support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/printf.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/printf.h
endif
ifneq ($(strip $(UCLIBC_HAS_XLOCALE)),y)
# Remove xlocale header since extended locale support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/xlocale.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/xlocale.h
endif
ifneq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
# Remove libintl header since gettext support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/libintl.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/libintl.h
endif
ifneq ($(strip $(UCLIBC_HAS_REGEX)),y)
# Remove regex headers since regex support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/regex.h
- rm $(PREFIX)$(DEVEL_PREFIX)/include/regexp.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/regex.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/regexp.h
endif
ifneq ($(strip $(UCLIBC_HAS_WORDEXP)),y)
# Remove wordexp header since wordexp support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/wordexp.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/wordexp.h
endif
ifneq ($(strip $(UCLIBC_HAS_FTW)),y)
# Remove ftw header since ftw support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/ftw.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/ftw.h
endif
ifneq ($(strip $(UCLIBC_HAS_GLOB)),y)
# Remove glob header since glob support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/glob.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/glob.h
endif
ifneq ($(strip $(UCLIBC_HAS_GNU_GETOPT)),y)
# Remove getopt header since gnu getopt support is disabled.
- rm $(PREFIX)$(DEVEL_PREFIX)/include/getopt.h
+ $(RM) $(PREFIX)$(DEVEL_PREFIX)/include/getopt.h
endif
-@for i in `find $(PREFIX)$(DEVEL_PREFIX) -type d` ; do \
chmod -f 755 $$i; chmod -f 644 $$i/*.h; \
done;
- -find $(PREFIX)$(DEVEL_PREFIX) -name CVS | xargs rm -rf;
+ -find $(PREFIX)$(DEVEL_PREFIX) -name CVS | xargs $(RM) -r;
-chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1.\2/'` $(PREFIX)$(DEVEL_PREFIX)
ifeq ($(strip $(HAVE_SHARED)),y)
-$(INSTALL) -m 644 lib/*.so $(PREFIX)$(DEVEL_PREFIX)/lib/
@@ -388,44 +388,44 @@ buildmconf:
make -C extra/config ncurses mconf
menuconfig: extra/config/mconf
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/mconf extra/Configs/Config.$(TARGET_ARCH)
config: extra/config/conf
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/conf extra/Configs/Config.$(TARGET_ARCH)
oldconfig: extra/config/conf
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/conf -o extra/Configs/Config.$(TARGET_ARCH)
randconfig: extra/config/conf
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/conf -r extra/Configs/Config.$(TARGET_ARCH)
allyesconfig: extra/config/conf
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/conf -y extra/Configs/Config.$(TARGET_ARCH)
allnoconfig: extra/config/conf
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/conf -n extra/Configs/Config.$(TARGET_ARCH)
defconfig: extra/config/conf
- rm -rf include/bits
+ $(RM) -r include/bits
$(INSTALL) -d include/bits
@./extra/config/conf -d extra/Configs/Config.$(TARGET_ARCH)
clean:
- - find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core -o -name .\#\* \) -exec rm -f {} \;
- @rm -rf tmp lib include/bits libc/tmp _install
+ - find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core -o -name .\#\* \) -exec $(RM) {} \;
+ @$(RM) -r tmp lib include/bits libc/tmp _install
$(MAKE) -C test clean
$(MAKE) -C ldso clean
$(MAKE) -C libc/misc/internals clean
@@ -436,36 +436,36 @@ clean:
$(MAKE) -C extra/locale clean
@set -e; \
for i in `(cd $(TOPDIR)/libc/sysdeps/linux/common/sys; ls *.h)` ; do \
- rm -f include/sys/$$i; \
+ $(RM) include/sys/$$i; \
done; \
if [ -d libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
for i in `(cd libc/sysdeps/linux/$(TARGET_ARCH)/sys; ls *.h)` ; do \
- rm -f include/sys/$$i; \
+ $(RM) include/sys/$$i; \
done; \
fi;
- @rm -f include/linux include/scsi include/asm
+ @$(RM) include/linux include/scsi include/asm
@if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then \
$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean; \
fi;
@if [ "$(TARGET_ARCH)" = "mipsel" ]; then \
$(MAKE) -C libc/sysdeps/linux/mips clean; \
- rm -f ldso/ldso/mipsel; \
- rm -f libc/sysdeps/linux/mipsel; \
- rm -f libpthread/linuxthreads/sysdeps/mipsel; \
+ $(RM) ldso/ldso/mipsel; \
+ $(RM) libc/sysdeps/linux/mipsel; \
+ $(RM) libpthread/linuxthreads/sysdeps/mipsel; \
fi;
distclean: clean
- rm -f .config .config.old .config.cmd
+ $(RM) .config .config.old .config.cmd
$(MAKE) -C extra clean
release: distclean
cd ..; \
- rm -rf uClibc-$(VERSION); \
+ $(RM) -r uClibc-$(VERSION); \
cp -fa uClibc uClibc-$(VERSION); \
find uClibc-$(VERSION)/ -type f \
- -name .\#* -exec rm -rf {} \; ; \
+ -name .\#* -exec $(RM) -r {} \; ; \
find uClibc-$(VERSION)/ -type d \
- -name CVS -exec rm -rf {} \; ; \
+ -name CVS -exec $(RM) -r {} \; ; \
\
tar -cvzf uClibc-$(VERSION).tar.gz uClibc-$(VERSION)/;
diff --git a/Rules.mak b/Rules.mak
index a2d6d142c..96ba134e4 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -44,6 +44,7 @@ NM= $(CROSS)nm
STRIPTOOL= $(CROSS)strip
INSTALL= install
+RM= rm -f
# Select the compiler needed to build binaries for your development system
HOSTCC=gcc
diff --git a/extra/Makefile b/extra/Makefile
index 4dd33b5d2..899dda423 100644
--- a/extra/Makefile
+++ b/extra/Makefile
@@ -35,7 +35,7 @@ tags:
ctags -R
clean: subdirs_clean
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS) $(EXTRA_DIRS_TO_CLEAN))
diff --git a/extra/config/Makefile b/extra/config/Makefile
index e56ab7d01..822a483bc 100644
--- a/extra/config/Makefile
+++ b/extra/config/Makefile
@@ -103,9 +103,9 @@ endif
ncurses:
@echo "main() {}" > lxtemp.c
@if $(HOSTCC) lxtemp.c $(LIBS) ; then \
- rm -f lxtemp.c a.out; \
+ $(RM) lxtemp.c a.out; \
else \
- rm -f lxtemp.c; \
+ $(RM) lxtemp.c; \
echo -e "\007" ;\
echo ">> Unable to find the Ncurses libraries." ;\
echo ">>" ;\
@@ -119,6 +119,6 @@ ncurses:
fi
clean:
- rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
+ $(RM) *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
conf mconf zconf.tab.c zconf.tab.h lex.zconf.c lkc_defs.h
diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile
index a37455626..bbe17cc99 100644
--- a/extra/gcc-uClibc/Makefile
+++ b/extra/gcc-uClibc/Makefile
@@ -85,4 +85,4 @@ endif
done
clean:
- rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
+ $(RM) gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
diff --git a/extra/locale/Makefile b/extra/locale/Makefile
index eed345d76..2d8a147e8 100644
--- a/extra/locale/Makefile
+++ b/extra/locale/Makefile
@@ -86,10 +86,10 @@ pregen:
cat uClibc_locale_data.h | awk 'BEGIN{i=1}{ if ( /WANT_/ ) i = /endif/ ; else if (i) print $0 }' > ../../include/bits/uClibc_locale_data.h
clean:
- rm -f *.[oa] *~ core
- rm -f gen_wc8bit gen_wctype gen_locale gen_ldc gen_collate
- rm -f c8tables.h wctables.h locale_tables.h lt_defines.h locale_collate.h
- rm -f gen_mmap locale.mmap lmmtolso
- rm -f locale_data.c uClibc_locale_data.h
+ $(RM) *.[oa] *~ core
+ $(RM) gen_wc8bit gen_wctype gen_locale gen_ldc gen_collate
+ $(RM) c8tables.h wctables.h locale_tables.h lt_defines.h locale_collate.h
+ $(RM) gen_mmap locale.mmap lmmtolso
+ $(RM) locale_data.c uClibc_locale_data.h
.PHONY: pregen links-target
diff --git a/ldso/Makefile b/ldso/Makefile
index dcf83be52..44a4456ca 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -51,5 +51,5 @@ headers:
clean:
set -e ; for d in $(ALL_SUBDIRS) ; do $(MAKE) -C $$d $@ ; done
- -find . -name '*~' | xargs rm -f
- rm -f include/elf.h include/boot1_arch.h include/ld_syscalls.h include/ld_sysdep.h
+ -find . -name '*~' | xargs $(RM)
+ $(RM) include/elf.h include/boot1_arch.h include/ld_syscalls.h include/ld_sysdep.h
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index e026fca85..80dd8c020 100644
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -44,6 +44,7 @@ endif
XXFLAGS+=$(shell $(CC) -print-search-dirs | sed -ne "s/install: *\(.*\)/-I\1include/gp")
LDFLAGS=$(CPU_LDFLAGS-y) -shared --warn-common --export-dynamic --sort-common \
-z combreloc --discard-locals --discard-all
+
CSRC= ldso.c #hash.c readelflib1.c $(TARGET_ARCH)/elfinterp.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
ASRC=$(shell ls $(TARGET_ARCH)/*.S)
@@ -90,6 +91,5 @@ $(AOBJS): %.o : %.S
ldso.o: ldso.c hash.c readelflib1.c $(TARGET_ARCH)/elfinterp.c _dl_progname.h
-clean::
- $(RM) -f $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i _dl_progname.h ldso.h *~
-
+clean:
+ $(RM) $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i _dl_progname.h ldso.h *~
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index a0358feea..3152b3162 100644
--- a/ldso/libdl/Makefile
+++ b/ldso/libdl/Makefile
@@ -61,7 +61,7 @@ ar-target: $(OBJS) $(PIC_OBJS)
$(AR) $(ARFLAGS) $(LIBDL) ../ldso/$(TARGET_ARCH)/resolve.o $(OBJS)
$(AR) $(ARFLAGS) $(LIBDL_PIC) $(PIC_OBJS)
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBDL)
+ $(RM) $(TOPDIR)lib/$(LIBDL)
$(INSTALL) -m 644 $(LIBDL) $(TOPDIR)lib
@@ -81,11 +81,10 @@ shared:
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc;
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION)
+ $(RM) $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib
(cd $(TOPDIR)lib && ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED));
(cd $(TOPDIR)lib && ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED).$(MAJOR_VERSION));
clean:
- $(RM) -f .depend $(LIBDL_SHARED)* $(LIBDL_SHARED_FULLNAME) core *.o *.a *.s *.i tmp_make foo *~
-
+ $(RM) .depend $(LIBDL_SHARED)* $(LIBDL_SHARED_FULLNAME) core *.o *.a *.s *.i tmp_make foo *~
diff --git a/ldso/man/Makefile b/ldso/man/Makefile
index de6aef512..36873ac75 100644
--- a/ldso/man/Makefile
+++ b/ldso/man/Makefile
@@ -30,4 +30,4 @@ ld.so.info: ld.so.texi
makeinfo $<
clean:
- rm -f $(ALL) *~
+ $(RM) $(ALL) *~
diff --git a/ldso/util/Makefile b/ldso/util/Makefile
index 87e69b4ea..06de2df7e 100644
--- a/ldso/util/Makefile
+++ b/ldso/util/Makefile
@@ -95,6 +95,6 @@ ldd.target: ldd.c
$(STRIPTOOL) -x -R .note -R .comment $@
clean:
- rm -f $(TARGETS) *.o *~ core *.target elf.h
+ $(RM) $(TARGETS) *.o *~ core *.target elf.h
readelf.c readsoname.c ldconfig.c ldd.c: headers
diff --git a/libc/Makefile b/libc/Makefile
index d7effaaed..a03d15277 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -54,7 +54,7 @@ all: halfclean subdirs $(LIBNAME) $(DO_SHARED)
ar-target:
$(CROSS)ranlib $(LIBNAME)
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBNAME)
+ $(RM) $(TOPDIR)lib/$(LIBNAME)
$(INSTALL) -m 644 $(LIBNAME) $(TOPDIR)lib
$(LIBNAME): subdirs ar-target
@@ -65,15 +65,15 @@ shared: $(TOPDIR)lib/$(LIBNAME) $(LIBGCC_NEED)
--whole-archive $(LIBGCC_NEED) $(LIBNAME) \
$(TOPDIR)/libc/misc/internals/interp.o --no-whole-archive \
-init __uClibc_init $(LIBGCC)
- @true #rm -rf tmp
+ @true #$(RM) -r tmp
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(SHARED_FULLNAME)
+ $(RM) $(TOPDIR)lib/$(SHARED_FULLNAME)
$(INSTALL) -m 644 $(SHARED_FULLNAME) $(TOPDIR)lib
(cd ../lib && ln -sf $(SHARED_FULLNAME) libc.so);
(cd ../lib && ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME));
$(LIBGCC_NEED): $(TOPDIR)lib/$(LIBNAME)
- @rm -rf tmp
+ @$(RM) -r tmp
@mkdir tmp
$(AR) rv $@
(cd tmp && CC="$(CC)" LD="$(LD)" LDFLAGS="$(CPU_LDFLAGS-y)" \
@@ -81,15 +81,15 @@ $(LIBGCC_NEED): $(TOPDIR)lib/$(LIBNAME)
/bin/sh $(TOPDIR)../extra/scripts/get-needed-libgcc-objects.sh)
halfclean:
- @rm -f $(LIBNAME) uClibc_config.h
- @rm -f $(SHARED_FULLNAME) $(SHARED_MAJORNAME) uClibc-0.* libc.so*
+ @$(RM) $(LIBNAME) uClibc_config.h
+ @$(RM) $(SHARED_FULLNAME) $(SHARED_MAJORNAME) uClibc-0.* libc.so*
tags:
ctags -R
clean: subdirs_clean halfclean
- @rm -rf tmp
- rm -f include/asm include/linux include/bits
+ @$(RM) -r tmp
+ $(RM) include/asm include/linux include/bits
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
diff --git a/libc/inet/Makefile b/libc/inet/Makefile
index 092480f82..ef3d6cf69 100644
--- a/libc/inet/Makefile
+++ b/libc/inet/Makefile
@@ -83,7 +83,7 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean: subdirs_clean
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
diff --git a/libc/inet/rpc/Makefile b/libc/inet/rpc/Makefile
index 0cfa64d8d..5b8975cbf 100644
--- a/libc/inet/rpc/Makefile
+++ b/libc/inet/rpc/Makefile
@@ -62,5 +62,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index f35337a3b..da7c44fba 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -58,7 +58,7 @@ tags:
ctags -R
clean: subdirs_clean
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
diff --git a/libc/misc/assert/Makefile b/libc/misc/assert/Makefile
index 6dc004b7b..cfd469c14 100644
--- a/libc/misc/assert/Makefile
+++ b/libc/misc/assert/Makefile
@@ -40,4 +40,4 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/ctype/Makefile b/libc/misc/ctype/Makefile
index dc73ba7e9..26bb33731 100644
--- a/libc/misc/ctype/Makefile
+++ b/libc/misc/ctype/Makefile
@@ -65,5 +65,5 @@ $(MOBJx): $(MSRC)
$(OBJS): Makefile
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/dirent/Makefile b/libc/misc/dirent/Makefile
index c3dc95a8f..4ccf3d3e0 100644
--- a/libc/misc/dirent/Makefile
+++ b/libc/misc/dirent/Makefile
@@ -42,5 +42,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/error/Makefile b/libc/misc/error/Makefile
index cb293b01a..754010688 100644
--- a/libc/misc/error/Makefile
+++ b/libc/misc/error/Makefile
@@ -35,5 +35,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/file/Makefile b/libc/misc/file/Makefile
index 195097e92..fc1a1bfc3 100644
--- a/libc/misc/file/Makefile
+++ b/libc/misc/file/Makefile
@@ -44,5 +44,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/fnmatch/Makefile b/libc/misc/fnmatch/Makefile
index d3373a0f7..af067bd15 100644
--- a/libc/misc/fnmatch/Makefile
+++ b/libc/misc/fnmatch/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/ftw/Makefile b/libc/misc/ftw/Makefile
index ae21c222c..a9df0c782 100644
--- a/libc/misc/ftw/Makefile
+++ b/libc/misc/ftw/Makefile
@@ -39,5 +39,5 @@ $(MOBJ): $(MSRC)
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/glob/Makefile b/libc/misc/glob/Makefile
index e53c95b18..31a3b80fe 100644
--- a/libc/misc/glob/Makefile
+++ b/libc/misc/glob/Makefile
@@ -42,5 +42,5 @@ $(COBJS): %.o : %.c
glob64.o: glob64.c glob.c
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/gnu/Makefile b/libc/misc/gnu/Makefile
index f2acc8bba..6e3fd8463 100644
--- a/libc/misc/gnu/Makefile
+++ b/libc/misc/gnu/Makefile
@@ -40,4 +40,4 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/internals/Makefile b/libc/misc/internals/Makefile
index e9dd86b80..486cf8d55 100644
--- a/libc/misc/internals/Makefile
+++ b/libc/misc/internals/Makefile
@@ -53,5 +53,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] interp.c *~ core
+ $(RM) *.[oa] interp.c *~ core
diff --git a/libc/misc/intl/Makefile b/libc/misc/intl/Makefile
index 140ae31f3..df59c9d52 100644
--- a/libc/misc/intl/Makefile
+++ b/libc/misc/intl/Makefile
@@ -46,5 +46,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/locale/Makefile b/libc/misc/locale/Makefile
index 17b208b2e..752f0aa0f 100644
--- a/libc/misc/locale/Makefile
+++ b/libc/misc/locale/Makefile
@@ -67,6 +67,6 @@ locale_data.o:
$(OBJS): Makefile
clean:
- rm -f *.[oa] *~ core locale_data.c
+ $(RM) *.[oa] *~ core locale_data.c
.PHONY: data
diff --git a/libc/misc/mntent/Makefile b/libc/misc/mntent/Makefile
index 65fa34623..7430dfe00 100644
--- a/libc/misc/mntent/Makefile
+++ b/libc/misc/mntent/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/pthread/Makefile b/libc/misc/pthread/Makefile
index 3146c7a9a..d01af1d74 100644
--- a/libc/misc/pthread/Makefile
+++ b/libc/misc/pthread/Makefile
@@ -45,5 +45,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/regex/Makefile b/libc/misc/regex/Makefile
index fe2920ba6..5bdda32b4 100644
--- a/libc/misc/regex/Makefile
+++ b/libc/misc/regex/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/search/Makefile b/libc/misc/search/Makefile
index fa28f21d6..9d579b964 100644
--- a/libc/misc/search/Makefile
+++ b/libc/misc/search/Makefile
@@ -69,5 +69,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/statfs/Makefile b/libc/misc/statfs/Makefile
index 89eb7fd89..55c21b8f6 100644
--- a/libc/misc/statfs/Makefile
+++ b/libc/misc/statfs/Makefile
@@ -43,5 +43,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/syslog/Makefile b/libc/misc/syslog/Makefile
index f715eceec..8eb583c51 100644
--- a/libc/misc/syslog/Makefile
+++ b/libc/misc/syslog/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/sysvipc/Makefile b/libc/misc/sysvipc/Makefile
index b3c60cb03..eaf5dd1ec 100644
--- a/libc/misc/sysvipc/Makefile
+++ b/libc/misc/sysvipc/Makefile
@@ -65,7 +65,7 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean: subdirs_clean
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile
index 302214baf..29ed0d949 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -65,5 +65,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/ttyent/Makefile b/libc/misc/ttyent/Makefile
index 6a5fbcbfe..1b814089e 100644
--- a/libc/misc/ttyent/Makefile
+++ b/libc/misc/ttyent/Makefile
@@ -35,5 +35,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/utmp/Makefile b/libc/misc/utmp/Makefile
index 1a50070db..7a506a45d 100644
--- a/libc/misc/utmp/Makefile
+++ b/libc/misc/utmp/Makefile
@@ -40,4 +40,4 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/wchar/Makefile b/libc/misc/wchar/Makefile
index 4a3e2fc7a..c449e3f91 100644
--- a/libc/misc/wchar/Makefile
+++ b/libc/misc/wchar/Makefile
@@ -66,5 +66,5 @@ iconv.target: wchar.c
$(STRIPTOOL) -x -R .note -R .comment $@
clean:
- rm -f *.[oa] *~ core iconv.target
+ $(RM) *.[oa] *~ core iconv.target
diff --git a/libc/misc/wctype/Makefile b/libc/misc/wctype/Makefile
index 44734945c..291036451 100644
--- a/libc/misc/wctype/Makefile
+++ b/libc/misc/wctype/Makefile
@@ -57,5 +57,5 @@ $(MOBJx): $(MSRC)
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/misc/wordexp/Makefile b/libc/misc/wordexp/Makefile
index edfd819d5..5e29f4704 100644
--- a/libc/misc/wordexp/Makefile
+++ b/libc/misc/wordexp/Makefile
@@ -35,5 +35,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/pwd_grp/Makefile b/libc/pwd_grp/Makefile
index f2cdf5a17..288b84a9c 100644
--- a/libc/pwd_grp/Makefile
+++ b/libc/pwd_grp/Makefile
@@ -53,4 +53,4 @@ __getgrent_r.c: config.h
initgroups.c: config.h
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/signal/Makefile b/libc/signal/Makefile
index 8a9d846d6..28d87a77e 100644
--- a/libc/signal/Makefile
+++ b/libc/signal/Makefile
@@ -40,5 +40,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/stdio/Makefile b/libc/stdio/Makefile
index b92eed2a1..b0ba70ba8 100644
--- a/libc/stdio/Makefile
+++ b/libc/stdio/Makefile
@@ -107,5 +107,5 @@ $(COBJS): %.o : %.c
$(OBJ): Makefile
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index a60af2712..a22a8eb0a 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -134,7 +134,7 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
clean: subdirs_clean
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
.PHONY: dummy
diff --git a/libc/stdlib/malloc-930716/Makefile b/libc/stdlib/malloc-930716/Makefile
index a0a5f7b90..bd52b21e9 100644
--- a/libc/stdlib/malloc-930716/Makefile
+++ b/libc/stdlib/malloc-930716/Makefile
@@ -42,5 +42,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index 8f214880c..7172198f2 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -56,4 +56,4 @@ $(COBJS): %.o : %.c ../../../include/bits/uClibc_config.h
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/string/Makefile b/libc/string/Makefile
index 1b12924d5..d9fec82a8 100644
--- a/libc/string/Makefile
+++ b/libc/string/Makefile
@@ -86,5 +86,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/sysdeps/linux/alpha/Makefile b/libc/sysdeps/linux/alpha/Makefile
index 85c530999..f71a40376 100644
--- a/libc/sysdeps/linux/alpha/Makefile
+++ b/libc/sysdeps/linux/alpha/Makefile
@@ -58,6 +58,6 @@ headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 038b994a2..532b55035 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -66,6 +66,6 @@ headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 1b51e095a..1edfe7bf4 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -102,5 +102,5 @@ headers:
cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/common/fpu_control.h .
clean:
- rm -f *.[oa] *~ core crt[in].* *.S
+ $(RM) *.[oa] *~ core crt[in].* *.S
diff --git a/libc/sysdeps/linux/cris/Makefile b/libc/sysdeps/linux/cris/Makefile
index 8a860f188..39bebf8d5 100644
--- a/libc/sysdeps/linux/cris/Makefile
+++ b/libc/sysdeps/linux/cris/Makefile
@@ -58,5 +58,5 @@ $(COBJS): %.o : %.c
headers:
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/sysdeps/linux/e1/Makefile b/libc/sysdeps/linux/e1/Makefile
index 45ee29989..177e78321 100644
--- a/libc/sysdeps/linux/e1/Makefile
+++ b/libc/sysdeps/linux/e1/Makefile
@@ -58,9 +58,9 @@ headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
ifneq ($(strip $(HAVE_ELF)),y)
- rm -f $(TOPDIR)/include/float.h
+ $(RM) $(TOPDIR)/include/float.h
endif
diff --git a/libc/sysdeps/linux/h8300/Makefile b/libc/sysdeps/linux/h8300/Makefile
index 605278f23..d38e11191 100644
--- a/libc/sysdeps/linux/h8300/Makefile
+++ b/libc/sysdeps/linux/h8300/Makefile
@@ -56,8 +56,8 @@ $(COBJS): %.o : %.c
headers:
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
ifneq ($(strip $(HAVE_ELF)),y)
- rm -f $(TOPDIR)/include/float.h
+ $(RM) $(TOPDIR)/include/float.h
endif
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index 2f721eb6e..75e7a27b7 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -69,6 +69,6 @@ headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/i960/Makefile b/libc/sysdeps/linux/i960/Makefile
index 9fd8a837d..fed680d34 100644
--- a/libc/sysdeps/linux/i960/Makefile
+++ b/libc/sysdeps/linux/i960/Makefile
@@ -56,6 +56,6 @@ headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile
index 7369bc925..321dcf7b3 100644
--- a/libc/sysdeps/linux/m68k/Makefile
+++ b/libc/sysdeps/linux/m68k/Makefile
@@ -69,9 +69,9 @@ endif
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
ifneq ($(strip $(HAVE_ELF)),y)
- rm -f $(TOPDIR)/include/float.h
+ $(RM) $(TOPDIR)/include/float.h
endif
diff --git a/libc/sysdeps/linux/microblaze/Makefile b/libc/sysdeps/linux/microblaze/Makefile
index cc098014e..b15fc9d0a 100644
--- a/libc/sysdeps/linux/microblaze/Makefile
+++ b/libc/sysdeps/linux/microblaze/Makefile
@@ -60,6 +60,6 @@ $(COBJS): %.o : %.c
headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile
index a226a8466..361746c28 100644
--- a/libc/sysdeps/linux/mips/Makefile
+++ b/libc/sysdeps/linux/mips/Makefile
@@ -58,7 +58,7 @@ headers:
cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/mips/fpu_control.h .
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
- rm -f $(TOPDIR)/include/sgidefs.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
+ $(RM) $(TOPDIR)/include/sgidefs.h
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index e9798cf7b..380bd778b 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -68,6 +68,6 @@ headers:
cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/powerpc/fpu_control.h .
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile
index b4266c9f5..99ccaaa75 100644
--- a/libc/sysdeps/linux/sh/Makefile
+++ b/libc/sysdeps/linux/sh/Makefile
@@ -67,6 +67,6 @@ headers:
cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/sh/fpu_control.h .
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/sh64/Makefile b/libc/sysdeps/linux/sh64/Makefile
index 6e9192718..8c0b9f399 100644
--- a/libc/sysdeps/linux/sh64/Makefile
+++ b/libc/sysdeps/linux/sh64/Makefile
@@ -60,6 +60,6 @@ $(COBJS): %.o : %.c
headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile
index 19e9d9394..abee5e47d 100644
--- a/libc/sysdeps/linux/sparc/Makefile
+++ b/libc/sysdeps/linux/sparc/Makefile
@@ -58,6 +58,6 @@ headers:
cd $(TOPDIR)/include && ln -fs ../libc/sysdeps/linux/sparc/fpu_control.h .
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/sysdeps/linux/v850/Makefile b/libc/sysdeps/linux/v850/Makefile
index cc098014e..b15fc9d0a 100644
--- a/libc/sysdeps/linux/v850/Makefile
+++ b/libc/sysdeps/linux/v850/Makefile
@@ -60,6 +60,6 @@ $(COBJS): %.o : %.c
headers:
clean:
- rm -f *.[oa] *~ core
- rm -f bits/sysnum.h
+ $(RM) *.[oa] *~ core
+ $(RM) bits/sysnum.h
diff --git a/libc/termios/Makefile b/libc/termios/Makefile
index d27c0a9af..6ccfa9a7e 100644
--- a/libc/termios/Makefile
+++ b/libc/termios/Makefile
@@ -51,5 +51,5 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libc/unistd/Makefile b/libc/unistd/Makefile
index f30bfd3f1..a8d974734 100644
--- a/libc/unistd/Makefile
+++ b/libc/unistd/Makefile
@@ -115,5 +115,5 @@ $(patsubst %, _dirclean_%, $(DIRS)) : dummy
dummy:
clean:
- rm -f *.[oa] *~ core gen_sysconf sysconf_*.c
+ $(RM) *.[oa] *~ core gen_sysconf sysconf_*.c
diff --git a/libcrypt/Makefile b/libcrypt/Makefile
index f745f1047..30b1e1d94 100644
--- a/libcrypt/Makefile
+++ b/libcrypt/Makefile
@@ -38,7 +38,7 @@ $(LIBCRYPT): ar-target
ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS)
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBCRYPT)
+ $(RM) $(TOPDIR)lib/$(LIBCRYPT)
$(INSTALL) -m 644 $(LIBCRYPT) $(TOPDIR)lib
$(OBJS): %.o : %.c
@@ -53,11 +53,10 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc;
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION)
+ $(RM) $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib;
(cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED));
(cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED).$(MAJOR_VERSION));
clean:
- rm -f *.[oa] *~ core $(LIBCRYPT_SHARED)* $(LIBCRYPT_SHARED_FULLNAME)*
-
+ $(RM) *.[oa] *~ core $(LIBCRYPT_SHARED)* $(LIBCRYPT_SHARED_FULLNAME)*
diff --git a/libintl/Makefile b/libintl/Makefile
index ab148ba02..efc48a7ce 100644
--- a/libintl/Makefile
+++ b/libintl/Makefile
@@ -43,7 +43,7 @@ $(LIBC): ar-target
ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBINTL) $(OBJS)
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBINTL)
+ $(RM) $(TOPDIR)lib/$(LIBINTL)
$(INSTALL) -m 644 $(LIBINTL) $(TOPDIR)lib/
$(MOBJ): $(MSRC)
@@ -56,11 +56,10 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc;
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
+ $(RM) $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib
(cd $(TOPDIR)lib && ln -sf $(LIBINTL_SHARED_FULLNAME) $(LIBINTL_SHARED));
(cd $(TOPDIR)lib && ln -sf $(LIBINTL_SHARED_FULLNAME) $(LIBINTL_SHARED).$(MAJOR_VERSION));
clean:
- rm -f *.[oa] *~ core $(LIBINTL_SHARED)* $(LIBINTL_SHARED_FULLNAME)*
-
+ $(RM) *.[oa] *~ core $(LIBINTL_SHARED)* $(LIBINTL_SHARED_FULLNAME)*
diff --git a/libm/Makefile b/libm/Makefile
index 200faf33e..e864f597e 100644
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -89,7 +89,7 @@ $(LIBM): ar-target
@if [ -f $(LIBM) ] ; then \
set -x -e; \
$(INSTALL) -d $(TOPDIR)lib; \
- rm -f $(TOPDIR)lib/$(LIBM); \
+ $(RM) $(TOPDIR)lib/$(LIBM); \
$(INSTALL) -m 644 $(LIBM) $(TOPDIR)lib; \
fi;
@@ -101,7 +101,7 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc; \
$(INSTALL) -d $(TOPDIR)lib; \
- rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
+ $(RM) $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
$(INSTALL) -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
(cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \
(cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \
@@ -120,7 +120,7 @@ tags:
ctags -R
clean: subdirs_clean
- rm -f *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)*
+ $(RM) *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)*
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
@@ -132,4 +132,3 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
.PHONY: dummy
-
diff --git a/libm/powerpc/Makefile b/libm/powerpc/Makefile
index 10dacb07e..84e0b94c9 100644
--- a/libm/powerpc/Makefile
+++ b/libm/powerpc/Makefile
@@ -67,5 +67,5 @@ tags:
ctags -R
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libnsl/Makefile b/libnsl/Makefile
index 37ac9eb09..920da032a 100644
--- a/libnsl/Makefile
+++ b/libnsl/Makefile
@@ -33,7 +33,7 @@ $(LIBNSL): ar-target
ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBNSL) $(OBJS)
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBNSL)
+ $(RM) $(TOPDIR)lib/$(LIBNSL)
$(INSTALL) -m 644 $(LIBNSL) $(TOPDIR)lib
$(OBJS): %.o : %.c
@@ -48,11 +48,10 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc;
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED).$(MAJOR_VERSION)
+ $(RM) $(TOPDIR)lib/$(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib
(cd $(TOPDIR)lib && ln -sf $(LIBNSL_SHARED_FULLNAME) $(LIBNSL_SHARED));
(cd $(TOPDIR)lib && ln -sf $(LIBNSL_SHARED_FULLNAME) $(LIBNSL_SHARED).$(MAJOR_VERSION));
clean:
- rm -f *.[oa] *~ core $(LIBNSL_SHARED)* $(LIBNSL_SHARED_FULLNAME)*
-
+ $(RM) *.[oa] *~ core $(LIBNSL_SHARED)* $(LIBNSL_SHARED_FULLNAME)*
diff --git a/libpthread/Makefile b/libpthread/Makefile
index b2b1c3481..a12655b48 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -56,7 +56,7 @@ $(LIBPTHREAD): subdirs
@if [ -f $(LIBPTHREAD) ] ; then \
set -e; \
$(INSTALL) -d $(TOPDIR)lib; \
- rm -f $(TOPDIR)lib/$(LIBPTHREAD); \
+ $(RM) $(TOPDIR)lib/$(LIBPTHREAD); \
$(INSTALL) -m 644 $(LIBPTHREAD) $(TOPDIR)lib; \
fi;
@@ -64,7 +64,7 @@ $(LIBTHREAD_DB): subdirs
@if [ -f $(LIBTHREAD_DB) ] ; then \
set -e; \
$(INSTALL) -d $(TOPDIR)lib; \
- rm -f $(TOPDIR)lib/$(LIBTHREAD_DB); \
+ $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB); \
$(INSTALL) -m 644 $(LIBTHREAD_DB) $(TOPDIR)lib; \
fi;
@@ -83,7 +83,7 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc $(END_FILES); \
$(INSTALL) -d $(TOPDIR)lib; \
- rm -f $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \
+ $(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \
$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \
$(INSTALL) -m 644 $(LIBPTHREAD_SHARED_FULLNAME) $(TOPDIR)lib; \
(cd $(TOPDIR)lib && ln -sf $(LIBPTHREAD_SHARED_FULLNAME) \
@@ -98,7 +98,7 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc $(END_FILES); \
$(INSTALL) -d $(TOPDIR)lib; \
- rm -f $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \
+ $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \
$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).$(MAJOR_VERSION); \
$(INSTALL) -m 644 $(LIBTHREAD_DB_SHARED_FULLNAME) $(TOPDIR)lib; \
(cd $(TOPDIR)lib && ln -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
@@ -120,9 +120,7 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
clean: subdirs_clean
- rm -f *.[oa] *~ core $(LIBPTHREAD) $(LIBPTHREAD_SHARED_FULLNAME) \
+ $(RM) *.[oa] *~ core $(LIBPTHREAD) $(LIBPTHREAD_SHARED_FULLNAME) \
$(LIBTHREAD_DB) $(LIBTHREAD_DB_SHARED_FULLNAME)
.PHONY: dummy
-
-
diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile
index 1a3293266..7d62879eb 100644
--- a/libpthread/linuxthreads/Makefile
+++ b/libpthread/linuxthreads/Makefile
@@ -70,6 +70,6 @@ else
endif
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile
index d5d3ec5c9..dea86b074 100644
--- a/libpthread/linuxthreads_db/Makefile
+++ b/libpthread/linuxthreads_db/Makefile
@@ -69,6 +69,6 @@ $(COBJS): %.o : %.c
$(STRIPTOOL) -x -R .note -R .comment $*.o
clean:
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
diff --git a/libresolv/Makefile b/libresolv/Makefile
index 98e7166cb..8658842ce 100644
--- a/libresolv/Makefile
+++ b/libresolv/Makefile
@@ -39,7 +39,7 @@ $(LIBRESOLV): ar-target
ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBRESOLV) $(OBJS)
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBRESOLV)
+ $(RM) $(TOPDIR)lib/$(LIBRESOLV)
$(INSTALL) -m 644 $(LIBRESOLV) $(TOPDIR)lib
$(OBJS): %.o : %.c
@@ -54,11 +54,10 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc;
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED).$(MAJOR_VERSION)
+ $(RM) $(TOPDIR)lib/$(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib
(cd $(TOPDIR)lib && ln -sf $(LIBRESOLV_SHARED_FULLNAME) $(LIBRESOLV_SHARED));
(cd $(TOPDIR)lib && ln -sf $(LIBRESOLV_SHARED_FULLNAME) $(LIBRESOLV_SHARED).$(MAJOR_VERSION));
clean:
- rm -f *.[oa] *~ core $(LIBRESOLV_SHARED)* $(LIBRESOLV_SHARED_FULLNAME)*
-
+ $(RM) *.[oa] *~ core $(LIBRESOLV_SHARED)* $(LIBRESOLV_SHARED_FULLNAME)*
diff --git a/libutil/Makefile b/libutil/Makefile
index b149b0e64..572ca0aa8 100644
--- a/libutil/Makefile
+++ b/libutil/Makefile
@@ -42,7 +42,7 @@ $(LIBC): ar-target
ar-target: $(OBJS)
$(AR) $(ARFLAGS) $(LIBUTIL) $(OBJS)
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBUTIL)
+ $(RM) $(TOPDIR)lib/$(LIBUTIL)
$(INSTALL) -m 644 $(LIBUTIL) $(TOPDIR)lib/
$(OBJS): %.o : %.c
@@ -55,11 +55,10 @@ shared: all
--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-L$(TOPDIR)/lib -lc;
$(INSTALL) -d $(TOPDIR)lib
- rm -f $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION)
+ $(RM) $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION)
$(INSTALL) -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib
(cd $(TOPDIR)lib && ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED));
(cd $(TOPDIR)lib && ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED).$(MAJOR_VERSION));
clean:
- rm -f *.[oa] *~ core $(LIBUTIL_SHARED)* $(LIBUTIL_SHARED_FULLNAME)*
-
+ $(RM) *.[oa] *~ core $(LIBUTIL_SHARED)* $(LIBUTIL_SHARED_FULLNAME)*
diff --git a/test/Makefile b/test/Makefile
index 2a0f3c0a2..397cc42b7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -44,7 +44,7 @@ tags:
ctags -R
clean: subdirs_clean
- rm -f *.[oa] *~ core
+ $(RM) *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
diff --git a/test/Rules.mak b/test/Rules.mak
index 42c8cdd33..7b41594b2 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -46,6 +46,8 @@ CC= $(CROSS)gcc
STRIPTOOL=strip
LDD=../$(TESTDIR)ldso/util/ldd
+RM= rm -f
+
# Select the compiler needed to build binaries for your development system
HOSTCC=gcc
HOSTCFLAGS=-O2 -Wall
diff --git a/test/args/Makefile b/test/args/Makefile
index a5a01dbf8..cc4637bc0 100644
--- a/test/args/Makefile
+++ b/test/args/Makefile
@@ -35,6 +35,6 @@ arg_test: arg_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/assert/Makefile b/test/assert/Makefile
index 71f231d69..1933cfed0 100644
--- a/test/assert/Makefile
+++ b/test/assert/Makefile
@@ -35,6 +35,6 @@ assert: assert.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/crypt/Makefile b/test/crypt/Makefile
index 78732ec8c..c7c7b3202 100644
--- a/test/crypt/Makefile
+++ b/test/crypt/Makefile
@@ -68,6 +68,6 @@ md5c-test: md5c-test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core crypt_glibc crypt crypt_glibc.out crypt.out md5c-test
+ $(RM) *.[oa] *~ core crypt_glibc crypt crypt_glibc.out crypt.out md5c-test
diff --git a/test/ctype/Makefile b/test/ctype/Makefile
index 16c49c284..e3595618e 100644
--- a/test/ctype/Makefile
+++ b/test/ctype/Makefile
@@ -35,6 +35,6 @@ ctype_run:
./ctype
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/dlopen/Makefile b/test/dlopen/Makefile
index 529f08a08..286165361 100644
--- a/test/dlopen/Makefile
+++ b/test/dlopen/Makefile
@@ -71,6 +71,6 @@ run: libtest2.so libtest1.so test1 test2 test3 dltest libtest.so dltest2 libtest
-$(DEBUG_LIBS)=all ./dltest
clean:
- rm -f *.o libtest1.so* libtest2.so* test1 test2 test3 \
+ $(RM) *.o libtest1.so* libtest2.so* test1 test2 test3 \
dltest dltest2 libtest.so libtest3.so
diff --git a/test/malloc/Makefile b/test/malloc/Makefile
index dc10cc74f..7fdef736e 100644
--- a/test/malloc/Makefile
+++ b/test/malloc/Makefile
@@ -124,6 +124,6 @@ realloc0_glibc: realloc0.c Makefile
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/math/Makefile b/test/math/Makefile
index c9231c5fc..2133904c9 100644
--- a/test/math/Makefile
+++ b/test/math/Makefile
@@ -100,6 +100,6 @@ libm-test.c: $(ulps-file) libm-test.inc gen-libm-test.pl
$(PERL) ./gen-libm-test.pl -u $< ./libm-test.inc -o "." 2>&1 > /dev/null
clean:
- rm -f *.[oa] *~ core $(TARGETS) $(generated) rint_glibc.out rint.out
+ $(RM) *.[oa] *~ core $(TARGETS) $(generated) rint_glibc.out rint.out
diff --git a/test/misc/Makefile b/test/misc/Makefile
index d94e48747..828f6b282 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -58,7 +58,7 @@ fdopen: fdopen.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
dirent_source:
- -@ rm -f $(TARGETS)
+ -@ $(RM) $(TARGETS)
-@ echo "-------"
-@ echo "dirent.c source: "
-@ echo " "
@@ -126,7 +126,7 @@ dirent64_diff: dirent64 dirent64_glibc
-@ echo " "
clean:
- rm -f *.[oa] *~ core dirent dirent_glibc dirent_glibc.out dirent.out \
+ $(RM) *.[oa] *~ core dirent dirent_glibc dirent_glibc.out dirent.out \
dirent64 dirent64_glibc dirent64_glibc.out dirent64.out \
outb sem fdopen
diff --git a/test/mmap/Makefile b/test/mmap/Makefile
index fd7585545..70d17b756 100644
--- a/test/mmap/Makefile
+++ b/test/mmap/Makefile
@@ -35,6 +35,6 @@ mmap: mmap.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index 16eb16e0f..1e51a4b2a 100644
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -86,5 +86,5 @@ ex7: ex7.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile
index 3a3b3b572..f1f63b406 100644
--- a/test/pwd_grp/Makefile
+++ b/test/pwd_grp/Makefile
@@ -87,6 +87,6 @@ test_grp_diff: test_grp_glibc test_grp
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS) *.out
+ $(RM) *.[oa] *~ core $(TARGETS) *.out
diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile
index a4a35191e..569a5f332 100644
--- a/test/setjmp/Makefile
+++ b/test/setjmp/Makefile
@@ -35,6 +35,6 @@ setjmp_test: setjmp_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/signal/Makefile b/test/signal/Makefile
index 662ee4da5..904ea8524 100644
--- a/test/signal/Makefile
+++ b/test/signal/Makefile
@@ -69,6 +69,6 @@ sigchld_glibc: sigchld.c Makefile
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/silly/Makefile b/test/silly/Makefile
index afe591f9a..2678bb225 100644
--- a/test/silly/Makefile
+++ b/test/silly/Makefile
@@ -26,7 +26,7 @@ TARGETS=hello_source hello hello_glibc tiny
all: $(TARGETS)
hello_source:
- -@ rm -f $(TARGETS)
+ -@ $(RM) $(TARGETS)
-@ echo "-------"
-@ echo "hello.c source: "
-@ echo " "
@@ -75,6 +75,6 @@ tiny: tiny.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/stat/Makefile b/test/stat/Makefile
index 5c284fb05..39e5b2d4f 100644
--- a/test/stat/Makefile
+++ b/test/stat/Makefile
@@ -27,7 +27,7 @@ TARGETS=stat_diff stat64_diff
all: $(TARGETS)
stat_source:
- -@ rm -f $(TARGETS)
+ -@ $(RM) $(TARGETS)
-@ echo "-------"
-@ echo "stat.c source: "
-@ echo " "
@@ -95,7 +95,7 @@ stat64_diff: stat64 stat64_glibc
-@ echo " "
clean:
- rm -f *.[oa] *~ core stat stat_glibc stat_glibc.out stat.out \
+ $(RM) *.[oa] *~ core stat stat_glibc stat_glibc.out stat.out \
stat64 stat64_glibc stat64_glibc.out stat64.out
diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index 8747c2a37..38ad960fe 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -187,6 +187,6 @@ ptytest: ptytest.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
clean:
- rm -f *.[oa] *~ core $(TARGETS) *.out
+ $(RM) *.[oa] *~ core $(TARGETS) *.out
diff --git a/test/string/Makefile b/test/string/Makefile
index df83b78fa..e25da9ca9 100644
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -103,6 +103,6 @@ strsignal: ../../libc/string/strsignal.c
clean:
- rm -f *.[oa] *~ core $(TARGETS) testcopy.gnu.out testcopy.out
+ $(RM) *.[oa] *~ core $(TARGETS) testcopy.gnu.out testcopy.out
diff --git a/test/termios/Makefile b/test/termios/Makefile
index 881cf48e5..2d48251b9 100644
--- a/test/termios/Makefile
+++ b/test/termios/Makefile
@@ -52,6 +52,6 @@ termios_glibc: termios.c Makefile
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)
diff --git a/test/unistd/Makefile b/test/unistd/Makefile
index f64b5428c..8be5b6dc9 100644
--- a/test/unistd/Makefile
+++ b/test/unistd/Makefile
@@ -101,6 +101,6 @@ preadwrite: preadwrite.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
-@ echo " "
clean:
- rm -f *.[oa] *~ core $(TARGETS)
+ $(RM) *.[oa] *~ core $(TARGETS)