Bring the client branch in sync (almost) with the changes wtc made to the NSPR tip at the tail end of bug #29427.
NSPRPUB_CLIENT_BRANCH
Bring the client branch in sync (almost) with the changes wtc made to the NSPR tip at the tail end of bug #29427.
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,20 +46,22 @@ ifdef PR_CLIENT_BUILD
export::
rm -r -f $(DIST)/../public/nspr
ifdef PR_CLIENT_BUILD_UNIX
rm -f $(DIST)/lib/libnspr.a
rm -f $(DIST)/bin/libnspr.$(DLL_SUFFIX)
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::
echo $(BUILD_NUMBER) > $(RELEASE_DIR)/$(BUILD_NUMBER)/version.df
@if test -f imports.df; then \
echo "cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df"; \
cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df; \
else \
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -146,17 +146,17 @@ endif
ifeq ($(OS_ARCH), WINNT)
ifneq ($(OS_TARGET), WIN16)
OBJS += $(RES)
endif
endif
ALL_TRASH = $(TARGETS) $(OBJS) $(filter-out . .., $(OBJDIR)) LOGS TAGS $(GARBAGE) \
- $(DIST_GARBAGE) $(NOSUCHFILE) \
+ $(NOSUCHFILE) \
so_locations
ifdef DIRS
LOOP_OVER_DIRS = \
@for d in $(DIRS); do \
if test -d $$d; then \
set -e; \
echo "cd $$d; $(MAKE) $@"; \
@@ -184,20 +184,24 @@ install::
clean::
rm -rf $(OBJS) so_locations $(NOSUCHFILE) $(GARBAGE)
+$(LOOP_OVER_DIRS)
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"
@if test -z "$(BUILD_NUMBER)"; then \
echo "BUILD_NUMBER must be defined"; \
false; \
else \
true; \