зеркало из https://github.com/mozilla/pjs.git
bug 662833 - split rules.mk, dup *.mk beneath js/src/config
This commit is contained in:
Joey Armstrong
Родитель
4c11a49069
Коммит
c0637bd9f8
|
|
@ -0,0 +1,68 @@
|
||||||
|
# -*- makefile -*-
|
||||||
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
|
#
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# The Mozilla Foundation
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Chase Phillips <chase@mozilla.org>
|
||||||
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
PARALLEL_DIRS_export = $(addsuffix _export,$(PARALLEL_DIRS))
|
||||||
|
|
||||||
|
.PHONY: export $(PARALLEL_DIRS_export)
|
||||||
|
|
||||||
|
###############
|
||||||
|
## TIER targets
|
||||||
|
###############
|
||||||
|
export_tier_%:
|
||||||
|
@$(ECHO) "$@"
|
||||||
|
@$(MAKE_TIER_SUBMAKEFILES)
|
||||||
|
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,export,$(dir)))
|
||||||
|
|
||||||
|
#################
|
||||||
|
## Common targets
|
||||||
|
#################
|
||||||
|
ifdef PARALLEL_DIRS
|
||||||
|
export:: $(PARALLEL_DIRS_export)
|
||||||
|
|
||||||
|
$(PARALLEL_DIRS_export): %_export: %/Makefile
|
||||||
|
+@$(call SUBMAKE,export,$*)
|
||||||
|
endif
|
||||||
|
|
||||||
|
export:: $(SUBMAKEFILES) $(MAKE_DIRS) $(if $(XPIDLSRCS),$(IDL_DIR))
|
||||||
|
$(LOOP_OVER_DIRS)
|
||||||
|
$(LOOP_OVER_TOOL_DIRS)
|
||||||
|
|
@ -0,0 +1,141 @@
|
||||||
|
# -*- makefile -*-
|
||||||
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
|
#
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# The Mozilla Foundation
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Chase Phillips <chase@mozilla.org>
|
||||||
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
PARALLEL_DIRS_libs = $(addsuffix _libs,$(PARALLEL_DIRS))
|
||||||
|
|
||||||
|
.PHONY: libs $(PARALLEL_DIRS_libs)
|
||||||
|
|
||||||
|
###############
|
||||||
|
## TIER targets
|
||||||
|
###############
|
||||||
|
libs_tier_%:
|
||||||
|
@$(ECHO) "$@"
|
||||||
|
@$(MAKE_TIER_SUBMAKEFILES)
|
||||||
|
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,libs,$(dir)))
|
||||||
|
|
||||||
|
#################
|
||||||
|
## Common targets
|
||||||
|
#################
|
||||||
|
ifdef PARALLEL_DIRS
|
||||||
|
libs:: $(PARALLEL_DIRS_libs)
|
||||||
|
|
||||||
|
$(PARALLEL_DIRS_libs): %_libs: %/Makefile
|
||||||
|
+@$(call SUBMAKE,libs,$*)
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
####################
|
||||||
|
##
|
||||||
|
####################
|
||||||
|
ifdef EXPORT_LIBRARY
|
||||||
|
ifeq ($(EXPORT_LIBRARY),1)
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
EXPORT_LIBRARY = $(DEPTH)/staticlib/components
|
||||||
|
else
|
||||||
|
EXPORT_LIBRARY = $(DEPTH)/staticlib
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
# If EXPORT_LIBRARY has a value, we'll be installing there. We also need to cleanup there
|
||||||
|
GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib))
|
||||||
|
endif
|
||||||
|
endif # EXPORT_LIBRARY
|
||||||
|
|
||||||
|
libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
|
||||||
|
ifndef NO_DIST_INSTALL
|
||||||
|
ifdef LIBRARY
|
||||||
|
ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build
|
||||||
|
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(EXPORT_LIBRARY)
|
||||||
|
endif # EXPORT_LIBRARY
|
||||||
|
ifdef DIST_INSTALL
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
$(error Shipping static component libs makes no sense.)
|
||||||
|
else
|
||||||
|
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
|
||||||
|
endif
|
||||||
|
endif # DIST_INSTALL
|
||||||
|
endif # LIBRARY
|
||||||
|
ifdef SHARED_LIBRARY
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
|
||||||
|
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
|
||||||
|
ifndef NO_COMPONENTS_MANIFEST
|
||||||
|
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest"
|
||||||
|
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
|
||||||
|
endif
|
||||||
|
else # ! IS_COMPONENT
|
||||||
|
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||||
|
ifndef NO_INSTALL_IMPORT_LIBRARY
|
||||||
|
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
|
||||||
|
endif
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
|
||||||
|
endif # IS_COMPONENT
|
||||||
|
endif # SHARED_LIBRARY
|
||||||
|
ifdef PROGRAM
|
||||||
|
$(INSTALL) $(IFLAGS2) $(PROGRAM) $(FINAL_TARGET)
|
||||||
|
endif
|
||||||
|
ifdef SIMPLE_PROGRAMS
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(FINAL_TARGET)
|
||||||
|
endif
|
||||||
|
ifdef HOST_PROGRAM
|
||||||
|
$(INSTALL) $(IFLAGS2) $(HOST_PROGRAM) $(DIST)/host/bin
|
||||||
|
endif
|
||||||
|
ifdef HOST_SIMPLE_PROGRAMS
|
||||||
|
$(INSTALL) $(IFLAGS2) $(HOST_SIMPLE_PROGRAMS) $(DIST)/host/bin
|
||||||
|
endif
|
||||||
|
ifdef HOST_LIBRARY
|
||||||
|
$(INSTALL) $(IFLAGS1) $(HOST_LIBRARY) $(DIST)/host/lib
|
||||||
|
endif
|
||||||
|
ifdef JAVA_LIBRARY
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)/components
|
||||||
|
else
|
||||||
|
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)
|
||||||
|
endif
|
||||||
|
endif # JAVA_LIBRARY
|
||||||
|
endif # !NO_DIST_INSTALL
|
||||||
|
$(LOOP_OVER_DIRS)
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
# -*- makefile -*-
|
||||||
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
|
#
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# The Mozilla Foundation
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Chase Phillips <chase@mozilla.org>
|
||||||
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
PARALLEL_DIRS_tools = $(addsuffix _tools,$(PARALLEL_DIRS))
|
||||||
|
|
||||||
|
.PHONY: tools $(PARALLEL_DIRS_tools)
|
||||||
|
|
||||||
|
###############
|
||||||
|
## TIER targets
|
||||||
|
###############
|
||||||
|
tools_tier_%:
|
||||||
|
@$(ECHO) "$@"
|
||||||
|
@$(MAKE_TIER_SUBMAKEFILES)
|
||||||
|
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,tools,$(dir)))
|
||||||
|
|
||||||
|
#################
|
||||||
|
## Common targets
|
||||||
|
#################
|
||||||
|
ifdef PARALLEL_DIRS
|
||||||
|
tools:: $(PARALLEL_DIRS_tools)
|
||||||
|
|
||||||
|
$(PARALLEL_DIRS_tools): %_tools: %/Makefile
|
||||||
|
+@$(call SUBMAKE,tools,$*)
|
||||||
|
endif
|
||||||
|
|
||||||
|
tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
|
||||||
|
$(LOOP_OVER_DIRS)
|
||||||
|
ifneq (,$(strip $(TOOL_DIRS)))
|
||||||
|
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,libs,$(dir)))
|
||||||
|
endif
|
||||||
|
|
||||||
|
# EOF
|
||||||
130
config/rules.mk
130
config/rules.mk
|
|
@ -1,3 +1,4 @@
|
||||||
|
# -*- makefile -*-
|
||||||
# vim:set ts=8 sw=8 sts=8 noet:
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
#
|
#
|
||||||
# ***** BEGIN LICENSE BLOCK *****
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
@ -24,6 +25,7 @@
|
||||||
# Chase Phillips <chase@mozilla.org>
|
# Chase Phillips <chase@mozilla.org>
|
||||||
# Benjamin Smedberg <benjamin@smedbergs.us>
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
# Jeff Walden <jwalden+code@mit.edu>
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
#
|
#
|
||||||
# Alternatively, the contents of this file may be used under the terms of
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
|
@ -489,15 +491,6 @@ LOOP_OVER_TOOL_DIRS = \
|
||||||
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,$@,$(dir)))
|
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,$@,$(dir)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef PARALLEL_DIRS
|
|
||||||
# create a bunch of fake targets for order-only processing
|
|
||||||
PARALLEL_DIRS_export = $(addsuffix _export,$(PARALLEL_DIRS))
|
|
||||||
PARALLEL_DIRS_libs = $(addsuffix _libs,$(PARALLEL_DIRS))
|
|
||||||
PARALLEL_DIRS_tools = $(addsuffix _tools,$(PARALLEL_DIRS))
|
|
||||||
|
|
||||||
.PHONY: $(PARALLEL_DIRS_export) $(PARALLEL_DIRS_libs) $(PARALLEL_DIRS_tools)
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Now we can differentiate between objects used to build a library, and
|
# Now we can differentiate between objects used to build a library, and
|
||||||
# objects used to build an executable in the same directory.
|
# objects used to build an executable in the same directory.
|
||||||
|
|
@ -736,21 +729,6 @@ endif
|
||||||
|
|
||||||
MAKE_TIER_SUBMAKEFILES = +$(if $(tier_$*_dirs),$(MAKE) $(addsuffix /Makefile,$(tier_$*_dirs)))
|
MAKE_TIER_SUBMAKEFILES = +$(if $(tier_$*_dirs),$(MAKE) $(addsuffix /Makefile,$(tier_$*_dirs)))
|
||||||
|
|
||||||
export_tier_%:
|
|
||||||
@$(ECHO) "$@"
|
|
||||||
@$(MAKE_TIER_SUBMAKEFILES)
|
|
||||||
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,export,$(dir)))
|
|
||||||
|
|
||||||
libs_tier_%:
|
|
||||||
@$(ECHO) "$@"
|
|
||||||
@$(MAKE_TIER_SUBMAKEFILES)
|
|
||||||
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,libs,$(dir)))
|
|
||||||
|
|
||||||
tools_tier_%:
|
|
||||||
@$(ECHO) "$@"
|
|
||||||
@$(MAKE_TIER_SUBMAKEFILES)
|
|
||||||
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,tools,$(dir)))
|
|
||||||
|
|
||||||
$(foreach tier,$(TIERS),tier_$(tier))::
|
$(foreach tier,$(TIERS),tier_$(tier))::
|
||||||
@$(ECHO) "$@: $($@_staticdirs) $($@_dirs)"
|
@$(ECHO) "$@: $($@_staticdirs) $($@_dirs)"
|
||||||
$(foreach dir,$($@_staticdirs),$(call SUBMAKE,,$(dir)))
|
$(foreach dir,$($@_staticdirs),$(call SUBMAKE,,$(dir)))
|
||||||
|
|
@ -774,29 +752,8 @@ ifneq (,$(DIRS)$(TOOL_DIRS)$(PARALLEL_DIRS))
|
||||||
$(LOOP_OVER_TOOL_DIRS)
|
$(LOOP_OVER_TOOL_DIRS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef PARALLEL_DIRS
|
include $(topsrcdir)/config/makefiles/target_export.mk
|
||||||
export:: $(PARALLEL_DIRS_export)
|
include $(topsrcdir)/config/makefiles/target_tools.mk
|
||||||
|
|
||||||
$(PARALLEL_DIRS_export): %_export: %/Makefile
|
|
||||||
+@$(call SUBMAKE,export,$*)
|
|
||||||
endif
|
|
||||||
|
|
||||||
export:: $(SUBMAKEFILES) $(MAKE_DIRS) $(if $(XPIDLSRCS),$(IDL_DIR))
|
|
||||||
$(LOOP_OVER_DIRS)
|
|
||||||
$(LOOP_OVER_TOOL_DIRS)
|
|
||||||
|
|
||||||
ifdef PARALLEL_DIRS
|
|
||||||
tools:: $(PARALLEL_DIRS_tools)
|
|
||||||
|
|
||||||
$(PARALLEL_DIRS_tools): %_tools: %/Makefile
|
|
||||||
+@$(call SUBMAKE,tools,$*)
|
|
||||||
endif
|
|
||||||
|
|
||||||
tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
|
|
||||||
$(LOOP_OVER_DIRS)
|
|
||||||
ifneq (,$(strip $(TOOL_DIRS)))
|
|
||||||
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,libs,$(dir)))
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Rule to create list of libraries for final link
|
# Rule to create list of libraries for final link
|
||||||
|
|
@ -826,86 +783,9 @@ DSO_LDOPTS_DEPS = $(call DO_EXPAND_LIBS,$(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFI
|
||||||
GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
|
GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
|
||||||
|
|
||||||
##############################################
|
##############################################
|
||||||
ifdef PARALLEL_DIRS
|
include $(topsrcdir)/config/makefiles/target_libs.mk
|
||||||
libs:: $(PARALLEL_DIRS_libs)
|
|
||||||
|
|
||||||
$(PARALLEL_DIRS_libs): %_libs: %/Makefile
|
|
||||||
+@$(call SUBMAKE,libs,$*)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef EXPORT_LIBRARY
|
|
||||||
ifeq ($(EXPORT_LIBRARY),1)
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
EXPORT_LIBRARY = $(DEPTH)/staticlib/components
|
|
||||||
else
|
|
||||||
EXPORT_LIBRARY = $(DEPTH)/staticlib
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
# If EXPORT_LIBRARY has a value, we'll be installing there. We also need to cleanup there
|
|
||||||
GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib))
|
|
||||||
endif
|
|
||||||
endif # EXPORT_LIBRARY
|
|
||||||
|
|
||||||
libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
|
|
||||||
ifndef NO_DIST_INSTALL
|
|
||||||
ifdef LIBRARY
|
|
||||||
ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build
|
|
||||||
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(EXPORT_LIBRARY)
|
|
||||||
endif # EXPORT_LIBRARY
|
|
||||||
ifdef DIST_INSTALL
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
$(error Shipping static component libs makes no sense.)
|
|
||||||
else
|
|
||||||
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
|
|
||||||
endif
|
|
||||||
endif # DIST_INSTALL
|
|
||||||
endif # LIBRARY
|
|
||||||
ifdef SHARED_LIBRARY
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
|
|
||||||
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
|
|
||||||
ifndef NO_COMPONENTS_MANIFEST
|
|
||||||
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest"
|
|
||||||
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
|
|
||||||
endif
|
|
||||||
else # ! IS_COMPONENT
|
|
||||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
|
||||||
ifndef NO_INSTALL_IMPORT_LIBRARY
|
|
||||||
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
|
|
||||||
endif
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
|
|
||||||
endif # IS_COMPONENT
|
|
||||||
endif # SHARED_LIBRARY
|
|
||||||
ifdef PROGRAM
|
|
||||||
$(INSTALL) $(IFLAGS2) $(PROGRAM) $(FINAL_TARGET)
|
|
||||||
endif
|
|
||||||
ifdef SIMPLE_PROGRAMS
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(FINAL_TARGET)
|
|
||||||
endif
|
|
||||||
ifdef HOST_PROGRAM
|
|
||||||
$(INSTALL) $(IFLAGS2) $(HOST_PROGRAM) $(DIST)/host/bin
|
|
||||||
endif
|
|
||||||
ifdef HOST_SIMPLE_PROGRAMS
|
|
||||||
$(INSTALL) $(IFLAGS2) $(HOST_SIMPLE_PROGRAMS) $(DIST)/host/bin
|
|
||||||
endif
|
|
||||||
ifdef HOST_LIBRARY
|
|
||||||
$(INSTALL) $(IFLAGS1) $(HOST_LIBRARY) $(DIST)/host/lib
|
|
||||||
endif
|
|
||||||
ifdef JAVA_LIBRARY
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)/components
|
|
||||||
else
|
|
||||||
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)
|
|
||||||
endif
|
|
||||||
endif # JAVA_LIBRARY
|
|
||||||
endif # !NO_DIST_INSTALL
|
|
||||||
$(LOOP_OVER_DIRS)
|
|
||||||
|
|
||||||
##############################################
|
##############################################
|
||||||
|
|
||||||
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
||||||
ifdef MOZ_PROFILE_USE
|
ifdef MOZ_PROFILE_USE
|
||||||
ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
# -*- makefile -*-
|
||||||
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
|
#
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# The Mozilla Foundation
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Chase Phillips <chase@mozilla.org>
|
||||||
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
PARALLEL_DIRS_export = $(addsuffix _export,$(PARALLEL_DIRS))
|
||||||
|
|
||||||
|
.PHONY: export $(PARALLEL_DIRS_export)
|
||||||
|
|
||||||
|
###############
|
||||||
|
## TIER targets
|
||||||
|
###############
|
||||||
|
export_tier_%:
|
||||||
|
@$(ECHO) "$@"
|
||||||
|
@$(MAKE_TIER_SUBMAKEFILES)
|
||||||
|
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,export,$(dir)))
|
||||||
|
|
||||||
|
#################
|
||||||
|
## Common targets
|
||||||
|
#################
|
||||||
|
ifdef PARALLEL_DIRS
|
||||||
|
export:: $(PARALLEL_DIRS_export)
|
||||||
|
|
||||||
|
$(PARALLEL_DIRS_export): %_export: %/Makefile
|
||||||
|
+@$(call SUBMAKE,export,$*)
|
||||||
|
endif
|
||||||
|
|
||||||
|
export:: $(SUBMAKEFILES) $(MAKE_DIRS) $(if $(XPIDLSRCS),$(IDL_DIR))
|
||||||
|
$(LOOP_OVER_DIRS)
|
||||||
|
$(LOOP_OVER_TOOL_DIRS)
|
||||||
|
|
@ -0,0 +1,141 @@
|
||||||
|
# -*- makefile -*-
|
||||||
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
|
#
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# The Mozilla Foundation
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Chase Phillips <chase@mozilla.org>
|
||||||
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
PARALLEL_DIRS_libs = $(addsuffix _libs,$(PARALLEL_DIRS))
|
||||||
|
|
||||||
|
.PHONY: libs $(PARALLEL_DIRS_libs)
|
||||||
|
|
||||||
|
###############
|
||||||
|
## TIER targets
|
||||||
|
###############
|
||||||
|
libs_tier_%:
|
||||||
|
@$(ECHO) "$@"
|
||||||
|
@$(MAKE_TIER_SUBMAKEFILES)
|
||||||
|
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,libs,$(dir)))
|
||||||
|
|
||||||
|
#################
|
||||||
|
## Common targets
|
||||||
|
#################
|
||||||
|
ifdef PARALLEL_DIRS
|
||||||
|
libs:: $(PARALLEL_DIRS_libs)
|
||||||
|
|
||||||
|
$(PARALLEL_DIRS_libs): %_libs: %/Makefile
|
||||||
|
+@$(call SUBMAKE,libs,$*)
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
####################
|
||||||
|
##
|
||||||
|
####################
|
||||||
|
ifdef EXPORT_LIBRARY
|
||||||
|
ifeq ($(EXPORT_LIBRARY),1)
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
EXPORT_LIBRARY = $(DEPTH)/staticlib/components
|
||||||
|
else
|
||||||
|
EXPORT_LIBRARY = $(DEPTH)/staticlib
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
# If EXPORT_LIBRARY has a value, we'll be installing there. We also need to cleanup there
|
||||||
|
GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib))
|
||||||
|
endif
|
||||||
|
endif # EXPORT_LIBRARY
|
||||||
|
|
||||||
|
libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
|
||||||
|
ifndef NO_DIST_INSTALL
|
||||||
|
ifdef LIBRARY
|
||||||
|
ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build
|
||||||
|
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(EXPORT_LIBRARY)
|
||||||
|
endif # EXPORT_LIBRARY
|
||||||
|
ifdef DIST_INSTALL
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
$(error Shipping static component libs makes no sense.)
|
||||||
|
else
|
||||||
|
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
|
||||||
|
endif
|
||||||
|
endif # DIST_INSTALL
|
||||||
|
endif # LIBRARY
|
||||||
|
ifdef SHARED_LIBRARY
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
|
||||||
|
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
|
||||||
|
ifndef NO_COMPONENTS_MANIFEST
|
||||||
|
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest"
|
||||||
|
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
|
||||||
|
endif
|
||||||
|
else # ! IS_COMPONENT
|
||||||
|
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||||
|
ifndef NO_INSTALL_IMPORT_LIBRARY
|
||||||
|
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
|
||||||
|
endif
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
|
||||||
|
endif # IS_COMPONENT
|
||||||
|
endif # SHARED_LIBRARY
|
||||||
|
ifdef PROGRAM
|
||||||
|
$(INSTALL) $(IFLAGS2) $(PROGRAM) $(FINAL_TARGET)
|
||||||
|
endif
|
||||||
|
ifdef SIMPLE_PROGRAMS
|
||||||
|
$(INSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(FINAL_TARGET)
|
||||||
|
endif
|
||||||
|
ifdef HOST_PROGRAM
|
||||||
|
$(INSTALL) $(IFLAGS2) $(HOST_PROGRAM) $(DIST)/host/bin
|
||||||
|
endif
|
||||||
|
ifdef HOST_SIMPLE_PROGRAMS
|
||||||
|
$(INSTALL) $(IFLAGS2) $(HOST_SIMPLE_PROGRAMS) $(DIST)/host/bin
|
||||||
|
endif
|
||||||
|
ifdef HOST_LIBRARY
|
||||||
|
$(INSTALL) $(IFLAGS1) $(HOST_LIBRARY) $(DIST)/host/lib
|
||||||
|
endif
|
||||||
|
ifdef JAVA_LIBRARY
|
||||||
|
ifdef IS_COMPONENT
|
||||||
|
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)/components
|
||||||
|
else
|
||||||
|
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)
|
||||||
|
endif
|
||||||
|
endif # JAVA_LIBRARY
|
||||||
|
endif # !NO_DIST_INSTALL
|
||||||
|
$(LOOP_OVER_DIRS)
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
# -*- makefile -*-
|
||||||
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
|
#
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# The Mozilla Foundation
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Chase Phillips <chase@mozilla.org>
|
||||||
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
PARALLEL_DIRS_tools = $(addsuffix _tools,$(PARALLEL_DIRS))
|
||||||
|
|
||||||
|
.PHONY: tools $(PARALLEL_DIRS_tools)
|
||||||
|
|
||||||
|
###############
|
||||||
|
## TIER targets
|
||||||
|
###############
|
||||||
|
tools_tier_%:
|
||||||
|
@$(ECHO) "$@"
|
||||||
|
@$(MAKE_TIER_SUBMAKEFILES)
|
||||||
|
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,tools,$(dir)))
|
||||||
|
|
||||||
|
#################
|
||||||
|
## Common targets
|
||||||
|
#################
|
||||||
|
ifdef PARALLEL_DIRS
|
||||||
|
tools:: $(PARALLEL_DIRS_tools)
|
||||||
|
|
||||||
|
$(PARALLEL_DIRS_tools): %_tools: %/Makefile
|
||||||
|
+@$(call SUBMAKE,tools,$*)
|
||||||
|
endif
|
||||||
|
|
||||||
|
tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
|
||||||
|
$(LOOP_OVER_DIRS)
|
||||||
|
ifneq (,$(strip $(TOOL_DIRS)))
|
||||||
|
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,libs,$(dir)))
|
||||||
|
endif
|
||||||
|
|
||||||
|
# EOF
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
# -*- makefile -*-
|
||||||
# vim:set ts=8 sw=8 sts=8 noet:
|
# vim:set ts=8 sw=8 sts=8 noet:
|
||||||
#
|
#
|
||||||
# ***** BEGIN LICENSE BLOCK *****
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
@ -24,6 +25,7 @@
|
||||||
# Chase Phillips <chase@mozilla.org>
|
# Chase Phillips <chase@mozilla.org>
|
||||||
# Benjamin Smedberg <benjamin@smedbergs.us>
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
# Jeff Walden <jwalden+code@mit.edu>
|
# Jeff Walden <jwalden+code@mit.edu>
|
||||||
|
# Joey Armstrong <joey@mozilla.com>
|
||||||
#
|
#
|
||||||
# Alternatively, the contents of this file may be used under the terms of
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||||
|
|
@ -489,15 +491,6 @@ LOOP_OVER_TOOL_DIRS = \
|
||||||
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,$@,$(dir)))
|
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,$@,$(dir)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef PARALLEL_DIRS
|
|
||||||
# create a bunch of fake targets for order-only processing
|
|
||||||
PARALLEL_DIRS_export = $(addsuffix _export,$(PARALLEL_DIRS))
|
|
||||||
PARALLEL_DIRS_libs = $(addsuffix _libs,$(PARALLEL_DIRS))
|
|
||||||
PARALLEL_DIRS_tools = $(addsuffix _tools,$(PARALLEL_DIRS))
|
|
||||||
|
|
||||||
.PHONY: $(PARALLEL_DIRS_export) $(PARALLEL_DIRS_libs) $(PARALLEL_DIRS_tools)
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Now we can differentiate between objects used to build a library, and
|
# Now we can differentiate between objects used to build a library, and
|
||||||
# objects used to build an executable in the same directory.
|
# objects used to build an executable in the same directory.
|
||||||
|
|
@ -736,21 +729,6 @@ endif
|
||||||
|
|
||||||
MAKE_TIER_SUBMAKEFILES = +$(if $(tier_$*_dirs),$(MAKE) $(addsuffix /Makefile,$(tier_$*_dirs)))
|
MAKE_TIER_SUBMAKEFILES = +$(if $(tier_$*_dirs),$(MAKE) $(addsuffix /Makefile,$(tier_$*_dirs)))
|
||||||
|
|
||||||
export_tier_%:
|
|
||||||
@$(ECHO) "$@"
|
|
||||||
@$(MAKE_TIER_SUBMAKEFILES)
|
|
||||||
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,export,$(dir)))
|
|
||||||
|
|
||||||
libs_tier_%:
|
|
||||||
@$(ECHO) "$@"
|
|
||||||
@$(MAKE_TIER_SUBMAKEFILES)
|
|
||||||
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,libs,$(dir)))
|
|
||||||
|
|
||||||
tools_tier_%:
|
|
||||||
@$(ECHO) "$@"
|
|
||||||
@$(MAKE_TIER_SUBMAKEFILES)
|
|
||||||
$(foreach dir,$(tier_$*_dirs),$(call SUBMAKE,tools,$(dir)))
|
|
||||||
|
|
||||||
$(foreach tier,$(TIERS),tier_$(tier))::
|
$(foreach tier,$(TIERS),tier_$(tier))::
|
||||||
@$(ECHO) "$@: $($@_staticdirs) $($@_dirs)"
|
@$(ECHO) "$@: $($@_staticdirs) $($@_dirs)"
|
||||||
$(foreach dir,$($@_staticdirs),$(call SUBMAKE,,$(dir)))
|
$(foreach dir,$($@_staticdirs),$(call SUBMAKE,,$(dir)))
|
||||||
|
|
@ -774,29 +752,8 @@ ifneq (,$(DIRS)$(TOOL_DIRS)$(PARALLEL_DIRS))
|
||||||
$(LOOP_OVER_TOOL_DIRS)
|
$(LOOP_OVER_TOOL_DIRS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef PARALLEL_DIRS
|
include $(topsrcdir)/config/makefiles/target_export.mk
|
||||||
export:: $(PARALLEL_DIRS_export)
|
include $(topsrcdir)/config/makefiles/target_tools.mk
|
||||||
|
|
||||||
$(PARALLEL_DIRS_export): %_export: %/Makefile
|
|
||||||
+@$(call SUBMAKE,export,$*)
|
|
||||||
endif
|
|
||||||
|
|
||||||
export:: $(SUBMAKEFILES) $(MAKE_DIRS) $(if $(XPIDLSRCS),$(IDL_DIR))
|
|
||||||
$(LOOP_OVER_DIRS)
|
|
||||||
$(LOOP_OVER_TOOL_DIRS)
|
|
||||||
|
|
||||||
ifdef PARALLEL_DIRS
|
|
||||||
tools:: $(PARALLEL_DIRS_tools)
|
|
||||||
|
|
||||||
$(PARALLEL_DIRS_tools): %_tools: %/Makefile
|
|
||||||
+@$(call SUBMAKE,tools,$*)
|
|
||||||
endif
|
|
||||||
|
|
||||||
tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
|
|
||||||
$(LOOP_OVER_DIRS)
|
|
||||||
ifneq (,$(strip $(TOOL_DIRS)))
|
|
||||||
$(foreach dir,$(TOOL_DIRS),$(call SUBMAKE,libs,$(dir)))
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Rule to create list of libraries for final link
|
# Rule to create list of libraries for final link
|
||||||
|
|
@ -826,86 +783,9 @@ DSO_LDOPTS_DEPS = $(call DO_EXPAND_LIBS,$(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFI
|
||||||
GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
|
GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
|
||||||
|
|
||||||
##############################################
|
##############################################
|
||||||
ifdef PARALLEL_DIRS
|
include $(topsrcdir)/config/makefiles/target_libs.mk
|
||||||
libs:: $(PARALLEL_DIRS_libs)
|
|
||||||
|
|
||||||
$(PARALLEL_DIRS_libs): %_libs: %/Makefile
|
|
||||||
+@$(call SUBMAKE,libs,$*)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef EXPORT_LIBRARY
|
|
||||||
ifeq ($(EXPORT_LIBRARY),1)
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
EXPORT_LIBRARY = $(DEPTH)/staticlib/components
|
|
||||||
else
|
|
||||||
EXPORT_LIBRARY = $(DEPTH)/staticlib
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
# If EXPORT_LIBRARY has a value, we'll be installing there. We also need to cleanup there
|
|
||||||
GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib))
|
|
||||||
endif
|
|
||||||
endif # EXPORT_LIBRARY
|
|
||||||
|
|
||||||
libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
|
|
||||||
ifndef NO_DIST_INSTALL
|
|
||||||
ifdef LIBRARY
|
|
||||||
ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build
|
|
||||||
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(EXPORT_LIBRARY)
|
|
||||||
endif # EXPORT_LIBRARY
|
|
||||||
ifdef DIST_INSTALL
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
$(error Shipping static component libs makes no sense.)
|
|
||||||
else
|
|
||||||
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
|
|
||||||
endif
|
|
||||||
endif # DIST_INSTALL
|
|
||||||
endif # LIBRARY
|
|
||||||
ifdef SHARED_LIBRARY
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
|
|
||||||
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
|
|
||||||
ifndef NO_COMPONENTS_MANIFEST
|
|
||||||
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "manifest components/components.manifest"
|
|
||||||
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.manifest "binary-component $(SHARED_LIBRARY)"
|
|
||||||
endif
|
|
||||||
else # ! IS_COMPONENT
|
|
||||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
|
||||||
ifndef NO_INSTALL_IMPORT_LIBRARY
|
|
||||||
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
|
|
||||||
endif
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
|
|
||||||
endif # IS_COMPONENT
|
|
||||||
endif # SHARED_LIBRARY
|
|
||||||
ifdef PROGRAM
|
|
||||||
$(INSTALL) $(IFLAGS2) $(PROGRAM) $(FINAL_TARGET)
|
|
||||||
endif
|
|
||||||
ifdef SIMPLE_PROGRAMS
|
|
||||||
$(INSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(FINAL_TARGET)
|
|
||||||
endif
|
|
||||||
ifdef HOST_PROGRAM
|
|
||||||
$(INSTALL) $(IFLAGS2) $(HOST_PROGRAM) $(DIST)/host/bin
|
|
||||||
endif
|
|
||||||
ifdef HOST_SIMPLE_PROGRAMS
|
|
||||||
$(INSTALL) $(IFLAGS2) $(HOST_SIMPLE_PROGRAMS) $(DIST)/host/bin
|
|
||||||
endif
|
|
||||||
ifdef HOST_LIBRARY
|
|
||||||
$(INSTALL) $(IFLAGS1) $(HOST_LIBRARY) $(DIST)/host/lib
|
|
||||||
endif
|
|
||||||
ifdef JAVA_LIBRARY
|
|
||||||
ifdef IS_COMPONENT
|
|
||||||
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)/components
|
|
||||||
else
|
|
||||||
$(INSTALL) $(IFLAGS1) $(JAVA_LIBRARY) $(FINAL_TARGET)
|
|
||||||
endif
|
|
||||||
endif # JAVA_LIBRARY
|
|
||||||
endif # !NO_DIST_INSTALL
|
|
||||||
$(LOOP_OVER_DIRS)
|
|
||||||
|
|
||||||
##############################################
|
##############################################
|
||||||
|
|
||||||
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
||||||
ifdef MOZ_PROFILE_USE
|
ifdef MOZ_PROFILE_USE
|
||||||
ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче