summaryrefslogtreecommitdiff
path: root/ldso
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 /ldso
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).
Diffstat (limited to 'ldso')
-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
5 files changed, 10 insertions, 11 deletions
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