summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcls%seawood.org <devnull@localhost>2000-04-25 10:33:27 +0000
committercls%seawood.org <devnull@localhost>2000-04-25 10:33:27 +0000
commit9215d662242a233494feba9a8838ba6836c09b5d (patch)
tree87dc0491ced648052631e44dfa091702dde098e0
parent6ab43ab71801ef3f7c4f67b57f511995bb280fb7 (diff)
downloadnspr-hg-9215d662242a233494feba9a8838ba6836c09b5d.tar.gz
Bring the client branch in sync (almost) with the changes wtc made to the NSPR tip at the tail end of bug #29427.
-rw-r--r--Makefile.in4
-rw-r--r--config/rules.mk8
2 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index cd38bd9d..87cc6c67 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,10 +51,12 @@ ifdef PR_CLIENT_BUILD_UNIX
endif
endif
-# Delete config/autoconf.mk last because it is included by every makefile.
distclean realclean clobber_all::
@echo "cd pr/tests; $(MAKE) $@"
@$(MAKE) -C pr/tests $@
+
+# Delete config/autoconf.mk last because it is included by every makefile.
+distclean::
rm -f config/autoconf.mk
release::
diff --git a/config/rules.mk b/config/rules.mk
index b474c075..cbad62a8 100644
--- a/config/rules.mk
+++ b/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,10 +189,14 @@ clobber::
rm -rf $(OBJS) $(TARGETS) $(filter-out . ..,$(OBJDIR)) $(GARBAGE) so_locations $(NOSUCHFILE)
+$(LOOP_OVER_DIRS)
-distclean realclean clobber_all::
+realclean clobber_all::
rm -rf $(wildcard *.OBJ *.OBJD) $(ALL_TRASH)
+$(LOOP_OVER_DIRS)
+distclean::
+ rm -rf $(wildcard *.OBJ *.OBJD) $(ALL_TRASH) $(DIST_GARBAGE)
+ +$(LOOP_OVER_DIRS)
+
release:: export
ifdef RELEASE_BINS
@echo "Copying executable programs and scripts to release directory"