1Revert of upstream: 2 3changeset: 15608:744881490c78 4user: Jan-Marek Glogowski <glogow@fbihome.de> 5date: Wed May 13 19:00:40 2020 +0000 6summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea 7 8--- b/nss/coreconf/rules.mk Wed May 13 19:00:40 2020 +0000 9+++ a/nss/coreconf/rules.mk Tue May 12 21:33:43 2020 +0000 10@@ -31,21 +31,10 @@ 11 USE_NT_C_SYNTAX=1 12 endif 13 14-# For whatever reason, "." can't be handled using make conditionals. 15-# Based on automake's SUBDIRS "." handling. 16 ifdef DIRS 17 ifndef IGNORE_DIRS 18-ifneq (,$(filter .,$(DIRS))) 19-TARGETS = $(NULL) 20-ALL_TRASH = $(NULL) 21-endif 22- 23 $(DIRS): 24+ $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS) 25- $(IGNORE_ERROR)@if [ "$@" != "." ]; then \ 26- $(MAKE) -C $@ $(MAKECMDGOALS) ; \ 27- else \ 28- IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \ 29- fi 30 @$(CLICK_STOPWATCH) 31 endif 32 endif 33@@ -84,9 +73,7 @@ 34 check: $(DIRS) 35 36 clean clobber: $(DIRS) 37-ifneq (,$(ALL_TRASH)) 38 rm -rf $(ALL_TRASH) 39-endif 40 41 realclean clobber_all: $(DIRS) 42 rm -rf $(wildcard *.OBJ) dist $(ALL_TRASH) 43--- b/nss/lib/ckfw/builtins/manifest.mn Wed May 13 19:00:40 2020 +0000 44+++ a/nss/lib/ckfw/builtins/manifest.mn Tue May 12 21:33:43 2020 +0000 45@@ -5,9 +5,7 @@ 46 47 CORE_DEPTH = ../../.. 48 49+DIRS = testlib 50-DIRS = . testlib 51- 52-testlib: . 53 54 MODULE = nss 55 56--- b/nss/lib/ckfw/manifest.mn Wed May 13 19:00:40 2020 +0000 57+++ a/nss/lib/ckfw/manifest.mn Tue May 12 21:33:43 2020 +0000 58@@ -5,9 +5,7 @@ 59 60 CORE_DEPTH = ../.. 61 62+DIRS = builtins 63-DIRS = . builtins 64- 65-builtins: . 66 67 PRIVATE_EXPORTS = \ 68 ck.h \ 69--- b/nss/manifest.mn Wed May 13 19:00:40 2020 +0000 70+++ a/nss/manifest.mn Tue May 12 21:33:43 2020 +0000 71@@ -23,6 +23,12 @@ 72 # no real way to encode these in any sensible way 73 $(MAKE) -C coreconf/nsinstall program 74 $(MAKE) export 75+ # pre-build child dir -> parent dir dependencies 76+ # ckfw/builtins -> ckfw 77+ IGNORE_DIRS=1 $(MAKE) -C lib/ckfw libs 78+ # ckfw/builtins/testlib -> ckfw/builtins + base 79+ $(MAKE) -C lib/base libs 80+ IGNORE_DIRS=1 $(MAKE) -C lib/ckfw/builtins libs 81 82 lib: coreconf 83 cmd: lib 84