зеркало из https://github.com/mozilla/pjs.git
Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento
This commit is contained in:
benjamin%smedbergs.us
Родитель
21d4c5ca34
Коммит
f25f982712
|
|
@ -1,206 +0,0 @@
|
|||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: Mozilla-sample-code 1.0
|
||||
#
|
||||
# Copyright (c) 2002 Netscape Communications Corporation and
|
||||
# other contributors
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this Mozilla sample software and associated documentation files
|
||||
# (the "Software"), to deal in the Software without restriction, including
|
||||
# without limitation the rights to use, copy, modify, merge, publish,
|
||||
# distribute, sublicense, and/or sell copies of the Software, and to permit
|
||||
# persons to whom the Software is furnished to do so, subject to the
|
||||
# following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
# DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = mfcembed$(BIN_SUFFIX)
|
||||
RESFILE = MfcEmbed.res
|
||||
|
||||
MODULE = mfcEmbed
|
||||
PACKAGE_FILE = mfcembed.pkg
|
||||
|
||||
# comment this out if for some reason you want to link against xpcom
|
||||
# directly instead of using the standalone glue
|
||||
ifndef BUILD_STATIC_LIBS
|
||||
GRE_BUILD = 1
|
||||
endif
|
||||
|
||||
ifdef GRE_BUILD
|
||||
DEFINES += -DXPCOM_GLUE -DMOZILLA_STRICT_API
|
||||
endif
|
||||
|
||||
REQUIRES = \
|
||||
xpcom_obsolete \
|
||||
xpcom \
|
||||
string \
|
||||
necko \
|
||||
webbrwsr \
|
||||
widget \
|
||||
docshell \
|
||||
dom \
|
||||
uriloader \
|
||||
embed_base \
|
||||
webshell \
|
||||
shistory \
|
||||
pref \
|
||||
profile \
|
||||
profdirserviceprovider \
|
||||
find \
|
||||
gfx \
|
||||
windowwatcher \
|
||||
layout \
|
||||
webbrowserpersist \
|
||||
composer \
|
||||
commandhandler \
|
||||
imglib2 \
|
||||
webbrwsr \
|
||||
editor \
|
||||
$(NULL)
|
||||
|
||||
ifdef NS_TRACE_MALLOC
|
||||
REQUIRES += tracemalloc
|
||||
endif
|
||||
|
||||
ifdef MOZ_PROFILESHARING
|
||||
REQUIRES += profilesharingsetup
|
||||
endif
|
||||
|
||||
CPPSRCS = \
|
||||
CCustomPromptDialog.cpp \
|
||||
CMarginHeaderFooter.cpp \
|
||||
CFormatOptionTab.cpp \
|
||||
CPageSetupPropSheet.cpp \
|
||||
MfcEmbed.cpp \
|
||||
BrowserFrm.cpp \
|
||||
EditorFrm.cpp \
|
||||
BrowserFrameGlue.cpp \
|
||||
BrowserView.cpp \
|
||||
BrowserImpl.cpp \
|
||||
BrowserImplWebPrgrsLstnr.cpp \
|
||||
BrowserImplCtxMenuLstnr.cpp \
|
||||
BrowserToolTip.cpp \
|
||||
Dialogs.cpp \
|
||||
ProfileMgr.cpp \
|
||||
ProfilesDlg.cpp \
|
||||
winEmbedFileLocProvider.cpp \
|
||||
MostRecentUrls.cpp \
|
||||
Preferences.cpp \
|
||||
StdAfx.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = $(DIST)/lib/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX)
|
||||
|
||||
ifdef NS_TRACE_MALLOC
|
||||
LIBS += $(DIST)/lib/$(LIB_PREFIX)tracemalloc.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
LIBS += \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef GRE_BUILD
|
||||
LIBS += \
|
||||
$(DIST)/lib/$(LIB_PREFIX)embed_base_standalone.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
else
|
||||
LIBS += \
|
||||
$(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NULL)
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
LIBS += $(MOZ_JS_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
LIBS += $(NSPR_LIBS)
|
||||
|
||||
OS_LIBS += \
|
||||
ole32.lib \
|
||||
comdlg32.lib \
|
||||
shell32.lib \
|
||||
version.lib \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/components
|
||||
|
||||
#
|
||||
# Control the default heap size.
|
||||
# This is the heap returned by GetProcessHeap().
|
||||
# As we use the CRT heap, the default size is too large and wastes VM.
|
||||
#
|
||||
# The default heap size is 1MB on Win32.
|
||||
# The heap will grow if need be.
|
||||
#
|
||||
# Set it to 256k. See bug 127069.
|
||||
#
|
||||
LDFLAGS += -HEAP:0x40000
|
||||
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# Force applications to be built non-statically
|
||||
# when building the mozcomps meta component
|
||||
ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
|
||||
BUILD_STATIC_LIBS=
|
||||
endif
|
||||
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
|
||||
include $(topsrcdir)/config/static-config.mk
|
||||
|
||||
EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
|
||||
EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIBS)
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
EXTRA_LIBS += -L$(DEPTH)/dist/lib/components
|
||||
endif # !WINNT
|
||||
EXTRA_LIBS += $(EXTRA_DSO_LIBS) $(STATIC_EXTRA_LIBS)
|
||||
DEFINES += $(STATIC_DEFINES)
|
||||
CPPSRCS += $(STATIC_CPPSRCS)
|
||||
|
||||
endif # BUILD_STATIC_LIBS
|
||||
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
ifdef BUILD_STATIC_LIBS
|
||||
include $(topsrcdir)/config/static-rules.mk
|
||||
endif # BUILD_STATIC_LIBS
|
||||
|
||||
# UNICODE
|
||||
ifdef BUILD_UNICODE_MFCEMBED
|
||||
CXXFLAGS += -D "_UNICODE"
|
||||
LDFLAGS += -ENTRY:wWinMainCRTStartup
|
||||
endif
|
||||
|
||||
CXXFLAGS += -D "_AFXDLL" -D "USE_SINGLE_SIGN_ON" -DMOZILLA_VERSION=\"$(MOZILLA_VERSION)\"
|
||||
LDFLAGS += -SUBSYSTEM:windows
|
||||
|
||||
libs:: mfcembed.htm
|
||||
$(INSTALL) $^ $(DIST)/bin
|
||||
|
||||
install:: mfcembed.htm
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ CPPSRCS = \
|
|||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/profile/dirserviceprovider/standalone/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ REQUIRES = \
|
|||
xpnet \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LIBS = \
|
||||
mozregsa_s \
|
||||
jar50_s \
|
||||
mozz_s \
|
||||
xpnet_s \
|
||||
LIBS = \
|
||||
$(DEPTH)/modules/libreg/standalone/$(LIB_PREFIX)mozregsa_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/modules/libjar/standalone/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/xpinstall/wizard/libxpnet/src/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
USE_STATIC_LIBS = 1
|
||||
|
|
@ -76,8 +76,6 @@ CPPSRCS = \
|
|||
nsEscape.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = $(EXTRA_DSO_LIBS)
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../uninstall
|
||||
|
||||
NO_DIST_INSTALL = 1
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ MODULE = uninstall
|
|||
PROGRAM = uninstall$(BIN_SUFFIX)
|
||||
RESFILE = uninstall.res
|
||||
REQUIRES = $(ZLIB_REQUIRES)
|
||||
EXTRA_DSO_LIBS = mozz_s
|
||||
USE_STATIC_LIBS = 1
|
||||
|
||||
EXPORTS = logkeys.h
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче