From dd3fb0f8c1c10fcee804f11a4eed84316c5f694b Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 18 Oct 2003 10:20:59 +0000 Subject: 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). --- ldso/libdl/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ldso/libdl/Makefile') 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 *~ -- cgit v1.2.3