Bugzilla bug #29427: restore the realclean/clobber_all targets to their

original behavior.
Modified files: Makefile, Makefile.in, config/rules.mk

nsprpub/Makefile

@@ -44,7 +44,7 @@ ifdef PR_CLIENT_BUILD_UNIX
 endif
 endif
 
-distclean realclean clobber_all::
+distclean::
 	@echo "cd pr/tests; $(MAKE) $@"
 	@$(MAKE) -C pr/tests $@
 

nsprpub/Makefile.in

@@ -31,7 +31,7 @@ PR_CLIENT_BUILD = 1
 PR_CLIENT_BUILD_UNIX = 1
 endif
 
-DIST_GARBAGE = config.cache config.log config.status dist
+DIST_GARBAGE = config.cache config.log config.status
 
 include $(topsrcdir)/config/rules.mk
 
@@ -52,7 +52,7 @@ endif
 endif
 
 # Delete config/autoconf.mk last because it is included by every makefile.
-distclean realclean clobber_all::
+distclean::
 	@echo "cd pr/tests; $(MAKE) $@"
 	@$(MAKE) -C pr/tests $@
 	rm -f config/autoconf.mk

nsprpub/config/rules.mk

@@ -151,7 +151,7 @@ endif
 endif
 
 ALL_TRASH		= $(TARGETS) $(OBJS) $(filter-out . .., $(OBJDIR)) LOGS TAGS $(GARBAGE) \
-			  $(DIST_GARBAGE) $(NOSUCHFILE) \
+			  $(NOSUCHFILE) \
 			  so_locations
 
 ifdef DIRS
@@ -189,8 +189,12 @@ clobber::
 	rm -rf $(OBJS) $(TARGETS) $(filter-out . ..,$(OBJDIR)) $(GARBAGE) so_locations $(NOSUCHFILE)
 	+$(LOOP_OVER_DIRS)
 
-distclean realclean clobber_all::
-	rm -rf $(wildcard *.OBJ *.OBJD) $(ALL_TRASH)
+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)
 	+$(LOOP_OVER_DIRS)
 
 release:: export