Allow developers to build PSM 2.0 on Unix.

Fix for Bug 70343 sr=cls

allmakefiles.sh

@@ -746,6 +746,38 @@ embedding/config/Makefile
 embedding/tests/gtkEmbed/Makefile
 "
 
+MAKEFILES_psm2="
+security/manager/Makefile
+security/manager/ssl/Makefile
+security/manager/ssl/src/Makefile
+security/manager/ssl/resources/Makefile
+security/manager/ssl/public/Makefile
+security/manager/pki/Makefile
+security/manager/pki/resources/Makefile
+security/manager/pki/src/Makefile
+netwerk/protocol/http/public/Makefile
+netwerk/build/Makefile
+netwerk/base/public/Makefile
+netwerk/socket/base/Makefile
+uriloader/base/Makefile
+intl/locale/idl/Makefile
+intl/strres/public/Makefile
+dom/public/Makefile
+dom/public/base/Makefile
+rdf/base/idl/Makefile
+xpfe/appshell/public/Makefile
+caps/idl/Makefile
+layout/html/forms/public/Makefile
+gfx/public/Makefile
+gfx/idl/Makefile
+widget/public/Makefile
+layout/base/public/Makefile
+docshell/base/Makefile
+modules/libpref/public/Makefile
+content/base/public/Makefile
+intl/locale/public/Makefile
+"
+
 MAKEFILES_security="
 security/Makefile
 security/psm/Makefile
@@ -1057,6 +1089,8 @@ else
 		;;
 	    psm) add_makefiles "$MAKEFILES_dbm $MAKEFILES_xpcom $MAKEFILES_security $MAKEFILES_js $MAKEFILES_psm_glue"
 		;;
+	    psm2) add_makefiles "$MAKEFILES_dbm $MAKEFILES_js $MAKEFILES_xpcom $MAKEFILES_psm2"
+		;;
             string) add_makefiles "$MAKEFILES_string"
                 ;;
 	    transformiix) add_makefiles "$MAKEFILES_transformiix"

build/unix/modules.mk

@@ -97,6 +97,40 @@ BM_DEP_DIRS_psm	= $(BM_DEP_DIRS_dbm) $(BM_DEP_DIRS_xpcom) $(BM_DEP_DIRS_js) intl
 BM_CVS_psm	= $(BM_CVS_dbm) $(BM_CVS_xpcom) $(BM_CVS_js) security netwerk/base/public netwerk/socket/base dom/public $(BM_CVS_js) extensions/psm-glue
 BM_CVS_NS_psm	= $(BM_CVS_NS_dbm) $(BM_CVS_NS_xpcom) $(BM_CVS_NS_js) intl/locale/idl intl/locale/public intl/strres/public uriloader/base modules/libpref/public profile/public caps/idl netwerk/protocol/http/public gfx/idl gfx/public rdf/base/idl xpfe/appshell/public widget/public docshell/base layout/html/forms/public layout/base/public content/base/public dom/src/base modules/oji/public caps/include netwerk/build
 
+#
+# psm2
+#
+BM_DIRS_psm2	= $(BM_DIRS_dbm) $(BM_DIRS_js) $(BM_DIRS_xpcom) security/manager
+BM_DEP_DIRS_psm2= \
+	$(BM_DEP_DIRS_xpcom) \
+	netwerk/base/public netwerk/protocol/http/public netwerk/build \
+	netwerk/socket/base \
+	uriloader/base \
+	intl/locale/idl intl/strres/public \
+	dom/public rdf/base/idl xpfe/appshell/public \
+	caps/idl \
+	layout/html/forms/public \
+	gfx/public gfx/idl widget/public layout/base/public docshell/base \
+	modules/libpref/public \
+	content/base/public \
+	intl/locale/public
+BM_CVS_psm2	= $(BM_CVS_dbm) $(BM_CVS_js) $(BM_CVS_xpcom) security/manager \
+	dom/public
+BM_CVS_NS_psm2	= \
+	$(BM_CVS_NS_dbm) \
+	$(BM_CVS_NS_js) \
+	$(BM_CVS_NS_xpcom) \
+	netwerk/base/public netwerk/protocol/http/public netwerk/build \
+	netwerk/socket/base \
+	uriloader/base \
+	intl/locale/idl intl/strres/public \
+	rdf/base/idl xpfe/appshell/public \
+	caps/idl \
+	layout/html/forms/public \
+	gfx/public gfx/idl widget/public layout/base/public docshell/base \
+	modules/libpref/public \
+	content/base/public \
+	intl/locale/public
 
 #
 # Tally

client.mk

@@ -188,7 +188,7 @@ endif
 ####################################
 # CVS defines for PSM
 #
-PSM_CO_MODULE= mozilla/security/psm mozilla/security/Makefile.in
+PSM_CO_MODULE= mozilla/security/psm mozilla/security/manager mozilla/security/Makefile.in
 PSM_CO_FLAGS := -P -A
 ifdef PSM_CO_TAG
   PSM_CO_FLAGS := $(PSM_CO_FLAGS) -r $(PSM_CO_TAG)
@@ -242,7 +242,7 @@ endif
 ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS)))
   CVSCO_NSPR :=
 endif
-ifeq (,$(filter security, $(BUILD_MODULE_CVS)))
+ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS)))
   CVSCO_PSM :=
   CVSCO_NSS :=
 endif

security/manager/Makefile.in

@@ -56,13 +56,15 @@ DEFAULT_GMAKE_FLAGS += SOURCE_BIN_DIR=$(CORECONF_DIST)/bin
 DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(CORECONF_DIST)
 
 
-DIRS		= ssl pki
-
 include $(topsrcdir)/config/rules.mk
 
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
 
 export::
+	$(MAKE) -C ssl $@
+	$(MAKE) -C pki $@
+
+install::
 ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
 	if test ! -d $(MOZ_BUILD_ROOT)/security/nss; then                   \
 		cp -r $(topsrcdir)/security/nss $(MOZ_BUILD_ROOT)/security; \
@@ -71,18 +73,22 @@ ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
 		cp -r $(topsrcdir)/security/coreconf $(MOZ_BUILD_ROOT)/security; \
 	fi;
 endif
-	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS)
-	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) moz_import
-	cd $(MOZ_BUILD_ROOT)/security/nss/lib; gmake $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; $(MAKE) $(DEFAULT_GMAKE_FLAGS)
+	cd $(MOZ_BUILD_ROOT)/security/nss; $(MAKE) $(DEFAULT_GMAKE_FLAGS) moz_import
+	cd $(MOZ_BUILD_ROOT)/security/nss/lib; $(MAKE) $(DEFAULT_GMAKE_FLAGS)
 	$(INSTALL) -m 755 $(CORECONF_INSTALL)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
 	$(INSTALL) -m 644 $(CORECONF_INSTALL)/public $(DIST)
+	$(MAKE) -C ssl $@
+	$(MAKE) -C pki $@
 
 clean clobber clobber_all realclean distclean::
+	$(MAKE) -C ssl $@
+	$(MAKE) -C pki $@
 ifeq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-	cd $(MOZ_BUILD_ROOT)/security/coreconf; gmake $(DEFAULT_GMAKE_FLAGS) clean
-	cd $(MOZ_BUILD_ROOT)/security/nss; gmake $(DEFAULT_GMAKE_FLAGS) clean
-	cd $(MOZ_BUILD_ROOT)/security/psm/ui; gmake $(DEFAULT_GMAKE_FLAGS) clean
-	cd $(MOZ_BUILD_ROOT)/security/psm/server; gmake $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/coreconf; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/nss; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/ui; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
+	cd $(MOZ_BUILD_ROOT)/security/psm/server; $(MAKE) $(DEFAULT_GMAKE_FLAGS) clean
 else
 	if test -d $(MOZ_BUILD_ROOT)/security/nss; then \
 		rm -rf $(MOZ_BUILD_ROOT)/security/nss;  \