diff --git a/elkscmd/advent/Makefile b/elkscmd/advent/Makefile index f4cd96965..034d79f76 100644 --- a/elkscmd/advent/Makefile +++ b/elkscmd/advent/Makefile @@ -43,4 +43,4 @@ install: $(PRGS) $(INSTALL) advent.db $(DESTDIR)/lib clean: - rm -f $(PRGS) $(HOSTPRGS) *.o *.map + $(RM) $(PRGS) $(HOSTPRGS) *.o *.map diff --git a/elkscmd/basic/Makefile b/elkscmd/basic/Makefile index 02a0a06f4..1d33d84fa 100644 --- a/elkscmd/basic/Makefile +++ b/elkscmd/basic/Makefile @@ -55,4 +55,4 @@ install: $(PRGS) $(INSTALL) $(PRGS) $(DESTDIR)/bin clean: - rm -f $(PRGS) $(HOSTPRGS) *.o *.map + $(RM) $(PRGS) $(HOSTPRGS) *.o *.map diff --git a/elkscmd/debug/Makefile b/elkscmd/debug/Makefile index bbe47edb4..4c2c5e8e5 100644 --- a/elkscmd/debug/Makefile +++ b/elkscmd/debug/Makefile @@ -68,4 +68,4 @@ install: $(PRGS) $(INSTALL) $(PRGS) $(DESTDIR)/bin clean: - rm -f $(PRGS) $(HOSTPRGS) *.o *.map system.sym + $(RM) $(PRGS) $(HOSTPRGS) *.o *.map system/sym diff --git a/elkscmd/inet/telnet/Makefile b/elkscmd/inet/telnet/Makefile index b71c83d9d..5f3f002b3 100644 --- a/elkscmd/inet/telnet/Makefile +++ b/elkscmd/inet/telnet/Makefile @@ -24,4 +24,4 @@ install: telnet $(INSTALL) telnet $(DESTDIR)/bin clean: - rm -f $(OBJS) telnet + $(RM) $(OBJS) telnet diff --git a/elkscmd/inet/telnetd/Makefile b/elkscmd/inet/telnetd/Makefile index 606823727..ecb138e70 100644 --- a/elkscmd/inet/telnetd/Makefile +++ b/elkscmd/inet/telnetd/Makefile @@ -25,5 +25,5 @@ install: telnetd $(INSTALL) telnetd $(DESTDIR)/bin clean: - rm -f $(OBJS) telnetd + $(RM) $(OBJS) telnetd diff --git a/elkscmd/inet/tinyirc/Makefile b/elkscmd/inet/tinyirc/Makefile index 3d91e6438..3ee6f1303 100644 --- a/elkscmd/inet/tinyirc/Makefile +++ b/elkscmd/inet/tinyirc/Makefile @@ -31,4 +31,4 @@ install: tinyirc $(INSTALL) tinyirc $(DESTDIR)/bin clean: - rm -f *.o tinyirc + $(RM) *.o tinyirc diff --git a/elkscmd/inet/urlget/Makefile b/elkscmd/inet/urlget/Makefile index 7d2e5e9dd..75c609900 100644 --- a/elkscmd/inet/urlget/Makefile +++ b/elkscmd/inet/urlget/Makefile @@ -24,5 +24,5 @@ install: urlget $(INSTALL) urlget $(DESTDIR)/bin clean: - rm -f urlget *.o + $(RM) urlget *.o diff --git a/elkscmd/lib/Makefile b/elkscmd/lib/Makefile index 7ecfa1460..b8c8cd707 100644 --- a/elkscmd/lib/Makefile +++ b/elkscmd/lib/Makefile @@ -19,4 +19,4 @@ CFLAGS += -fno-instrument-functions -fno-instrument-functions-simple all: $(OBJS) clean: - rm -f *.o + $(RM) *.o diff --git a/elkscmd/misc_utils/Makefile b/elkscmd/misc_utils/Makefile index 2a2158d35..9bc00ca59 100644 --- a/elkscmd/misc_utils/Makefile +++ b/elkscmd/misc_utils/Makefile @@ -71,4 +71,4 @@ install: $(PRGS) $(INSTALL) $(PRGS) $(DESTDIR)/bin clean: - rm -f $(PRGS) $(HOSTPRGS) *~ *.o + $(RM) $(PRGS) $(HOSTPRGS) *~ *.o diff --git a/elkscmd/nano-X/demos/Makefile b/elkscmd/nano-X/demos/Makefile index 2febd21cc..e52fa6cbd 100644 --- a/elkscmd/nano-X/demos/Makefile +++ b/elkscmd/nano-X/demos/Makefile @@ -10,7 +10,7 @@ install: $(PROGS) cd $(BINDIR); strip $(PROGS); chmod 755 $(PROGS) clean: - rm -f $(PROGS) *.o core + $(RM) $(PROGS) *.o core demo: demo.c $(CC) $(CFLAGS) -o demo demo.c $(LDFLAGS) diff --git a/elkscmd/romprg/Makefile b/elkscmd/romprg/Makefile index fcf189ac2..b396a7cdd 100644 --- a/elkscmd/romprg/Makefile +++ b/elkscmd/romprg/Makefile @@ -33,7 +33,7 @@ install: $(PRGS) $(INSTALL) $(PRGS) $(DESTDIR)/bin clean: - rm -f $(PRGS) $(HOSTPRGS) *.o *.map + $(RM) $(PRGS) $(HOSTPRGS) *.o *.map diff --git a/elkscmd/sash/Makefile b/elkscmd/sash/Makefile index 21283700b..a4c7f5526 100644 --- a/elkscmd/sash/Makefile +++ b/elkscmd/sash/Makefile @@ -23,7 +23,7 @@ sash: $(OBJS) $(LD) $(LDFLAGS) -o sash $(OBJS) $(LDLIBS) clean: - rm -f core sash $(OBJS) + $(RM) core sash $(OBJS) install: sash ifdef CONFIG_APP_ASH diff --git a/elkscmd/screen/Makefile b/elkscmd/screen/Makefile index d3a5af66f..2a70aac23 100644 --- a/elkscmd/screen/Makefile +++ b/elkscmd/screen/Makefile @@ -58,7 +58,7 @@ ansi.o: ansi.c screen.h $(CC) $(CFLAGS) -c ansi.c clean: - rm -f screen *.o core *~ + $(RM) screen *.o core *~ install: screen $(INSTALL) screen $(DESTDIR)/bin/screen diff --git a/elkscmd/sh_utils/Makefile b/elkscmd/sh_utils/Makefile index a75588c5a..d20f0377f 100644 --- a/elkscmd/sh_utils/Makefile +++ b/elkscmd/sh_utils/Makefile @@ -80,4 +80,4 @@ install: $(PRGS) $(INSTALL) $(PRGS) $(DESTDIR)/bin clean: - rm -f *.o $(PRGS) + $(RM) *.o $(PRGS) diff --git a/elkscmd/test/echo/Makefile b/elkscmd/test/echo/Makefile index ba8a42518..02ce9e020 100644 --- a/elkscmd/test/echo/Makefile +++ b/elkscmd/test/echo/Makefile @@ -24,4 +24,4 @@ install: $(PRGS) $(INSTALL) $(PRGS) $(DESTDIR)/bin clean: - rm -f *.o $(PRGS) + $(RM) *.o $(PRGS) diff --git a/elkscmd/test/libc/Makefile b/elkscmd/test/libc/Makefile index 61264e3f7..3a8411e5a 100644 --- a/elkscmd/test/libc/Makefile +++ b/elkscmd/test/libc/Makefile @@ -33,4 +33,4 @@ install: $(PGM) $(INSTALL) $(PGM) $(DESTDIR)/bin clean: - rm -f $(OBJS) $(PGM) + $(RM) $(OBJS) $(PGM) diff --git a/elkscmd/test/other/Makefile b/elkscmd/test/other/Makefile index 97ad49c2e..877db555f 100644 --- a/elkscmd/test/other/Makefile +++ b/elkscmd/test/other/Makefile @@ -53,4 +53,4 @@ install: $(PRGS) $(INSTALL) $(PRGS) $(DESTDIR)/bin clean: - rm -f $(PRGS) *.o + $(RM) $(PRGS) *.o diff --git a/elkscmd/unused/m4/Makefile b/elkscmd/unused/m4/Makefile index 5d54b20ca..c520b29c2 100644 --- a/elkscmd/unused/m4/Makefile +++ b/elkscmd/unused/m4/Makefile @@ -34,5 +34,5 @@ test: m4 diff -u test_host_m4.txt test_elks_m4.txt clean: - rm -f core m4 $(CLEANFILES) + $(RM) core m4 $(CLEANFILES) diff --git a/elkscmd/unused/mtools/Makefile b/elkscmd/unused/mtools/Makefile index c4fd62178..fa493c073 100644 --- a/elkscmd/unused/mtools/Makefile +++ b/elkscmd/unused/mtools/Makefile @@ -67,7 +67,7 @@ install-man: done clean: - rm -f $(PROGS) *.o + $(RM) $(PROGS) *.o lint: $(LINT) mdir.c getfat.c init.c search.c match.c convdate.c subdir.c \ diff --git a/elkscmd/unused/prems/pres/Makefile b/elkscmd/unused/prems/pres/Makefile index 49106b861..74717ae6c 100644 --- a/elkscmd/unused/prems/pres/Makefile +++ b/elkscmd/unused/prems/pres/Makefile @@ -43,7 +43,7 @@ flparc: $(FOBJS) $(LIBS) @$(LD) $(LDFLAGS) $(FOBJS) $(LIBS) -o flparc $(LDLIBS) @echo "done" -clean:; @rm -f $(OBJS) pres flparc +clean:; @$(RM) $(OBJS) pres flparc depend:; @mkmf -f $(MAKEFILE) PROGRAM=$(PROGRAM) DEST=$(DEST) diff --git a/elkscmd/unused/xvi/Makefile b/elkscmd/unused/xvi/Makefile index 58a8ecb15..974369ae0 100644 --- a/elkscmd/unused/xvi/Makefile +++ b/elkscmd/unused/xvi/Makefile @@ -19,4 +19,4 @@ install: xvi $(INSTALL) xvi $(DESTDIR)/bin clean: - rm -f core xvi *.o + $(RM) core xvi *.o diff --git a/elksemu/Makefile b/elksemu/Makefile index 882256736..5314f5bcc 100644 --- a/elksemu/Makefile +++ b/elksemu/Makefile @@ -84,7 +84,7 @@ install: elksemu install -s -o root -g root -m 4555 elksemu $(DIST)/lib/elksemu clean realclean: - rm -f $(OBJ) binfmt_elks.o elksemu call_tab.v defn_tab.v efile.h + $(RM) $(OBJ) binfmt_elks.o elksemu call_tab.v defn_tab.v efile.h module: binfmt_elks.o diff --git a/include/Makefile b/include/Makefile index 59494493d..61c6fa897 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ .PHONY: clean clean: - rm -f autoconf.h \ No newline at end of file + $(RM) autoconf.h diff --git a/tools/Makefile b/tools/Makefile index 74f83fe5b..8a557762f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -28,7 +28,7 @@ BINUTILS_DIST=binutils-ia16-$(BINUTILS_VER) $(DISTDIR)/$(BINUTILS_DIST).tar.gz: mkdir -p $(DISTDIR) - rm -rf $(DISTDIR)/binutils-ia16-*.tar.gz \ + $(RM) -r $(DISTDIR)/binutils-ia16-*.tar.gz \ $(DISTDIR)/binutils-ia16-*.tmp \ $(DISTDIR)/binutils-ia16-*.zip set -e; \ @@ -41,14 +41,14 @@ $(DISTDIR)/$(BINUTILS_DIST).tar.gz: $(BUILDDIR)/.binutils.src: $(DISTDIR)/$(BINUTILS_DIST).tar.gz mkdir -p $(BUILDDIR) - rm -rf $(BUILDDIR)/$(BINUTILS_DIST) + $(RM) -r $(BUILDDIR)/$(BINUTILS_DIST) cd $(BUILDDIR) && tar -xzf $(DISTDIR)/$(BINUTILS_DIST).tar.gz - rm -rf $(BUILDDIR)/binutils-src + $(RM) -r $(BUILDDIR)/binutils-src cd $(BUILDDIR) && mv $(BINUTILS_DIST) binutils-src touch $(BUILDDIR)/.binutils.src $(BUILDDIR)/.binutils.build: $(BUILDDIR)/.binutils.src - cd $(BUILDDIR) && rm -rf binutils-build + cd $(BUILDDIR) && $(RM) -r binutils-build mkdir -p $(BUILDDIR)/binutils-build cd $(BUILDDIR)/binutils-build && ../binutils-src/configure --target=ia16-elf --prefix="$(CROSSDIR)" --enable-ld=default --enable-gold=yes --enable-targets=ia16-elf --enable-x86-hpa-segelf=yes --disable-gdb --disable-libdecnumber --disable-readline --disable-sim --disable-nls $(MAKE) -C $(BUILDDIR)/binutils-build $(PARALLEL) @@ -71,7 +71,7 @@ MPC_DIST=mpc-$(MPC_VER) $(DISTDIR)/$(GMP_DIST).tar.bz2: mkdir -p $(DISTDIR) - rm -rf $(DISTDIR)/gmp-*.tar.bz2 $(DISTDIR)/gmp-*.tar.bz2.tmp + $(RM) -r $(DISTDIR)/gmp-*.tar.bz2 $(DISTDIR)/gmp-*.tar.bz2.tmp wget -c https://ftp.gnu.org/gnu/gmp/$(GMP_DIST).tar.bz2 \ -O $@.tmp || \ wget -c https://gmplib.org/download/gmp/$(GMP_DIST).tar.bz2 \ @@ -84,7 +84,7 @@ $(DISTDIR)/$(GMP_DIST).tar.bz2: $(DISTDIR)/$(MPFR_DIST).tar.bz2: mkdir -p $(DISTDIR) - rm -rf $(DISTDIR)/mpfr-*.tar.bz2 $(DISTDIR)/mpfr-*.tar.bz2.tmp + $(RM) -r $(DISTDIR)/mpfr-*.tar.bz2 $(DISTDIR)/mpfr-*.tar.bz2.tmp wget -c https://www.mpfr.org/$(MPFR_DIST)/$(MPFR_DIST).tar.bz2 \ -O $@.tmp touch $@.tmp @@ -92,7 +92,7 @@ $(DISTDIR)/$(MPFR_DIST).tar.bz2: $(DISTDIR)/$(MPC_DIST).tar.gz: mkdir -p $(DISTDIR) - rm -rf $(DISTDIR)/mpc-*.tar.gz $(DISTDIR)/mpc-*.tar.gz.tmp + $(RM) -r $(DISTDIR)/mpc-*.tar.gz $(DISTDIR)/mpc-*.tar.gz.tmp wget -c https://ftp.gnu.org/gnu/mpc/$(MPC_DIST).tar.gz -O $@.tmp touch $@.tmp mv $@.tmp $@ @@ -104,7 +104,7 @@ GCC_DIST=gcc-ia16-$(GCC_VER) $(DISTDIR)/$(GCC_DIST).tar.gz: mkdir -p $(DISTDIR) - rm -rf $(DISTDIR)/gcc-ia16-*.tar.gz \ + $(RM) -r $(DISTDIR)/gcc-ia16-*.tar.gz \ $(DISTDIR)/gcc-ia16-*.tmp \ $(DISTDIR)/gcc-ia16-*.zip set -e; \ @@ -120,9 +120,9 @@ $(BUILDDIR)/.gcc.src: $(DISTDIR)/$(GCC_DIST).tar.gz \ $(DISTDIR)/$(MPFR_DIST).tar.bz2 \ $(DISTDIR)/$(MPC_DIST).tar.gz mkdir -p $(BUILDDIR) - rm -rf $(BUILDDIR)/$(GCC_DIST) + $(RM) -r $(BUILDDIR)/$(GCC_DIST) cd $(BUILDDIR) && tar -xzf $(DISTDIR)/$(GCC_DIST).tar.gz - rm -rf $(BUILDDIR)/gcc-src + $(RM) -r $(BUILDDIR)/gcc-src cd $(BUILDDIR) && mv $(GCC_DIST) gcc-src cd $(BUILDDIR)/gcc-src && tar -xjf $(DISTDIR)/$(GMP_DIST).tar.bz2 cd $(BUILDDIR)/gcc-src && ln -s $(GMP_DIST) gmp @@ -133,14 +133,14 @@ $(BUILDDIR)/.gcc.src: $(DISTDIR)/$(GCC_DIST).tar.gz \ touch $(BUILDDIR)/.gcc.src $(BUILDDIR)/.gcc.build: $(BUILDDIR)/.gcc.src $(BUILDDIR)/.binutils.build - cd $(BUILDDIR) && rm -rf gcc-build + cd $(BUILDDIR) && $(RM) -r gcc-build mkdir $(BUILDDIR)/gcc-build cd $(BUILDDIR)/gcc-build && ../gcc-src/configure --target=ia16-elf --prefix="$(CROSSDIR)" --without-headers --enable-languages=c --disable-libssp --without-isl # If there are any obsolete multilib directories (which are no longer # used) in the installation directory, remove them, so that they do # not clutter up the installation directory. This is a bit of a hack. # -- tkchia 20201128 - rm -rf $(CROSSDIR)/lib/gcc/ia16-elf/6.3.0/size \ + $(RM) -r $(CROSSDIR)/lib/gcc/ia16-elf/6.3.0/size \ $(CROSSDIR)/lib/gcc/ia16-elf/6.3.0/rtd/size \ $(CROSSDIR)/lib/gcc/ia16-elf/6.3.0/regparmcall/size \ $(CROSSDIR)/lib/gcc/ia16-elf/6.3.0/regparmcall/any_186/size @@ -161,7 +161,7 @@ EMU86_DIST=emu86-$(EMU86_VER) $(DISTDIR)/$(EMU86_DIST).tar.gz: mkdir -p $(DISTDIR) - rm -rf $(DISTDIR)/emu86-*.tar.gz \ + $(RM) -r $(DISTDIR)/emu86-*.tar.gz \ $(DISTDIR)/emu86-*.tmp \ $(DISTDIR)/emu86-*.zip set -e; \ @@ -174,9 +174,9 @@ $(DISTDIR)/$(EMU86_DIST).tar.gz: $(BUILDDIR)/.emu86.src: $(DISTDIR)/$(EMU86_DIST).tar.gz mkdir -p $(BUILDDIR) - rm -rf $(BUILDDIR)/$(EMU86_DIST) + $(RM) -r $(BUILDDIR)/$(EMU86_DIST) cd $(BUILDDIR) && tar -xzf $(DISTDIR)/$(EMU86_DIST).tar.gz - rm -rf $(BUILDDIR)/emu86 + $(RM) -r $(BUILDDIR)/emu86 cd $(BUILDDIR) && mv $(EMU86_DIST) emu86 touch $(BUILDDIR)/.emu86.src @@ -195,5 +195,5 @@ all:: $(CROSSDIR)/.emu86.install # Tools pruning (to save disk space) prune: - -rm -rf $(DISTDIR) - -rm -rf $(BUILDDIR) + -$(RM) -r $(DISTDIR) + -$(RM) -r $(BUILDDIR)