diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-10-18 10:20:59 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-10-18 10:20:59 +0000 |
| commit | dd3fb0f8c1c10fcee804f11a4eed84316c5f694b (patch) | |
| tree | 916c96c10d0178fa6f1c8d176f2c2d0bf72338b0 /libpthread | |
| parent | 49f0dd0fcb64746b1ef06e094f2fa8091c23637c (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 'libpthread')
| -rw-r--r-- | libpthread/Makefile | 12 | ||||
| -rw-r--r-- | libpthread/linuxthreads/Makefile | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/Makefile | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/libpthread/Makefile b/libpthread/Makefile index b2b1c3481..a12655b48 100644 --- a/libpthread/Makefile +++ b/libpthread/Makefile @@ -56,7 +56,7 @@ $(LIBPTHREAD): subdirs @if [ -f $(LIBPTHREAD) ] ; then \ set -e; \ $(INSTALL) -d $(TOPDIR)lib; \ - rm -f $(TOPDIR)lib/$(LIBPTHREAD); \ + $(RM) $(TOPDIR)lib/$(LIBPTHREAD); \ $(INSTALL) -m 644 $(LIBPTHREAD) $(TOPDIR)lib; \ fi; @@ -64,7 +64,7 @@ $(LIBTHREAD_DB): subdirs @if [ -f $(LIBTHREAD_DB) ] ; then \ set -e; \ $(INSTALL) -d $(TOPDIR)lib; \ - rm -f $(TOPDIR)lib/$(LIBTHREAD_DB); \ + $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB); \ $(INSTALL) -m 644 $(LIBTHREAD_DB) $(TOPDIR)lib; \ fi; @@ -83,7 +83,7 @@ shared: all --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \ -L$(TOPDIR)/lib -lc $(END_FILES); \ $(INSTALL) -d $(TOPDIR)lib; \ - rm -f $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \ + $(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \ $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \ $(INSTALL) -m 644 $(LIBPTHREAD_SHARED_FULLNAME) $(TOPDIR)lib; \ (cd $(TOPDIR)lib && ln -sf $(LIBPTHREAD_SHARED_FULLNAME) \ @@ -98,7 +98,7 @@ shared: all --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \ -L$(TOPDIR)/lib -lc $(END_FILES); \ $(INSTALL) -d $(TOPDIR)lib; \ - rm -f $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \ + $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \ $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).$(MAJOR_VERSION); \ $(INSTALL) -m 644 $(LIBTHREAD_DB_SHARED_FULLNAME) $(TOPDIR)lib; \ (cd $(TOPDIR)lib && ln -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \ @@ -120,9 +120,7 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean clean: subdirs_clean - rm -f *.[oa] *~ core $(LIBPTHREAD) $(LIBPTHREAD_SHARED_FULLNAME) \ + $(RM) *.[oa] *~ core $(LIBPTHREAD) $(LIBPTHREAD_SHARED_FULLNAME) \ $(LIBTHREAD_DB) $(LIBTHREAD_DB_SHARED_FULLNAME) .PHONY: dummy - - diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile index 1a3293266..7d62879eb 100644 --- a/libpthread/linuxthreads/Makefile +++ b/libpthread/linuxthreads/Makefile @@ -70,6 +70,6 @@ else endif clean: - rm -f *.[oa] *~ core + $(RM) *.[oa] *~ core diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile index d5d3ec5c9..dea86b074 100644 --- a/libpthread/linuxthreads_db/Makefile +++ b/libpthread/linuxthreads_db/Makefile @@ -69,6 +69,6 @@ $(COBJS): %.o : %.c $(STRIPTOOL) -x -R .note -R .comment $*.o clean: - rm -f *.[oa] *~ core + $(RM) *.[oa] *~ core |