[uClibc-cvs] uClibc/libc Makefile,1.29,1.30

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


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

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/libc/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile	18 Oct 2003 10:07:33 -0000	1.29
+++ Makefile	18 Oct 2003 10:18:39 -0000	1.30
@@ -54,7 +54,7 @@
 ar-target:
 	$(CROSS)ranlib $(LIBNAME)
 	$(INSTALL) -d $(TOPDIR)lib
-	rm -f $(TOPDIR)lib/$(LIBNAME)
+	$(RM) $(TOPDIR)lib/$(LIBNAME)
 	$(INSTALL) -m 644 $(LIBNAME) $(TOPDIR)lib
 
 $(LIBNAME): subdirs ar-target
@@ -65,15 +65,15 @@
 		--whole-archive $(LIBGCC_NEED) $(LIBNAME) \
 		$(TOPDIR)/libc/misc/internals/interp.o --no-whole-archive \
 		-init __uClibc_init $(LIBGCC)
-	@true #rm -rf tmp
+	@true #$(RM) -r tmp
 	$(INSTALL) -d $(TOPDIR)lib
-	rm -f $(TOPDIR)lib/$(SHARED_FULLNAME)
+	$(RM) $(TOPDIR)lib/$(SHARED_FULLNAME)
 	$(INSTALL) -m 644 $(SHARED_FULLNAME) $(TOPDIR)lib
 	(cd ../lib && ln -sf $(SHARED_FULLNAME) libc.so);
 	(cd ../lib && ln -sf $(SHARED_FULLNAME) $(SHARED_MAJORNAME));
 
 $(LIBGCC_NEED): $(TOPDIR)lib/$(LIBNAME)
-	@rm -rf tmp
+	@$(RM) -r tmp
 	@mkdir tmp
 	$(AR) rv $@
 	(cd tmp && CC="$(CC)" LD="$(LD)" LDFLAGS="$(CPU_LDFLAGS-y)" \
@@ -81,15 +81,15 @@
 		/bin/sh $(TOPDIR)../extra/scripts/get-needed-libgcc-objects.sh)
 
 halfclean:
-	@rm -f $(LIBNAME) uClibc_config.h
-	@rm -f $(SHARED_FULLNAME) $(SHARED_MAJORNAME) uClibc-0.* libc.so*
+	@$(RM) $(LIBNAME) uClibc_config.h
+	@$(RM) $(SHARED_FULLNAME) $(SHARED_MAJORNAME) uClibc-0.* libc.so*
 
 tags:
 	ctags -R
 
 clean: subdirs_clean halfclean
-	@rm -rf tmp
-	rm -f include/asm include/linux include/bits
+	@$(RM) -r tmp
+	$(RM) include/asm include/linux include/bits
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))




More information about the uClibc-cvs mailing list