2006-08-29 16:53:40 +00:00
|
|
|
# ***** 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 the Mozilla build system.
|
|
|
|
#
|
|
|
|
# The Initial Developer of the Original Code is
|
|
|
|
# the Mozilla Foundation <http://www.mozilla.org/>.
|
|
|
|
# Portions created by the Initial Developer are Copyright (C) 2006
|
|
|
|
# the Initial Developer. All Rights Reserved.
|
|
|
|
#
|
|
|
|
# Contributor(s):
|
2006-12-11 09:45:41 +00:00
|
|
|
# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
|
2006-08-29 16:53:40 +00:00
|
|
|
#
|
|
|
|
# Alternatively, the contents of this file may be used under the terms of
|
|
|
|
# either 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 *****
|
|
|
|
|
|
|
|
ifdef LIBXUL_SDK
|
|
|
|
$(error toolkit-tiers.mk is not compatible with --enable-libxul-sdk=)
|
|
|
|
endif
|
|
|
|
|
|
|
|
include $(topsrcdir)/config/nspr/build.mk
|
Bug 97954: Allow SpiderMonkey to be built on its own, or as part of Mozilla.
Give SpiderMonkey its own configure script and top-level Makefile.
Adjust js/src/Makefile as appropriate for life as a stand-alone
makefile, instead of a 'make export; make libs'-style Mozilla tier
makefile. Have the configure script accept '--with-nspr-cflags' and
'--with-nspr-libs' options for using an in-tree NSPR. Also accept
'--with-system-nspr', '--with-nspr-prefix', and
'--with-nspr-exec-prefix' flags for using an installed NSPR. Default
to --disable-jemalloc, assuming we don't have that part of the tree
available; have the top-level configure script pass --enable-jemalloc
as needed.
Since we no longer have an export phase to copy header files into
dist/include/js before we build the library, we need to be able to
find nanojit.h in the nanojit directory; fix references in
jsbuiltins.h and jstracer.cpp.
Give SpiderMonkey it its own copies of many of the files from ./config
and ./build. These are all exact copies, except as follows:
. js/src/config/Makefile.in: js/src only has a subset of
js/src/config, and thus a subset of the makefile targets.
. js/src/config/autoconf.mk.in: js/src/configure.in has its own make
variables to set, not set by the top-level configure script, so it
needs a custom automake.mk template.
. js/src/config/make-system-wrappers.pl: a copy from nsprpub/config,
so that we can build without having an NSPR source tree handy.
Invoke js/src/configure from ./configure, passing the values computed
for NSPR_CFLAGS and NSPR_LIBS by the top-level configure script.
Treat js/src as a static directory of the js tier, and create a new
config/js (just a Makefile) to be the js tier's non-static directory.
Let js/src/configure generate SpiderMonkey's makefiles, not
./configure.
Generate a 'js-config' script, which clients can call to find the
CFLAGS and LIBS values necessary to compile and link against an
installed SpiderMonkey library. Don't include the js-config script in
Macintosh packages.
Teach client.mk how to rebuild js/src/configure.
Tell Mercurial to ignore files generated by autoconf in js/src.
Further work:
. Right now, callers must define JS_THREADSAFE when #including jsapi.h.
This is fixed in a subsequent patch.
. js/src/configure is a trimmed copy of ./configure. It could be
trimmed more.
--HG--
rename : build/autoconf/acoutput-fast.pl => js/src/build/autoconf/acoutput-fast.pl
rename : build/autoconf/altoptions.m4 => js/src/build/autoconf/altoptions.m4
rename : build/autoconf/config.guess => js/src/build/autoconf/config.guess
rename : build/autoconf/config.sub => js/src/build/autoconf/config.sub
rename : build/autoconf/glib.m4 => js/src/build/autoconf/glib.m4
rename : build/autoconf/install-sh => js/src/build/autoconf/install-sh
rename : build/autoconf/make-makefile => js/src/build/autoconf/make-makefile
rename : build/autoconf/match-dir.sh => js/src/build/autoconf/match-dir.sh
rename : build/autoconf/nspr.m4 => js/src/build/autoconf/nspr.m4
rename : build/autoconf/pkg.m4 => js/src/build/autoconf/pkg.m4
rename : build/autoconf/update-makefile.sh => js/src/build/autoconf/update-makefile.sh
rename : build/cygwin-wrapper => js/src/build/cygwin-wrapper
rename : build/hcc => js/src/build/hcc
rename : build/hcpp => js/src/build/hcpp
rename : build/unix/mddepend.pl => js/src/build/unix/mddepend.pl
rename : build/unix/uniq.pl => js/src/build/unix/uniq.pl
rename : config/Makefile.in => js/src/config/Makefile.in
rename : config/Moz/Milestone.pm => js/src/config/Moz/Milestone.pm
rename : config/autoconf.mk.in => js/src/config/autoconf.mk.in
rename : config/config.mk => js/src/config/config.mk
rename : config/elf-dynstr-gc.c => js/src/config/elf-dynstr-gc.c
rename : config/fastcwd.pl => js/src/config/fastcwd.pl
rename : config/gcc_hidden.h => js/src/config/gcc_hidden.h
rename : config/insure.mk => js/src/config/insure.mk
rename : nsprpub/config/make-system-wrappers.pl => js/src/config/make-system-wrappers.pl
rename : config/milestone.pl => js/src/config/milestone.pl
rename : config/milestone.txt => js/src/config/milestone.txt
rename : config/mkdepend/Makefile.in => js/src/config/mkdepend/Makefile.in
rename : config/mkdepend/cppsetup.c => js/src/config/mkdepend/cppsetup.c
rename : config/mkdepend/def.h => js/src/config/mkdepend/def.h
rename : config/mkdepend/ifparser.c => js/src/config/mkdepend/ifparser.c
rename : config/mkdepend/ifparser.h => js/src/config/mkdepend/ifparser.h
rename : config/mkdepend/imakemdep.h => js/src/config/mkdepend/imakemdep.h
rename : config/mkdepend/include.c => js/src/config/mkdepend/include.c
rename : config/mkdepend/main.c => js/src/config/mkdepend/main.c
rename : config/mkdepend/mkdepend.man => js/src/config/mkdepend/mkdepend.man
rename : config/mkdepend/parse.c => js/src/config/mkdepend/parse.c
rename : config/mkdepend/pr.c => js/src/config/mkdepend/pr.c
rename : config/nfspwd.pl => js/src/config/nfspwd.pl
rename : config/nsinstall.c => js/src/config/nsinstall.c
rename : config/nsinstall.py => js/src/config/nsinstall.py
rename : config/pathsub.c => js/src/config/pathsub.c
rename : config/pathsub.h => js/src/config/pathsub.h
rename : config/preprocessor.pl => js/src/config/preprocessor.pl
rename : config/revdepth-nt.pl => js/src/config/revdepth-nt.pl
rename : config/revdepth.pl => js/src/config/revdepth.pl
rename : config/rules.mk => js/src/config/rules.mk
rename : config/system-headers => js/src/config/system-headers
rename : config/version.mk => js/src/config/version.mk
rename : config/version_win.pl => js/src/config/version_win.pl
rename : configure.in => js/src/configure.in
2008-10-29 15:29:22 +00:00
|
|
|
include $(topsrcdir)/config/js/build.mk
|
2006-08-29 16:53:40 +00:00
|
|
|
include $(topsrcdir)/xpcom/build.mk
|
2006-09-28 21:22:27 +00:00
|
|
|
include $(topsrcdir)/netwerk/build.mk
|
2006-08-29 16:53:40 +00:00
|
|
|
|
|
|
|
TIERS += \
|
|
|
|
external \
|
|
|
|
gecko \
|
|
|
|
toolkit \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
#
|
|
|
|
# tier "external" - 3rd party individual libraries
|
|
|
|
#
|
|
|
|
|
|
|
|
ifndef MOZ_NATIVE_JPEG
|
|
|
|
tier_external_dirs += jpeg
|
|
|
|
endif
|
|
|
|
|
|
|
|
# Installer needs standalone libjar, hence standalone zlib
|
|
|
|
ifdef MOZ_INSTALLER
|
|
|
|
tier_external_dirs += modules/zlib/standalone
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_UPDATER
|
2008-03-12 11:13:09 +00:00
|
|
|
ifndef MOZ_NATIVE_BZ2
|
2006-08-29 16:53:40 +00:00
|
|
|
tier_external_dirs += modules/libbz2
|
2008-03-12 11:13:09 +00:00
|
|
|
endif
|
2006-08-29 16:53:40 +00:00
|
|
|
tier_external_dirs += modules/libmar
|
|
|
|
endif
|
|
|
|
|
2009-04-07 16:02:11 +00:00
|
|
|
tier_external_dirs += gfx/qcms
|
2007-07-23 22:02:17 +00:00
|
|
|
|
2009-11-13 23:03:30 +00:00
|
|
|
ifeq ($(OS_ARCH),WINCE)
|
|
|
|
tier_external_dirs += modules/lib7z
|
|
|
|
endif
|
|
|
|
|
2006-08-29 16:53:40 +00:00
|
|
|
#
|
2006-09-28 21:22:27 +00:00
|
|
|
# tier "gecko" - core components
|
2006-08-29 16:53:40 +00:00
|
|
|
#
|
|
|
|
|
|
|
|
tier_gecko_dirs += \
|
|
|
|
js/src/xpconnect \
|
2009-09-23 17:57:22 +00:00
|
|
|
js/ctypes \
|
2006-09-13 22:13:40 +00:00
|
|
|
intl/chardet \
|
2006-08-29 16:53:40 +00:00
|
|
|
$(NULL)
|
|
|
|
|
2009-09-23 17:57:22 +00:00
|
|
|
ifdef BUILD_CTYPES
|
|
|
|
ifndef _MSC_VER
|
2009-09-23 17:57:22 +00:00
|
|
|
tier_gecko_staticdirs += \
|
|
|
|
js/ctypes/libffi \
|
|
|
|
$(NULL)
|
2009-09-23 17:57:22 +00:00
|
|
|
endif
|
|
|
|
endif
|
2009-09-23 17:57:22 +00:00
|
|
|
|
2006-08-29 16:53:40 +00:00
|
|
|
ifdef MOZ_ENABLE_GTK2
|
2008-08-06 20:48:55 +00:00
|
|
|
ifdef MOZ_X11
|
2006-08-29 16:53:40 +00:00
|
|
|
tier_gecko_dirs += widget/src/gtkxtbin
|
|
|
|
endif
|
2008-08-06 20:48:55 +00:00
|
|
|
endif
|
2006-08-29 16:53:40 +00:00
|
|
|
|
|
|
|
tier_gecko_dirs += \
|
|
|
|
modules/libjar \
|
|
|
|
db \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef MOZ_PERMISSIONS
|
|
|
|
tier_gecko_dirs += \
|
|
|
|
extensions/cookie \
|
|
|
|
extensions/permissions \
|
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_STORAGE
|
|
|
|
tier_gecko_dirs += storage
|
|
|
|
endif
|
|
|
|
|
2007-07-05 17:22:07 +00:00
|
|
|
ifdef MOZ_RDF
|
2006-08-29 16:53:40 +00:00
|
|
|
tier_gecko_dirs += rdf
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_JSDEBUGGER
|
|
|
|
tier_gecko_dirs += js/jsd
|
|
|
|
endif
|
|
|
|
|
2008-07-30 06:50:14 +00:00
|
|
|
ifdef MOZ_OGG
|
|
|
|
tier_gecko_dirs += \
|
2008-08-06 00:47:37 +00:00
|
|
|
media/libfishsound \
|
|
|
|
media/libogg \
|
|
|
|
media/liboggplay \
|
|
|
|
media/liboggz \
|
|
|
|
media/libtheora \
|
|
|
|
media/libvorbis \
|
2008-07-30 06:50:14 +00:00
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2008-11-06 20:53:20 +00:00
|
|
|
ifdef MOZ_SYDNEYAUDIO
|
|
|
|
tier_gecko_dirs += \
|
|
|
|
media/libsydneyaudio \
|
|
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
2006-08-29 16:53:40 +00:00
|
|
|
tier_gecko_dirs += \
|
|
|
|
uriloader \
|
|
|
|
modules/libimg \
|
|
|
|
caps \
|
2009-06-28 22:44:22 +00:00
|
|
|
parser \
|
2006-08-29 16:53:40 +00:00
|
|
|
gfx \
|
|
|
|
modules/libpr0n \
|
|
|
|
modules/plugin \
|
|
|
|
dom \
|
|
|
|
view \
|
|
|
|
widget \
|
|
|
|
content \
|
2007-02-24 20:07:06 +00:00
|
|
|
editor \
|
2006-08-29 16:53:40 +00:00
|
|
|
layout \
|
|
|
|
docshell \
|
|
|
|
webshell \
|
|
|
|
embedding \
|
|
|
|
xpfe/appshell \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef MOZ_UNIVERSALCHARDET
|
|
|
|
tier_gecko_dirs += extensions/universalchardet
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef ACCESSIBILITY
|
|
|
|
tier_gecko_dirs += accessible
|
|
|
|
endif
|
|
|
|
|
|
|
|
#
|
|
|
|
# tier "toolkit" - xpfe & toolkit
|
|
|
|
#
|
|
|
|
# The division of "gecko" and "toolkit" is somewhat arbitrary, and related
|
|
|
|
# to history where "gecko" wasn't forked between seamonkey/firefox but
|
|
|
|
# "toolkit" was.
|
|
|
|
#
|
|
|
|
|
2008-09-02 09:45:14 +00:00
|
|
|
tier_toolkit_dirs += chrome profile
|
2006-08-29 16:53:40 +00:00
|
|
|
|
|
|
|
# This must preceed xpfe
|
|
|
|
ifdef MOZ_JPROF
|
|
|
|
tier_toolkit_dirs += tools/jprof
|
|
|
|
endif
|
|
|
|
|
|
|
|
tier_toolkit_dirs += \
|
|
|
|
xpfe \
|
|
|
|
toolkit/components \
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
ifdef MOZ_ENABLE_XREMOTE
|
|
|
|
tier_toolkit_dirs += widget/src/xremoteclient
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_SPELLCHECK
|
|
|
|
tier_toolkit_dirs += extensions/spellcheck
|
|
|
|
endif
|
|
|
|
|
|
|
|
tier_toolkit_dirs += toolkit
|
|
|
|
|
|
|
|
ifdef MOZ_XPINSTALL
|
|
|
|
tier_toolkit_dirs += xpinstall
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_PSM
|
|
|
|
tier_toolkit_dirs += security/manager
|
|
|
|
else
|
|
|
|
tier_toolkit_dirs += security/manager/boot/public security/manager/ssl/public
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_PREF_EXTENSIONS
|
|
|
|
tier_toolkit_dirs += extensions/pref
|
|
|
|
endif
|
|
|
|
|
2007-03-02 21:28:58 +00:00
|
|
|
# JavaXPCOM JNI code is compiled into libXUL
|
2006-08-29 16:53:40 +00:00
|
|
|
ifdef MOZ_JAVAXPCOM
|
2007-03-02 21:28:58 +00:00
|
|
|
tier_toolkit_dirs += extensions/java/xpcom/src
|
2006-08-29 16:53:40 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef BUILD_STATIC_LIBS
|
2007-04-30 23:52:44 +00:00
|
|
|
ifneq (,$(MOZ_ENABLE_GTK2))
|
2006-08-29 16:53:40 +00:00
|
|
|
tier_toolkit_dirs += embedding/browser/gtk
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifndef BUILD_STATIC_LIBS
|
|
|
|
tier_toolkit_dirs += toolkit/library
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_ENABLE_LIBXUL
|
|
|
|
tier_toolkit_dirs += xpcom/stub
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef NS_TRACE_MALLOC
|
|
|
|
tier_toolkit_dirs += tools/trace-malloc
|
|
|
|
endif
|
|
|
|
|
2006-09-27 20:17:56 +00:00
|
|
|
ifdef MOZ_ENABLE_GNOME_COMPONENT
|
|
|
|
tier_toolkit_dirs += toolkit/system/gnome
|
2006-08-29 16:53:40 +00:00
|
|
|
endif
|
|
|
|
|
2009-11-18 15:20:45 +00:00
|
|
|
ifndef MOZ_ENABLE_LIBCONIC
|
|
|
|
# if libconic is present, it will do its own network monitoring
|
2006-12-04 20:42:31 +00:00
|
|
|
ifdef MOZ_ENABLE_DBUS
|
|
|
|
tier_toolkit_dirs += toolkit/system/dbus
|
|
|
|
endif
|
2009-11-18 15:20:45 +00:00
|
|
|
endif
|
2006-12-04 20:42:31 +00:00
|
|
|
|
2006-08-29 16:53:40 +00:00
|
|
|
ifdef MOZ_LEAKY
|
|
|
|
tier_toolkit_dirs += tools/leaky
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef MOZ_MAPINFO
|
|
|
|
tier_toolkit_dirs += tools/codesighs
|
|
|
|
endif
|
2007-01-17 20:38:57 +00:00
|
|
|
|
2008-09-09 17:59:11 +00:00
|
|
|
ifdef ENABLE_TESTS
|
2007-01-17 20:38:57 +00:00
|
|
|
tier_toolkit_dirs += testing/mochitest
|
|
|
|
endif
|
2008-12-11 19:50:31 +00:00
|
|
|
|
|
|
|
ifdef MOZ_TREE_FREETYPE
|
|
|
|
tier_external_dirs += modules/freetype2
|
2009-03-02 14:24:31 +00:00
|
|
|
endif
|