Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 845556, adjust Makefiles and tests to new NSS directory layout, r…
…=wtc

(Previous changeset with identical description was accidentally empty.)
  • Loading branch information
kaie committed Feb 28, 2013
1 parent e270cc7 commit aa9c525
Show file tree
Hide file tree
Showing 110 changed files with 130 additions and 147 deletions.
30 changes: 10 additions & 20 deletions Makefile
Expand Up @@ -44,18 +44,18 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################

nss_build_all: build_coreconf build_nspr build_dbm all
nss_build_all: build_coreconf build_nspr all

nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
nss_clean_all: clobber_coreconf clobber_nspr clobber

build_coreconf:
$(MAKE) -C $(CORE_DEPTH)/coreconf

clobber_coreconf:
$(MAKE) -C $(CORE_DEPTH)/coreconf clobber

NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)/config.status
NSPR_CONFIGURE = $(CORE_DEPTH)/../nsprpub/configure
NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure

#
# Translate coreconf build options to NSPR configure options.
Expand Down Expand Up @@ -96,41 +96,31 @@ USEABSPATH="NO"
endif
endif
ifeq ($(USEABSPATH),"YES")
NSPR_PREFIX = $(shell pwd)/../../dist/$(OBJDIR_NAME)
NSPR_PREFIX = $(shell pwd)/../dist/$(OBJDIR_NAME)
else
NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME)
endif

$(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
$(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \
$(NSINSTALL) -D $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \
$(NSPR_COMPILERS) sh ../configure \
$(NSPR_CONFIGURE_OPTS) \
--with-dist-prefix='$(NSPR_PREFIX)' \
--with-dist-includedir='$(NSPR_PREFIX)/include'

build_nspr: $(NSPR_CONFIG_STATUS)
$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)

clobber_nspr: $(NSPR_CONFIG_STATUS)
$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber

build_dbm:
ifdef NSS_DISABLE_DBM
@echo "skipping the build of DBM"
else
$(MAKE) -C $(CORE_DEPTH)/dbm export libs
endif
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber

build_docs:
$(MAKE) -C $(CORE_DEPTH)/nss/doc

clean_docs:
$(MAKE) -C $(CORE_DEPTH)/nss/doc clean

clobber_dbm:
$(MAKE) -C $(CORE_DEPTH)/dbm clobber

moz_import::
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
$(NSINSTALL) -D $(DIST)/include/nspr
Expand All @@ -154,7 +144,7 @@ else
endif
endif

nss_RelEng_bld: build_coreconf import build_dbm all
nss_RelEng_bld: build_coreconf import all

package:
$(MAKE) -C pkg publish
Expand Down
4 changes: 2 additions & 2 deletions cmd/Makefile
Expand Up @@ -4,8 +4,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../..
DEPTH = ../..
CORE_DEPTH = ..
DEPTH = ..

include manifest.mn
include $(CORE_DEPTH)/coreconf/config.mk
Expand Down
2 changes: 1 addition & 1 deletion cmd/addbuiltin/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/atob/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/bltest/manifest.mn
Expand Up @@ -2,7 +2,7 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/btoa/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/certcgi/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIREd.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/certutil/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

DEFINES += -DNSPR20

Expand Down
2 changes: 1 addition & 1 deletion cmd/checkcert/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/chktest/manifest.mn
Expand Up @@ -2,7 +2,7 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/crlutil/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/crmf-cgi/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..
MODULE = sectools

EXPORTS = \
Expand Down
2 changes: 1 addition & 1 deletion cmd/crmftest/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..
DEPTH = .

# MODULE public and private header directories are implicitly REQUIRED.
Expand Down
2 changes: 1 addition & 1 deletion cmd/dbck/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

DEFINES += -DNSPR20

Expand Down
2 changes: 1 addition & 1 deletion cmd/dbtest/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/derdump/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/digest/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
4 changes: 2 additions & 2 deletions cmd/ecperf/manifest.mn
Expand Up @@ -3,8 +3,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

DEPTH = ../../..
CORE_DEPTH = ../../..
DEPTH = ../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/fipstest/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/httpserv/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

DEFINES += -DNSPR20

Expand Down
2 changes: 1 addition & 1 deletion cmd/lib/manifest.mn
Expand Up @@ -2,7 +2,7 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
CORE_DEPTH = ../../..
CORE_DEPTH = ../..

LIBRARY_NAME = sectool

Expand Down
2 changes: 1 addition & 1 deletion cmd/libpkix/manifest.mn
Expand Up @@ -5,7 +5,7 @@

PKIX_DEPTH = .
PLAT_DEPTH = $(PKIX_DEPTH)/..
CORE_DEPTH = $(PKIX_DEPTH)/../../..
CORE_DEPTH = $(PKIX_DEPTH)/../..

DIRS = testutil pkix_pl pkix sample_apps perf pkixutil \
$(NULL)
2 changes: 1 addition & 1 deletion cmd/listsuites/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/lowhashtest/manifest.mn
Expand Up @@ -2,7 +2,7 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/makepqg/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

DEPTH = ../..
DEPTH = ..
# MODULE = seccmd

REQUIRES = nss nspr libdbm
Expand Down
2 changes: 1 addition & 1 deletion cmd/modutil/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = sectools

Expand Down
2 changes: 1 addition & 1 deletion cmd/multinit/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/ocspclnt/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/ocspresp/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/oidcalc/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

# MODULE public and private header directories are implicitly REQUIRED.
MODULE = nss
Expand Down
2 changes: 1 addition & 1 deletion cmd/p7content/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/p7env/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/p7sign/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/p7verify/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down
2 changes: 1 addition & 1 deletion cmd/pk11mode/manifest.mn
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

CORE_DEPTH = ../../..
CORE_DEPTH = ../..

MODULE = nss

Expand Down

0 comments on commit aa9c525

Please sign in to comment.