diff options
| author | Kai Engert <kaie@kuix.de> | 2013-02-28 15:00:17 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2013-02-28 15:00:17 +0100 |
| commit | e790c9abc4b1c03006bffbbd1bb3a4cfafc62bb2 (patch) | |
| tree | 638768c16526145d21afb41ba514ddbf49b63291 /Makefile | |
| parent | 0e5c950db67127f08bc69b1f91fdeed7073c286b (diff) | |
| download | nss-hg-e790c9abc4b1c03006bffbbd1bb3a4cfafc62bb2.tar.gz | |
Bug 845556, adjust Makefiles and tests to new NSS directory layout, r=wtc
(Previous changeset with identical description was accidentally empty.)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 30 |
1 files changed, 10 insertions, 20 deletions
@@ -44,9 +44,9 @@ 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 @@ -54,8 +54,8 @@ build_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. @@ -96,31 +96,24 @@ 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 @@ -128,9 +121,6 @@ build_docs: 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 @@ -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 |