[uClibc-cvs] uClibc/libm Makefile,1.35,1.36

Erik Andersen andersen at uclibc.org
Sat Oct 18 10:21:51 UTC 2003


Update of /var/cvs/uClibc/libm
In directory winder:/tmp/cvs-serv6249/libm

Modified Files:
	Makefile 
Log Message:
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).



Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/libm/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile	18 Oct 2003 10:07:39 -0000	1.35
+++ Makefile	18 Oct 2003 10:20:07 -0000	1.36
@@ -89,7 +89,7 @@
 	@if [ -f $(LIBM) ] ; then \
 		set -x -e; \
 		$(INSTALL) -d $(TOPDIR)lib; \
-		rm -f $(TOPDIR)lib/$(LIBM); \
+		$(RM) $(TOPDIR)lib/$(LIBM); \
 		$(INSTALL) -m 644 $(LIBM) $(TOPDIR)lib; \
 	fi;
 
@@ -101,7 +101,7 @@
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc; \
 	    $(INSTALL) -d $(TOPDIR)lib; \
-	    rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
+	    $(RM) $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
 	    $(INSTALL) -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
 	    (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \
 	    (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \
@@ -120,7 +120,7 @@
 	ctags -R
 
 clean: subdirs_clean
-	rm -f *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)*
+	$(RM) *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)*
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
@@ -132,4 +132,3 @@
 	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
 .PHONY: dummy
-




More information about the uClibc-cvs mailing list