зеркало из https://github.com/mozilla/pjs.git
final makefile.win changes for bug 100214, just adding some REQUIRES to be used soon
This commit is contained in:
Родитель
3251c9f9ff
Коммит
91f782f06b
|
@ -89,6 +89,7 @@ LLIBS=\
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(DIST)\lib\gkgfx.lib \
|
$(DIST)\lib\gkgfx.lib \
|
||||||
$(DIST)\lib\timer_s.lib \
|
$(DIST)\lib\timer_s.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
||||||
!if defined(MOZ_PERF)
|
!if defined(MOZ_PERF)
|
||||||
$(DIST)\lib\util.lib \
|
$(DIST)\lib\util.lib \
|
||||||
|
|
|
@ -133,6 +133,7 @@ LLIBS = \
|
||||||
LLIBS = \
|
LLIBS = \
|
||||||
$(LLIBS) \
|
$(LLIBS) \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(DIST)\lib\js3250.lib \
|
$(DIST)\lib\js3250.lib \
|
||||||
$(DIST)\lib\gkgfx.lib \
|
$(DIST)\lib\gkgfx.lib \
|
||||||
$(LIBNSPR) \
|
$(LIBNSPR) \
|
||||||
|
|
|
@ -40,6 +40,7 @@ REQUIRES= xpcom \
|
||||||
mimetype \
|
mimetype \
|
||||||
content \
|
content \
|
||||||
layout \
|
layout \
|
||||||
|
unicharutil \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
include <$(DEPTH)\config\config.mak>
|
include <$(DEPTH)\config\config.mak>
|
||||||
|
@ -73,6 +74,7 @@ LCFLAGS = \
|
||||||
LLIBS= \
|
LLIBS= \
|
||||||
$(DIST)\lib\util.lib \
|
$(DIST)\lib\util.lib \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(LIBNSPR)
|
$(LIBNSPR)
|
||||||
|
|
||||||
include <$(DEPTH)\config\rules.mak>
|
include <$(DEPTH)\config\rules.mak>
|
||||||
|
|
|
@ -28,7 +28,11 @@ PROG1 = .\$(OBJDIR)\GenCyrillicClass.exe
|
||||||
PROGRAMS = $(PROG1)
|
PROGRAMS = $(PROG1)
|
||||||
|
|
||||||
LCFLAGS=-DUSE_NSREG
|
LCFLAGS=-DUSE_NSREG
|
||||||
|
REQUIRES=\
|
||||||
|
xpcom \
|
||||||
|
string \
|
||||||
|
unicharutil \
|
||||||
|
uconv
|
||||||
|
|
||||||
LLIBS= \
|
LLIBS= \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
|
|
|
@ -92,6 +92,7 @@ LLIBS= \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(DIST)\lib\gkgfx.lib \
|
$(DIST)\lib\gkgfx.lib \
|
||||||
$(DIST)\lib\timer_s.lib \
|
$(DIST)\lib\timer_s.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
||||||
!if defined(MOZ_PERF)
|
!if defined(MOZ_PERF)
|
||||||
$(DIST)\lib\util.lib \
|
$(DIST)\lib\util.lib \
|
||||||
|
|
|
@ -42,8 +42,12 @@ REQUIRES = xpcom \
|
||||||
gfx \
|
gfx \
|
||||||
content \
|
content \
|
||||||
layout_xul \
|
layout_xul \
|
||||||
|
!ifdef MOZ_SVG
|
||||||
|
raptor \
|
||||||
|
!endif
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
||||||
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
|
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
EXPORTS = \
|
EXPORTS = \
|
||||||
|
|
|
@ -40,7 +40,6 @@ REQUIRES = xpcom \
|
||||||
locale \
|
locale \
|
||||||
mork \
|
mork \
|
||||||
appcomps \
|
appcomps \
|
||||||
raptor \
|
|
||||||
mozldap \
|
mozldap \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
@ -70,6 +69,7 @@ LLIBS= \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(LIBNSPR) \
|
$(LIBNSPR) \
|
||||||
$(DIST)\lib\rdfutil_s.lib \
|
$(DIST)\lib\rdfutil_s.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
include <$(DEPTH)\config\rules.mak>
|
include <$(DEPTH)\config\rules.mak>
|
||||||
|
|
|
@ -78,10 +78,10 @@ SUB_LIBRARIES= \
|
||||||
|
|
||||||
LLIBS= \
|
LLIBS= \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
|
||||||
$(DIST)\lib\msgbsutl.lib \
|
$(DIST)\lib\msgbsutl.lib \
|
||||||
$(DIST)\lib\timer_s.lib \
|
$(DIST)\lib\timer_s.lib \
|
||||||
$(DIST)\lib\rdfutil_s.lib \
|
$(DIST)\lib\rdfutil_s.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(LIBNSPR) \
|
$(LIBNSPR) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ REQUIRES = xpcom \
|
||||||
rdf \
|
rdf \
|
||||||
msglocal \
|
msglocal \
|
||||||
intl \
|
intl \
|
||||||
|
unicharutil \
|
||||||
pref \
|
pref \
|
||||||
timer \
|
timer \
|
||||||
msgnews \
|
msgnews \
|
||||||
|
|
|
@ -66,6 +66,7 @@ LLIBS= \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
||||||
$(DIST)\lib\msgbsutl.lib \
|
$(DIST)\lib\msgbsutl.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(LIBNSPR) \
|
$(LIBNSPR) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,7 @@ LLIBS= \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(DIST)\lib\msgbsutl.lib \
|
$(DIST)\lib\msgbsutl.lib \
|
||||||
$(DIST)\lib\rdfutil_s.lib \
|
$(DIST)\lib\rdfutil_s.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(LIBNSPR) \
|
$(LIBNSPR) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,7 @@ REQUIRES = xpcom \
|
||||||
msgdb \
|
msgdb \
|
||||||
msglocal \
|
msglocal \
|
||||||
mimetype \
|
mimetype \
|
||||||
|
unicharutil \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
LIBRARY_NAME = $(MODULE)
|
LIBRARY_NAME = $(MODULE)
|
||||||
META_COMPONENT = mail
|
META_COMPONENT = mail
|
||||||
|
@ -59,6 +60,7 @@ CPP_OBJS=\
|
||||||
|
|
||||||
LLIBS=\
|
LLIBS=\
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(LIBNSPR) \
|
$(LIBNSPR) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -1,69 +0,0 @@
|
||||||
#!gmake
|
|
||||||
#
|
|
||||||
# The contents of this file are subject to the Netscape 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/NPL/
|
|
||||||
#
|
|
||||||
# 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 Netscape are
|
|
||||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
|
||||||
# Rights Reserved.
|
|
||||||
#
|
|
||||||
# Contributor(s):
|
|
||||||
|
|
||||||
DEPTH=..\..\..
|
|
||||||
MODULE = msglocal
|
|
||||||
LIBRARY_NAME = msglocal
|
|
||||||
META_COMPONENT = mail
|
|
||||||
MODULE_NAME = local_mail_services
|
|
||||||
REQUIRES = xpcom \
|
|
||||||
string \
|
|
||||||
mailnews \
|
|
||||||
msgbase \
|
|
||||||
msgsearch \
|
|
||||||
msgbaseutil \
|
|
||||||
msgdb \
|
|
||||||
necko \
|
|
||||||
txmgr \
|
|
||||||
rdf \
|
|
||||||
rdfutil \
|
|
||||||
mime \
|
|
||||||
intl \
|
|
||||||
pref \
|
|
||||||
nkcache \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
## exports
|
|
||||||
|
|
||||||
EXPORTS= \
|
|
||||||
nsMsgLocalCID.h \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
## library
|
|
||||||
|
|
||||||
CPP_OBJS=\
|
|
||||||
.\$(OBJDIR)\nsMsgLocalFactory.obj \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
SUB_LIBRARIES= \
|
|
||||||
$(DIST)\lib\msglocal_s.lib \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
LLIBS=\
|
|
||||||
$(DIST)\lib\xpcom.lib \
|
|
||||||
$(LIBNSPR) \
|
|
||||||
$(DIST)\lib\rdfutil_s.lib \
|
|
||||||
$(DIST)\lib\msgbsutl.lib \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
include <$(DEPTH)\config\rules.mak>
|
|
|
@ -1,56 +0,0 @@
|
||||||
# The contents of this file are subject to the Netscape 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/NPL/
|
|
||||||
#
|
|
||||||
# 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 Netscape are
|
|
||||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
|
||||||
# Rights Reserved.
|
|
||||||
#
|
|
||||||
# Contributor(s):
|
|
||||||
|
|
||||||
DEPTH=..\..\..
|
|
||||||
MODULE = mime
|
|
||||||
LIBRARY_NAME = mime
|
|
||||||
META_COMPONENT = mail
|
|
||||||
MODULE_NAME = mime_services
|
|
||||||
REQUIRES = xpcom \
|
|
||||||
string \
|
|
||||||
msgbase \
|
|
||||||
pref \
|
|
||||||
necko \
|
|
||||||
uconv \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
EXPORTS= \
|
|
||||||
nsMsgMimeCID.h \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
## library
|
|
||||||
|
|
||||||
CPP_OBJS=\
|
|
||||||
.\$(OBJDIR)\nsMimeModule.obj \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
SUB_LIBRARIES= \
|
|
||||||
$(DIST)\lib\mime_s.lib \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
LLIBS= \
|
|
||||||
$(LLIBS) \
|
|
||||||
$(LIBNSPR) \
|
|
||||||
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
|
|
||||||
$(DIST)\lib\xpcom.lib \
|
|
||||||
$(DIST)\lib\msgbsutl.lib \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
include <$(DEPTH)\config\rules.mak>
|
|
|
@ -33,7 +33,7 @@ REQUIRES = xpcom \
|
||||||
jar \
|
jar \
|
||||||
locale \
|
locale \
|
||||||
intl \
|
intl \
|
||||||
uconv \
|
uconv \
|
||||||
zlib \
|
zlib \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
@ -67,6 +67,7 @@ SUB_LIBRARIES= \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
LLIBS= \
|
LLIBS= \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
!ifdef MOZ_PERF
|
!ifdef MOZ_PERF
|
||||||
$(DIST)\lib\util.lib \
|
$(DIST)\lib\util.lib \
|
||||||
!endif
|
!endif
|
||||||
|
|
|
@ -48,7 +48,6 @@ REQUIRES = xpcom \
|
||||||
docshell \
|
docshell \
|
||||||
webBrowser_core \
|
webBrowser_core \
|
||||||
widget \
|
widget \
|
||||||
rdf \
|
|
||||||
uconv \
|
uconv \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
include <$(DEPTH)\config\config.mak>
|
include <$(DEPTH)\config\config.mak>
|
||||||
|
|
|
@ -49,6 +49,7 @@ SUB_LIBRARIES=\
|
||||||
LLIBS=\
|
LLIBS=\
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(DIST)\lib\timer_s.lib \
|
$(DIST)\lib\timer_s.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(LIBNSPR)
|
$(LIBNSPR)
|
||||||
|
|
||||||
# XXX Note dependencies on implementation dirs for factory methods.
|
# XXX Note dependencies on implementation dirs for factory methods.
|
||||||
|
|
|
@ -27,7 +27,6 @@ LIBRARY_NAME = gkwidget
|
||||||
MODULE_NAME = nsWidgetModule
|
MODULE_NAME = nsWidgetModule
|
||||||
REQUIRES = xpcom \
|
REQUIRES = xpcom \
|
||||||
string \
|
string \
|
||||||
widget \
|
|
||||||
necko \
|
necko \
|
||||||
uconv \
|
uconv \
|
||||||
gfx \
|
gfx \
|
||||||
|
|
|
@ -36,7 +36,6 @@ EXPORTS = \
|
||||||
MODULE=widget
|
MODULE=widget
|
||||||
REQUIRES = xpcom \
|
REQUIRES = xpcom \
|
||||||
string \
|
string \
|
||||||
widget \
|
|
||||||
layout \
|
layout \
|
||||||
gfx \
|
gfx \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
@ -41,7 +41,6 @@ REQUIRES = xpcom \
|
||||||
pref \
|
pref \
|
||||||
editor \
|
editor \
|
||||||
appcomps \
|
appcomps \
|
||||||
rdf \
|
|
||||||
webBrowser_core \
|
webBrowser_core \
|
||||||
uconv \
|
uconv \
|
||||||
chardet \
|
chardet \
|
||||||
|
|
|
@ -79,6 +79,7 @@ LLIBS= \
|
||||||
$(DIST)\lib\js3250.lib \
|
$(DIST)\lib\js3250.lib \
|
||||||
$(DIST)\lib\xpcom.lib \
|
$(DIST)\lib\xpcom.lib \
|
||||||
$(DIST)\lib\timer_s.lib \
|
$(DIST)\lib\timer_s.lib \
|
||||||
|
$(DIST)\lib\unicharutil_s.lib \
|
||||||
$(LIBNSPR) \
|
$(LIBNSPR) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче