Author: czarny Date: Sun Oct 15 18:36:51 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - renamed from firefox - added not installing of some libs (as build with system libs)
---- Files affected: SOURCES: iceweasel-nss.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/iceweasel-nss.patch diff -u /dev/null SOURCES/iceweasel-nss.patch:1.1 --- /dev/null Sun Oct 15 20:36:51 2006 +++ SOURCES/iceweasel-nss.patch Sun Oct 15 20:36:46 2006 @@ -0,0 +1,1414 @@ +diff -urN iceweasel-1.5.0-g1/config/config.mk iceweasel-1.5.0-g1.new/config/config.mk +--- iceweasel-1.5.0-g1/config/config.mk 2006-03-06 20:56:20.000000000 +0100 ++++ iceweasel-1.5.0-g1.new/config/config.mk 2006-10-15 01:52:45.000000000 +0200 +@@ -144,7 +144,7 @@ + + NSS_LIBS = \ + $(LIBS_DIR) \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ ++ -lcrmf \ + -lsmime3 \ + -lssl3 \ + -lnss3 \ +@@ -164,11 +164,6 @@ + endif + + NSS_DEP_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ + $(NULL) + + MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) +diff -urN iceweasel-1.5.0-g1/config/config.mk.orig iceweasel-1.5.0-g1.new/config/config.mk.orig +--- iceweasel-1.5.0-g1/config/config.mk.orig 1970-01-01 01:00:00.000000000 +0100 ++++ iceweasel-1.5.0-g1.new/config/config.mk.orig 2006-03-06 20:56:20.000000000 +0100 +@@ -0,0 +1,895 @@ ++# ++# ***** 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 ++# Netscape Communications Corporation. ++# Portions created by the Initial Developer are Copyright (C) 1998 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# ++# 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 ***** ++ ++# ++# config.mk ++# ++# Determines the platform and builds the macros needed to load the ++# appropriate platform-specific .mk file, then defines all (most?) ++# of the generic macros. ++# ++ ++# Define an include-at-most-once flag ++INCLUDED_CONFIG_MK = 1 ++ ++EXIT_ON_ERROR = set -e; # Shell loops continue past errors without this. ++ ++ifndef topsrcdir ++topsrcdir = $(DEPTH) ++endif ++ ++ifndef INCLUDED_AUTOCONF_MK ++include $(DEPTH)/config/autoconf.mk ++endif ++ifndef INCLUDED_INSURE_MK ++ifdef MOZ_INSURIFYING ++include $(topsrcdir)/config/insure.mk ++endif ++endif ++ ++# SUBMAKEFILES: List of Makefiles for next level down. ++# This is used to update or create the Makefiles before invoking them. ++ifneq ($(DIRS)$(TOOL_DIRS),) ++SUBMAKEFILES := $(addsuffix /Makefile, $(TOOL_DIRS) $(filter-out $(STATIC_MAKEFILES), $(DIRS))) ++endif ++ ++GRE_DIST = $(DIST)/gre ++ ++# FINAL_TARGET specifies the location into which we copy end-user-shipped ++# build products (typelibs, components, chrome). ++# ++# It will usually be the well-loved $(DIST)/bin, today, but can also be an ++# XPI-contents staging directory for ambitious and right-thinking extensions. ++FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin) ++ ++# 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 ++# structure contains the chrome, so leave it in $(FINAL_TARGET). ++ifeq (jar,$(MOZ_CHROME_FILE_FORMAT)) ++MAKE_JARS_TARGET = $(if $(XPI_NAME),$(FINAL_TARGET).stage,$(DIST)/chrome-stage) ++else ++MAKE_JARS_TARGET = $(FINAL_TARGET) ++endif ++ ++# ++# The VERSION_NUMBER is suffixed onto the end of the DLLs we ship. ++# Since the longest of these is 5 characters without the suffix, ++# be sure to not set VERSION_NUMBER to anything longer than 3 ++# characters for Win16's sake. ++# ++VERSION_NUMBER = 50 ++ ++ifeq ($(HOST_OS_ARCH),WINNT) ++win_srcdir := $(subst $(topsrcdir),$(WIN_TOP_SRC),$(srcdir)) ++BUILD_TOOLS = $(WIN_TOP_SRC)/build/unix ++else ++win_srcdir := $(srcdir) ++BUILD_TOOLS = $(topsrcdir)/build/unix ++endif ++ ++CONFIG_TOOLS = $(MOZ_BUILD_ROOT)/config ++AUTOCONF_TOOLS = $(topsrcdir)/build/autoconf ++ ++ifeq ($(OS_ARCH),QNX) ++ifeq ($(OS_TARGET),NTO) ++LD := qcc -Vgcc_ntox86 -nostdlib ++else ++LD := $(CC) ++endif ++endif ++ifeq ($(OS_ARCH),BeOS) ++BEOS_ADDON_WORKAROUND = 1 ++endif ++ ++# ++# Strip off the excessively long version numbers on these platforms, ++# but save the version to allow multiple versions of the same base ++# platform to be built in the same tree. ++# ++ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH))) ++OS_RELEASE := $(basename $(OS_RELEASE)) ++ ++# Allow the user to ignore the OS_VERSION, which is usually irrelevant. ++ifdef WANT_MOZILLA_CONFIG_OS_VERSION ++OS_VERS := $(suffix $(OS_RELEASE)) ++OS_VERSION := $(shell echo $(OS_VERS) | sed 's/-.*//') ++endif ++ ++endif ++ ++OS_CONFIG := $(OS_ARCH)$(OS_RELEASE) ++ ++FINAL_LINK_LIBS = $(DEPTH)/config/final-link-libs ++FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps ++FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names ++ ++# ++# NSS libs needed for final link in static build ++# ++ ++NSS_LIBS = \ ++ $(LIBS_DIR) \ ++ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ ++ -lsmime3 \ ++ -lssl3 \ ++ -lnss3 \ ++ -lsoftokn3 \ ++ $(NULL) ++ ++ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH))) ++ifndef GNU_CC ++NSS_LIBS = \ ++ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ ++ $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ ++ $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ ++ $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ ++ $(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \ ++ $(NULL) ++endif ++endif ++ ++NSS_DEP_LIBS = \ ++ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ ++ $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ ++ $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ ++ $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ ++ $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ ++ $(NULL) ++ ++MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) ++MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) ++MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) ++ ++# determine debug-related options ++_DEBUG_CFLAGS := ++_DEBUG_LDFLAGS := ++ ++ifndef MOZ_DEBUG ++ # global debugging is disabled ++ # check if it was explicitly enabled for this module ++ ifneq (, $(findstring $(MODULE), $(MOZ_DEBUG_MODULES))) ++ MOZ_DEBUG:=1 ++ endif ++else ++ # global debugging is enabled ++ # check if it was explicitly disabled for this module ++ ifneq (, $(findstring ^$(MODULE), $(MOZ_DEBUG_MODULES))) ++ MOZ_DEBUG:= ++ endif ++endif ++ ++ifdef MOZ_DEBUG ++ _DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS) ++else ++ _DEBUG_CFLAGS += $(MOZ_DEBUG_DISABLE_DEFS) ++endif ++ ++# determine if -g should be passed to the compiler, based on ++# the current module, and the value of MOZ_DBGRINFO_MODULES ++ ++ifdef MOZ_DEBUG ++ MOZ_DBGRINFO_MODULES += ALL_MODULES ++ pattern := ALL_MODULES ^ALL_MODULES ++else ++ MOZ_DBGRINFO_MODULES += ^ALL_MODULES ++ pattern := ALL_MODULES ^ALL_MODULES ++endif ++ ++ifdef MODULE ++ # our current Makefile specifies a module name - add it to our pattern ++ pattern += $(MODULE) ^$(MODULE) ++endif ++ ++# start by finding the first relevant module name ++# (remember that the order of the module names in MOZ_DBGRINFO_MODULES ++# is reversed from the order the user specified to configure - ++# this allows the user to put general names at the beginning ++# of the list, and to override them with explicit module names later ++# in the list) ++ ++first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES))) ++ ++ifeq ($(first_match), $(MODULE)) ++ # the user specified explicitly that ++ # this module should be compiled with -g ++ _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS) ++ _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS) ++else ++ ifeq ($(first_match), ^$(MODULE)) ++ # the user specified explicitly that this module ++ # should not be compiled with -g (nothing to do) ++ else ++ ifeq ($(first_match), ALL_MODULES) ++ # the user didn't mention this module explicitly, ++ # but wanted all modules to be compiled with -g ++ _DEBUG_CFLAGS += $(MOZ_DEBUG_FLAGS) ++ _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS) ++ else ++ ifeq ($(first_match), ^ALL_MODULES) ++ # the user didn't mention this module explicitly, ++ # but wanted all modules to be compiled without -g (nothing to do) ++ endif ++ endif ++ endif ++endif ++ ++ ++# append debug flags ++# (these might have been above when processing MOZ_DBGRINFO_MODULES) ++OS_CFLAGS += $(_DEBUG_CFLAGS) ++OS_CXXFLAGS += $(_DEBUG_CFLAGS) ++OS_LDFLAGS += $(_DEBUG_LDFLAGS) ++ ++# MOZ_PROFILE & MOZ_COVERAGE equivs for win32 ++ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) ++ifdef MOZ_DEBUG ++ifneq (,$(MOZ_BROWSE_INFO)$(MOZ_BSCFILE)) ++OS_CFLAGS += -FR ++OS_CXXFLAGS += -FR ++endif ++else ++# if MOZ_DEBUG is not set and MOZ_PROFILE is set, then we generate ++# an optimized build with debugging symbols. Useful for debugging ++# compiler optimization bugs, as well as running with Quantify. ++# MOZ_DEBUG_SYMBOLS works the same way as MOZ_PROFILE, but generates debug ++# symbols in separate PDB files, rather than embedded into the binary. ++ifneq (,$(MOZ_PROFILE)$(MOZ_DEBUG_SYMBOLS)) ++MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG ++OS_LDFLAGS = -DEBUG -OPT:REF -OPT:nowin98 ++ifdef MOZ_PROFILE ++OS_LDFLAGS += -PDB:NONE ++endif ++endif ++ ++ifdef MOZ_QUANTIFY ++# -FIXED:NO is needed for Quantify to work, but it increases the size ++# of executables, so only use it if building for Quantify. ++WIN32_EXE_LDFLAGS += -FIXED:NO ++ ++# We need -OPT:NOICF to prevent identical methods from being merged together. ++# Otherwise, Quantify doesn't know which method was actually called when it's ++# showing you the profile. ++OS_LDFLAGS += -OPT:NOICF ++endif ++ ++# if MOZ_COVERAGE is set, we handle pdb files slightly differently ++ifdef MOZ_COVERAGE ++MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG ++OS_LDFLAGS = -DEBUG -PDB:NONE -OPT:REF -OPT:nowin98 ++_ORDERFILE := $(wildcard $(srcdir)/win32.order) ++ifneq (,$(_ORDERFILE)) ++OS_LDFLAGS += -ORDER:@$(srcdir)/win32.order ++endif ++endif ++# MOZ_COVERAGE ++ ++# ++# Handle trace-malloc in optimized builds. ++# No opt to give sane callstacks. ++# ++ifdef NS_TRACE_MALLOC ++MOZ_OPTIMIZE_FLAGS=-Zi -Od -UDEBUG -DNDEBUG ++OS_LDFLAGS = -DEBUG -PDB:NONE -OPT:REF -OPT:nowin98 ++endif ++# NS_TRACE_MALLOC ++ ++endif # MOZ_DEBUG ++endif # WINNT && !GNU_CC ++ ++ ++# ++# -ffunction-sections is needed to reorder functions using a GNU ld ++# script. ++# ++ifeq ($(MOZ_REORDER),1) ++ OS_CFLAGS += -ffunction-sections ++ OS_CXXFLAGS += -ffunction-sections ++endif ++ ++# If we're applying MOZ_PROFILE_GENERATE to a non-static build, then we ++# need to create a static build _with_ PIC. This allows us to generate ++# profile data that will still be valid when the object files are linked into ++# shared libraries. ++ifdef MOZ_PROFILE_GENERATE ++ifdef BUILD_SHARED_LIBS ++BUILD_SHARED_LIBS= ++BUILD_STATIC_LIBS=1 ++MOZ_STATIC_COMPONENT_LIBS=1 ++STATIC_BUILD_PIC=1 ++endif ++endif ++ ++# ++# Build using PIC by default ++# Do not use PIC if not building a shared lib (see exceptions below) ++# ++#ifeq (,$(PROGRAM)$(SIMPLE_PROGRAMS)$(HOST_PROGRAM)$(HOST_SIMPLE_PROGRAMS)) ++ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)$(FORCE_USE_PIC)) ++_ENABLE_PIC=1 ++endif ++#endif ++ ++# If module is going to be merged into the nsStaticModule, ++# make sure that the entry points are translated and ++# the module is built static. ++ ++ifdef IS_COMPONENT ++ifneq (,$(MOZ_STATIC_COMPONENT_LIBS)) ++ifdef MODULE_NAME ++DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 ++FORCE_STATIC_LIB=1 ++endif ++endif ++endif ++ ++# Determine if module being compiled is destined ++# to be merged into libxul ++ ++ifdef MOZ_ENABLE_LIBXUL ++ifdef LIBXUL_LIBRARY ++ifdef IS_COMPONENT ++ifdef MODULE_NAME ++DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 ++else ++$(error Component makefile does not specify MODULE_NAME.) ++endif ++endif ++EXPORT_LIBRARY= ++FORCE_STATIC_LIB=1 ++_ENABLE_PIC=1 ++SHORT_LIBNAME= ++endif ++endif ++ ++# If we are building this component into an extension/xulapp, it cannot be ++# statically linked. In the future we may want to add a xulapp meta-component ++# build option. ++ ++ifdef XPI_NAME ++_ENABLE_PIC=1 ++ifdef IS_COMPONENT ++EXPORT_LIBRARY= ++FORCE_STATIC_LIB= ++FORCE_SHARED_LIB=1 ++endif ++endif ++ ++ifdef STATIC_BUILD_PIC ++ifndef _ENABLE_PIC ++# If PIC hasn't been enabled now, object files in this directory will not ++# ever be linked into a DSO. Turn PIC on and set ENABLE_PROFILE_GENERATE. ++ENABLE_PROFILE_GENERATE=1 ++_ENABLE_PIC=1 ++endif ++else ++# For static builds, always enable profile generation for non-PIC objects. ++ifndef _ENABLE_PIC ++ENABLE_PROFILE_GENERATE=1 ++endif ++endif ++ ++# ++# Disable PIC if necessary ++# ++ ++ifndef _ENABLE_PIC ++DSO_CFLAGS= ++ifeq ($(OS_ARCH)_$(HAVE_GCC3_ABI),Darwin_1) ++DSO_PIC_CFLAGS=-mdynamic-no-pic ++else ++DSO_PIC_CFLAGS= ++endif ++ ++MKSHLIB= ++endif ++ ++# Enable profile-based feedback for non-PIC objects ++ifdef ENABLE_PROFILE_GENERATE ++ifdef MOZ_PROFILE_GENERATE ++DSO_PIC_CFLAGS += $(PROFILE_GEN_CFLAGS) ++endif ++endif ++# We always use the profile-use flags, even in cases where we didn't use the ++# profile-generate flags. It's harmless, and it saves us from having to ++# answer the question "Would these objects have been built using ++# the profile-generate flags?" which is not trivial. ++ifdef MOZ_PROFILE_USE ++DSO_PIC_CFLAGS += $(PROFILE_USE_CFLAGS) ++endif ++ ++# Does the makefile specifies the internal XPCOM API linkage? ++ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY)) ++DEFINES += -DMOZILLA_INTERNAL_API ++endif ++ ++# Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're ++# building libxul libraries ++ifdef MOZ_ENABLE_LIBXUL ++ifdef LIBXUL_LIBRARY ++DEFINES += \ ++ -D_IMPL_NS_COM \ ++ -DEXPORT_XPT_API \ ++ -DEXPORT_XPTC_API \ ++ -DEXPORT_XPTI_API \ ++ -D_IMPL_NS_COM_OBSOLETE \ ++ -D_IMPL_NS_GFX \ ++ -D_IMPL_NS_WIDGET \ ++ -DIMPL_XULAPI \ ++ -DIMPL_NS_NET \ ++ $(NULL) ++ ++ifndef MOZ_NATIVE_ZLIB ++DEFINES += -DZLIB_INTERNAL ++endif ++endif ++endif ++ ++# Force _all_ exported methods to be |_declspec(dllexport)| when we're ++# building them into the executable. ++ ++ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH))) ++ifdef MOZ_STATIC_COMPONENT_LIBS ++DEFINES += \ ++ -D_IMPL_NS_GFX \ ++ -D_IMPL_NS_MSG_BASE \ ++ -D_IMPL_NS_WIDGET \ ++ $(NULL) ++endif ++endif ++ ++# Flags passed to make-jars.pl ++ ++MAKE_JARS_FLAGS = \ ++ -s $(srcdir) -t $(topsrcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl \ ++ -f $(MOZ_CHROME_FILE_FORMAT) \ ++ $(NULL) ++ ++ifdef NO_JAR_AUTO_REG ++MAKE_JARS_FLAGS += -a ++endif ++ ++ifdef USE_EXTENSION_MANIFEST ++MAKE_JARS_FLAGS += -e ++endif ++ ++ifeq ($(OS_TARGET),WIN95) ++MAKE_JARS_FLAGS += -l ++endif ++ ++ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT))) ++MAKE_JARS_FLAGS += -x ++endif ++ ++ifdef CROSS_COMPILE ++MAKE_JARS_FLAGS += -o $(OS_ARCH) ++endif ++ ++TAR_CREATE_FLAGS = -cvhf ++ ++ifeq ($(OS_ARCH),BSD_OS) ++TAR_CREATE_FLAGS = -cvLf ++endif ++ ++ifeq ($(OS_ARCH),OS2) ++TAR_CREATE_FLAGS = -cvf ++endif ++ ++# ++# Personal makefile customizations go in these optional make include files. ++# ++MY_CONFIG := $(DEPTH)/config/myconfig.mk ++MY_RULES := $(DEPTH)/config/myrules.mk ++ ++# ++# Default command macros; can be overridden in <arch>.mk. ++# ++CCC = $(CXX) ++NFSPWD = $(CONFIG_TOOLS)/nfspwd ++PURIFY = purify $(PURIFYOPTIONS) ++QUANTIFY = quantify $(QUANTIFYOPTIONS) ++ifdef CROSS_COMPILE ++XPIDL_COMPILE = $(CYGWIN_WRAPPER) $(DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX) ++XPIDL_LINK = $(CYGWIN_WRAPPER) $(DIST)/host/bin/host_xpt_link$(HOST_BIN_SUFFIX) ++else ++XPIDL_COMPILE = $(CYGWIN_WRAPPER) $(DIST)/bin/xpidl$(BIN_SUFFIX) ++XPIDL_LINK = $(CYGWIN_WRAPPER) $(DIST)/bin/xpt_link$(BIN_SUFFIX) ++endif ++ ++REQ_INCLUDES = $(foreach d,$(REQUIRES),-I$(DIST)/include/$d) ++ ++INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) -I$(PUBLIC) -I$(DIST)/include $(OS_INCLUDES) ++ ++ifndef MOZILLA_INTERNAL_API ++INCLUDES += -I$(DIST)/sdk/include ++endif ++ ++CFLAGS = $(OS_CFLAGS) ++CXXFLAGS = $(OS_CXXFLAGS) ++LDFLAGS = $(OS_LDFLAGS) ++ ++# Allow each module to override the *default* optimization settings ++# by setting MODULE_OPTIMIZE_FLAGS if the developer has not given ++# arguments to --enable-optimize ++ifdef MOZ_OPTIMIZE ++ifeq (1,$(MOZ_OPTIMIZE)) ++ifdef MODULE_OPTIMIZE_FLAGS ++CFLAGS += $(MODULE_OPTIMIZE_FLAGS) ++CXXFLAGS += $(MODULE_OPTIMIZE_FLAGS) ++else ++CFLAGS += $(MOZ_OPTIMIZE_FLAGS) ++CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) ++endif # MODULE_OPTIMIZE_FLAGS ++else ++CFLAGS += $(MOZ_OPTIMIZE_FLAGS) ++CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) ++endif # MOZ_OPTIMIZE == 1 ++LDFLAGS += $(MOZ_OPTIMIZE_LDFLAGS) ++endif # MOZ_OPTIMIZE ++ <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
