Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

makefile: rm -f -> $(RM) #2020

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elkscmd/advent/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ install: $(PRGS)
$(INSTALL) advent.db $(DESTDIR)/lib

clean:
rm -f $(PRGS) $(HOSTPRGS) *.o *.map
$(RM) $(PRGS) $(HOSTPRGS) *.o *.map
2 changes: 1 addition & 1 deletion elkscmd/basic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ install: $(PRGS)
$(INSTALL) $(PRGS) $(DESTDIR)/bin

clean:
rm -f $(PRGS) $(HOSTPRGS) *.o *.map
$(RM) $(PRGS) $(HOSTPRGS) *.o *.map
2 changes: 1 addition & 1 deletion elkscmd/debug/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion elkscmd/inet/telnet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ install: telnet
$(INSTALL) telnet $(DESTDIR)/bin

clean:
rm -f $(OBJS) telnet
$(RM) $(OBJS) telnet
2 changes: 1 addition & 1 deletion elkscmd/inet/telnetd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ install: telnetd
$(INSTALL) telnetd $(DESTDIR)/bin

clean:
rm -f $(OBJS) telnetd
$(RM) $(OBJS) telnetd

2 changes: 1 addition & 1 deletion elkscmd/inet/tinyirc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ install: tinyirc
$(INSTALL) tinyirc $(DESTDIR)/bin

clean:
rm -f *.o tinyirc
$(RM) *.o tinyirc
2 changes: 1 addition & 1 deletion elkscmd/inet/urlget/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ install: urlget
$(INSTALL) urlget $(DESTDIR)/bin

clean:
rm -f urlget *.o
$(RM) urlget *.o

2 changes: 1 addition & 1 deletion elkscmd/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ CFLAGS += -fno-instrument-functions -fno-instrument-functions-simple
all: $(OBJS)

clean:
rm -f *.o
$(RM) *.o
2 changes: 1 addition & 1 deletion elkscmd/misc_utils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ install: $(PRGS)
$(INSTALL) $(PRGS) $(DESTDIR)/bin

clean:
rm -f $(PRGS) $(HOSTPRGS) *~ *.o
$(RM) $(PRGS) $(HOSTPRGS) *~ *.o
2 changes: 1 addition & 1 deletion elkscmd/nano-X/demos/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion elkscmd/romprg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install: $(PRGS)
$(INSTALL) $(PRGS) $(DESTDIR)/bin

clean:
rm -f $(PRGS) $(HOSTPRGS) *.o *.map
$(RM) $(PRGS) $(HOSTPRGS) *.o *.map



2 changes: 1 addition & 1 deletion elkscmd/sash/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion elkscmd/screen/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion elkscmd/sh_utils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ install: $(PRGS)
$(INSTALL) $(PRGS) $(DESTDIR)/bin

clean:
rm -f *.o $(PRGS)
$(RM) *.o $(PRGS)
2 changes: 1 addition & 1 deletion elkscmd/test/echo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ install: $(PRGS)
$(INSTALL) $(PRGS) $(DESTDIR)/bin

clean:
rm -f *.o $(PRGS)
$(RM) *.o $(PRGS)
2 changes: 1 addition & 1 deletion elkscmd/test/libc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ install: $(PGM)
$(INSTALL) $(PGM) $(DESTDIR)/bin

clean:
rm -f $(OBJS) $(PGM)
$(RM) $(OBJS) $(PGM)
2 changes: 1 addition & 1 deletion elkscmd/test/other/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ install: $(PRGS)
$(INSTALL) $(PRGS) $(DESTDIR)/bin

clean:
rm -f $(PRGS) *.o
$(RM) $(PRGS) *.o
2 changes: 1 addition & 1 deletion elkscmd/unused/m4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion elkscmd/unused/mtools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion elkscmd/unused/prems/pres/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion elkscmd/unused/xvi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ install: xvi
$(INSTALL) xvi $(DESTDIR)/bin

clean:
rm -f core xvi *.o
$(RM) core xvi *.o
2 changes: 1 addition & 1 deletion elksemu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion include/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: clean

clean:
rm -f autoconf.h
$(RM) autoconf.h
34 changes: 17 additions & 17 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand All @@ -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)
Expand All @@ -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 [email protected] || \
wget -c https://gmplib.org/download/gmp/$(GMP_DIST).tar.bz2 \
Expand All @@ -84,15 +84,15 @@ $(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 [email protected]
touch [email protected]
mv [email protected] $@

$(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 [email protected]
touch [email protected]
mv [email protected] $@
Expand All @@ -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; \
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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; \
Expand All @@ -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

Expand All @@ -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)
Loading