Sync js/src/{config,rules}.mk

This commit is contained in:
Benjamin Smedberg 2010-06-25 11:11:56 -04:00
parent f3d3d3d97b
commit 225030afcc
2 changed files with 6 additions and 0 deletions

View File

@ -87,6 +87,10 @@ core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURD
# XPI-contents staging directory for ambitious and right-thinking extensions.
FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin)
ifdef XPI_NAME
DEFINES += -DXPI_NAME=$(XPI_NAME)
endif
# MAKE_JARS_TARGET is a staging area for make-jars.pl. When packaging in
# the jar format, make-jars leaves behind a directory structure that's not
# needed in $(FINAL_TARGET). For both, flat, and symlink, the directory

View File

@ -1809,9 +1809,11 @@ endif # MOZ_JAVAXPCOM
# Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
ifneq (,$(filter %.js,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS)))
ifeq (,$(filter %.manifest,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS)))
ifndef NO_JS_MANIFEST
$(error .js component without matching .manifest)
endif
endif
endif
ifdef EXTRA_COMPONENTS
libs:: $(EXTRA_COMPONENTS)