diff options
96 files changed, 188 insertions, 194 deletions
@@ -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)/; @@ -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 - |