[uClibc-cvs] uClibc/libintl Makefile,1.2,1.3

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


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

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/libintl/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	18 Oct 2003 10:07:37 -0000	1.2
+++ Makefile	18 Oct 2003 10:20:03 -0000	1.3
@@ -43,7 +43,7 @@
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBINTL) $(OBJS)
 	$(INSTALL) -d $(TOPDIR)lib
-	rm -f $(TOPDIR)lib/$(LIBINTL)
+	$(RM) $(TOPDIR)lib/$(LIBINTL)
 	$(INSTALL) -m 644 $(LIBINTL) $(TOPDIR)lib/
 
 $(MOBJ): $(MSRC)
@@ -56,11 +56,10 @@
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
 		-L$(TOPDIR)/lib -lc;
 	$(INSTALL) -d $(TOPDIR)lib
-	rm -f $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
+	$(RM) $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
 	$(INSTALL) -m 644 $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib
 	(cd $(TOPDIR)lib && ln -sf $(LIBINTL_SHARED_FULLNAME) $(LIBINTL_SHARED)); 
 	(cd $(TOPDIR)lib && ln -sf $(LIBINTL_SHARED_FULLNAME) $(LIBINTL_SHARED).$(MAJOR_VERSION)); 
 
 clean:
-	rm -f *.[oa] *~ core $(LIBINTL_SHARED)* $(LIBINTL_SHARED_FULLNAME)*
-
+	$(RM) *.[oa] *~ core $(LIBINTL_SHARED)* $(LIBINTL_SHARED_FULLNAME)*




More information about the uClibc-cvs mailing list