forked from mirrors/gecko-dev
bug 471188 - stop calling 'make install' for spidermonkey. r=bsmedberg,jimb
This commit is contained in:
Ted Mielczarek
parent
f488e1baf7
commit
cb9e3ef789
5 changed files with 25 additions and 89 deletions
|
|
@ -1,67 +0,0 @@
|
|||
#
|
||||
# ***** 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. This file was copied from parts of
|
||||
# mozilla/config/Makefile.in
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Robert Ginda <rginda@netscape.com>
|
||||
# John Taylor <jtaylor@netscape.com>
|
||||
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||
#
|
||||
# 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 *****
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
JS_OBJDIR = $(DEPTH)/js/src
|
||||
JS_CONFIG = $(DIST)/bin/js-config
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# These rules assume that we configured js with an appropriate bindir,
|
||||
# libdir, and includedir, so that the 'make install' will put things
|
||||
# mostly in the right places. The install-runtime-libs target takes
|
||||
# care of getting the needed libraries into the 'bin' directory as
|
||||
# well as the 'lib' directory. Setting JS_MOZ_INSTALL= ensures that
|
||||
# we get symlinks (the proper in-tree build behavior), not copies (the
|
||||
# default GNU behavior).
|
||||
export::
|
||||
$(MAKE) -C $(JS_OBJDIR) JS_MOZ_INSTALL=t install
|
||||
$(MAKE) -C $(JS_OBJDIR) JS_MOZ_INSTALL=t install-runtime-libs libdir=$(DIST)/bin
|
||||
$(INSTALL) $(IFLAGS2) $(JS_CONFIG) $(SDK_BIN_DIR)
|
||||
|
||||
check::
|
||||
$(MAKE) -C $(JS_OBJDIR) $@
|
||||
|
|
@ -36,5 +36,4 @@
|
|||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
TIERS += js
|
||||
tier_js_staticdirs = js/src
|
||||
tier_js_dirs = config/js
|
||||
tier_js_dirs = js/src
|
||||
|
|
|
|||
|
|
@ -1587,7 +1587,7 @@ endif
|
|||
# Copy each element of EXPORTS to $(PUBLIC)
|
||||
|
||||
ifneq ($(EXPORTS)$(XPIDLSRCS)$(SDK_HEADERS)$(SDK_XPIDLSRCS),)
|
||||
$(SDK_PUBLIC) $(PUBLIC)::
|
||||
$(SDK_PUBLIC) $(PUBLIC):
|
||||
$(NSINSTALL) -D $@
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -49,13 +49,6 @@ ifdef DEHYDRA_PATH
|
|||
DIRS += analysis-tests
|
||||
endif
|
||||
|
||||
ifndef JS_MOZ_INSTALL
|
||||
# This is the appropriate behavior for GNU-style 'make install'. For
|
||||
# Mozilla in-tree behavior, leaving NSDISTMODE unset is the right
|
||||
# thing; config/js/Makefile.in sets JS_MOZ_INSTALL in that case.
|
||||
NSDISTMODE = copy
|
||||
endif
|
||||
|
||||
MODULE = js
|
||||
LIBRARY_NAME = mozjs
|
||||
GRE_MODULE = 1
|
||||
|
|
@ -186,7 +179,7 @@ endif
|
|||
INSTALLED_HEADERS = \
|
||||
js-config.h \
|
||||
jsautocfg.h \
|
||||
jsautokw.h \
|
||||
$(CURDIR)/jsautokw.h \
|
||||
js.msg \
|
||||
jsapi.h \
|
||||
jsarray.h \
|
||||
|
|
@ -282,6 +275,8 @@ ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
|||
INSTALLED_HEADERS += jscpucfg.h
|
||||
endif
|
||||
|
||||
EXPORTS = $(INSTALLED_HEADERS)
|
||||
|
||||
JS_SAFE_ARENA = 1
|
||||
|
||||
DASH_R = -r
|
||||
|
|
@ -348,6 +343,18 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# nsinstall doesn't get built until we enter config/ in the exports phase,
|
||||
# so we'll have to manually ensure it gets built here if we want to use
|
||||
# $(EXPORTS)
|
||||
ifneq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH)))
|
||||
ifneq ($(OS_ARCH), WINCE)
|
||||
$(EXPORTS) $(PUBLIC): config/nsinstall$(HOST_BIN_SUFFIX)
|
||||
|
||||
config/nsinstall$(HOST_BIN_SUFFIX): $(srcdir)/config/nsinstall.c $(srcdir)/config/pathsub.c
|
||||
$(MAKE) -C config/ nsinstall$(HOST_BIN_SUFFIX)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef MOZ_SYNC_BUILD_FILES
|
||||
# Because the SpiderMonkey can be distributed and built independently
|
||||
# of the Mozilla source tree, it contains its own copies of many of
|
||||
|
|
@ -612,26 +619,23 @@ js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config
|
|||
&& mv js-config.tmp $@ && chmod +x $@
|
||||
|
||||
SCRIPTS = js-config
|
||||
SDK_BINARY = js-config
|
||||
|
||||
install:: $(INSTALLED_HEADERS)
|
||||
$(INSTALL) $(IFLAGS1) $^ $(includedir)/$(MODULE)
|
||||
$(SYSINSTALL) $^ $(includedir)/$(MODULE)
|
||||
|
||||
install:: $(SCRIPTS) $(PROGRAM)
|
||||
$(INSTALL) $(IFLAGS2) $^ $(bindir)
|
||||
$(SYSINSTALL) $^ $(bindir)
|
||||
|
||||
# The Mozilla top-level makefiles use install-runtime-libs directly to
|
||||
# place an additional copy of the libraries in the 'dist/bin'
|
||||
# directory.
|
||||
install:: install-runtime-libs
|
||||
install-runtime-libs:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
|
||||
install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
|
||||
ifneq (,$(LIBRARY))
|
||||
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(libdir)
|
||||
$(SYSINSTALL) $(LIBRARY) $(libdir)
|
||||
endif
|
||||
ifneq (,$(SHARED_LIBRARY))
|
||||
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(libdir)
|
||||
$(SYSINSTALL) $(SHARED_LIBRARY) $(libdir)
|
||||
endif
|
||||
ifneq (,$(IMPORT_LIBRARY))
|
||||
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(libdir)
|
||||
$(SYSINSTALL) $(IMPORT_LIBRARY) $(libdir)
|
||||
endif
|
||||
|
||||
# Extra dependancies and rules for auto-generated headers
|
||||
|
|
|
|||
|
|
@ -1587,7 +1587,7 @@ endif
|
|||
# Copy each element of EXPORTS to $(PUBLIC)
|
||||
|
||||
ifneq ($(EXPORTS)$(XPIDLSRCS)$(SDK_HEADERS)$(SDK_XPIDLSRCS),)
|
||||
$(SDK_PUBLIC) $(PUBLIC)::
|
||||
$(SDK_PUBLIC) $(PUBLIC):
|
||||
$(NSINSTALL) -D $@
|
||||
endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue