Bugzilla Bug 274751: fixed the regression that the *.res files were not NSPRPUB_PRE_4_2_CLIENT_BRANCH
authorwtchang%redhat.com
Tue, 04 Jan 2005 21:27:36 +0000
branchNSPRPUB_PRE_4_2_CLIENT_BRANCH
changeset 3239 7580499d4332ec53c07af1fdf3d1564291747903
parent 3235 d557f4ebfe1db91c44860d4b0e9eb8ce4cdb3478
child 3240 863632e76acfdb80cab9c1e98ca004468eb5f360
push idunknown
push userunknown
push dateunknown
bugs274751
Bugzilla Bug 274751: fixed the regression that the *.res files were not removed by the various clean or clobber makefile targets. r=cls. Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -160,17 +160,17 @@ ifndef OBJS
 OBJS		= $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \
 		  $(addprefix $(OBJDIR)/,$(ASFILES:.$(ASM_SUFFIX)=.$(OBJ_SUFFIX)))
 endif
 
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 EXTRA_LIBS := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(EXTRA_LIBS))
 endif
 
-ALL_TRASH		= $(TARGETS) $(OBJS) $(filter-out . .., $(OBJDIR)) LOGS TAGS $(GARBAGE) \
+ALL_TRASH		= $(TARGETS) $(OBJS) $(RES) $(filter-out . .., $(OBJDIR)) LOGS TAGS $(GARBAGE) \
 			  $(NOSUCHFILE) \
 			  so_locations
 
 ifeq ($(OS_ARCH),OpenVMS)
 ALL_TRASH		+= $(wildcard *.c*_defines)
 ifdef SHARED_LIBRARY
 VMS_SYMVEC_FILE		= $(SHARED_LIBRARY:.$(DLL_SUFFIX)=_symvec.opt)
 VMS_SYMVEC_FILE_MODULE	= $(srcdir)/$(LIBRARY_NAME)_symvec.opt
@@ -203,21 +203,21 @@ all:: export
 export::
 	+$(LOOP_OVER_DIRS)
 
 libs:: export
 
 install:: export
 
 clean::
-	rm -rf $(OBJS) so_locations $(NOSUCHFILE) $(GARBAGE)
+	rm -rf $(OBJS) $(RES) so_locations $(NOSUCHFILE) $(GARBAGE)
 	+$(LOOP_OVER_DIRS)
 
 clobber::
-	rm -rf $(OBJS) $(TARGETS) $(filter-out . ..,$(OBJDIR)) $(GARBAGE) so_locations $(NOSUCHFILE)
+	rm -rf $(OBJS) $(RES) $(TARGETS) $(filter-out . ..,$(OBJDIR)) $(GARBAGE) so_locations $(NOSUCHFILE)
 	+$(LOOP_OVER_DIRS)
 
 realclean clobber_all::
 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH)
 	+$(LOOP_OVER_DIRS)
 
 distclean::
 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)