Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use dynamic library & xpidl_module names from nmake build for win32 gmake builds for compatibility.

Browse Source 
bug #58981 sr=jag
This commit is contained in:
seawood%netscape.com 2002-01-16 05:10:09 +00:00
parent 83ce43a0cf
commit e56e20b1dc
51 changed files with 480 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/build/Makefile.in
View File

@ -29,7 +29,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = accessibility MODULE = accessibility
LIBRARY_NAME = accessibility LIBRARY_NAME = accessibility
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = access SHORT_LIBNAME = access
endif
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsAccessibilityModule MODULE_NAME = nsAccessibilityModule
REQUIRES = \ REQUIRES = \

7
config/autoconf.mk.in
View File

@ -43,7 +43,6 @@ MOZ_GFX_TOOLKIT = $(MOZ_WIDGET_TOOLKIT)
MOZ_JS_LIBS = @MOZ_JS_LIBS@ MOZ_JS_LIBS = @MOZ_JS_LIBS@
MOZ_GFX_TOOLKIT_LDFLAGS = @MOZ_GFX_TOOLKIT_LDFLAGS@ MOZ_GFX_TOOLKIT_LDFLAGS = @MOZ_GFX_TOOLKIT_LDFLAGS@
MOZ_WIDGET_TOOLKIT_LDFLAGS = @MOZ_WIDGET_TOOLKIT_LDFLAGS@ MOZ_WIDGET_TOOLKIT_LDFLAGS = @MOZ_WIDGET_TOOLKIT_LDFLAGS@
@ -351,9 +350,9 @@ MOZ_DISABLE_DTD_DEBUG = @MOZ_DISABLE_DTD_DEBUG@
MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
# XXX - these need to be cleaned up and have real checks added -cls # XXX - these need to be cleaned up and have real checks added -cls
CM_BLDTYPE=dbg CM_BLDTYPE=dbg
AWT_11=1 AWT_11=1
MOZ_BITS=32 MOZ_BITS=32
OS_TARGET=@OS_TARGET@ OS_TARGET=@OS_TARGET@
OS_ARCH=@OS_ARCH@ OS_ARCH=@OS_ARCH@
OS_RELEASE=@OS_RELEASE@ OS_RELEASE=@OS_RELEASE@

2
config/rules.mk
View File

@ -124,7 +124,7 @@ endif
ifndef LIBRARY ifndef LIBRARY
ifdef LIBRARY_NAME ifdef LIBRARY_NAME
ifeq ($(OS_ARCH),OS2) ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
ifdef SHORT_LIBNAME ifdef SHORT_LIBNAME
LIBRARY_NAME := $(SHORT_LIBNAME) LIBRARY_NAME := $(SHORT_LIBNAME)
endif endif

652
configure vendored
View File

File diff suppressed because it is too large Load Diff

15
configure.in
View File

@ -927,11 +927,11 @@ case "$target" in
MOZ_DEBUG_FLAGS='-Zi' MOZ_DEBUG_FLAGS='-Zi'
MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV' MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV'
MOZ_OPTIMIZE_FLAGS='-O1' MOZ_OPTIMIZE_FLAGS='-O1'
MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.lib' MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib'
MOZ_ZLIB_LIBS='$(DIST)/lib/zlib.lib' MOZ_ZLIB_LIBS='$(DIST)/lib/zlib.lib'
MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib' MOZ_PNG_LIBS='$(DIST)/lib/png.lib'
MOZ_MNG_LIBS='$(DIST)/lib/mozmng.lib' MOZ_MNG_LIBS='$(DIST)/lib/mng.lib'
MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib' MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib'
XPCOM_LIBS='$(DIST)/lib/xpcom.lib' XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)' MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
MOZ_COMPONENT_XPCOM_LIBS='$(XPCOM_LIBS)' MOZ_COMPONENT_XPCOM_LIBS='$(XPCOM_LIBS)'
@ -950,6 +950,7 @@ case "$target" in
OS_TARGET=WINNT OS_TARGET=WINNT
MOZ_WIDGET_TOOLKIT='windows' MOZ_WIDGET_TOOLKIT='windows'
BIN_SUFFIX='.exe' BIN_SUFFIX='.exe'
USE_SHORT_LIBNAME=1
dnl Hardcode to win95 for now - cls dnl Hardcode to win95 for now - cls
TARGET_NSPR_MDCPUCFG='\"md/_win95.cfg\"' TARGET_NSPR_MDCPUCFG='\"md/_win95.cfg\"'
@ -3077,7 +3078,6 @@ dnl Need cookie and wallet to build mozilla, this should
dnl not be the case, 18352 has been filed. dnl not be the case, 18352 has been filed.
dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352 dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352
MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector" MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector"
MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl"
dnl universalchardet is only built on win32 (bug XXXXXX) dnl universalchardet is only built on win32 (bug XXXXXX)
case "$target_os" in case "$target_os" in
@ -3091,6 +3091,8 @@ if test -n "$SUNCTL"; then
MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl" MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"
fi fi
MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl"
dnl XXX - remove this next milestone dnl XXX - remove this next milestone
if test -z "$enable_extensions" && test "$with_extensions"; then if test -z "$enable_extensions" && test "$with_extensions"; then
enable_extensions=$with_extensions enable_extensions=$with_extensions
@ -3123,6 +3125,9 @@ if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman`
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
fi fi
dnl Remove dupes
MOZ_EXTENSIONS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_EXTENSIONS}`
dnl ======================================================== dnl ========================================================
dnl experimental ldap features dnl experimental ldap features
dnl ======================================================== dnl ========================================================

2
content/build/Makefile.in
View File

@ -31,7 +31,9 @@ BUILD_DATE = gbdate.h
MODULE = content MODULE = content
LIBRARY_NAME = gkcontent LIBRARY_NAME = gkcontent
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = gkcontnt SHORT_LIBNAME = gkcontnt
endif
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsContentModule MODULE_NAME = nsContentModule
EXTRA_DSO_LIBS = gkgfx EXTRA_DSO_LIBS = gkgfx

4
dbm/src/Makefile.in
View File

@ -29,6 +29,10 @@ include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = mozdbm_s LIBRARY_NAME = mozdbm_s
LIB_IS_C_ONLY = 1 LIB_IS_C_ONLY = 1
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = dbm$(MOZ_BITS)
endif
CSRCS = \ CSRCS = \
db.c \ db.c \
h_bigkey.c \ h_bigkey.c \

4
dbm/tests/Makefile.in
View File

@ -31,7 +31,11 @@ PROGRAM = lots$(BIN_SUFFIX)
CSRCS = lots.c CSRCS = lots.c
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LIBS = dbm$(MOZ_BITS)
else
EXTRA_DSO_LIBS = mozdbm_s EXTRA_DSO_LIBS = mozdbm_s
endif
LIBS = $(EXTRA_DSO_LIBS) LIBS = $(EXTRA_DSO_LIBS)

7
docshell/base/Makefile.in
View File

@ -23,7 +23,12 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = docshell MODULE = docshell
ifeq ($(OS_ARCH),WINNT)
XPIDL_MODULE = docshell_base
endif
LIBRARY_NAME = basedocshell_s LIBRARY_NAME = basedocshell_s
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
@ -55,8 +60,6 @@ REQUIRES = xpcom \
nkcache \ nkcache \
$(NULL) $(NULL)
include $(DEPTH)/config/autoconf.mk
XPIDLSRCS = \ XPIDLSRCS = \
nsCDocShell.idl \ nsCDocShell.idl \
nsCDefaultURIFixup.idl \ nsCDefaultURIFixup.idl \

3
editor/libeditor/build/Makefile.in
View File

@ -58,6 +58,9 @@ REQUIRES = xpcom \
ifdef MOZ_PLAINTEXT_EDITOR_ONLY ifdef MOZ_PLAINTEXT_EDITOR_ONLY
# We're only building the Core PlainText Editor Source so just include # We're only building the Core PlainText Editor Source so just include
# the plain text registration file. # the plain text registration file.
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = texteditor
endif
CPPSRCS = nsTextEditorReg.cpp CPPSRCS = nsTextEditorReg.cpp
SHARED_LIBRARY_LIBS = $(NULL) SHARED_LIBRARY_LIBS = $(NULL)

2
embedding/components/build/Makefile.in
View File

@ -26,7 +26,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = embedcomponents MODULE = embedcomponents
LIBRARY_NAME = embedcomponents LIBRARY_NAME = embedcomponents
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = embedcmp SHORT_LIBNAME = embedcmp
endif
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = embedcomponents MODULE_NAME = embedcomponents
ifdef MOZ_PERF_METRICS ifdef MOZ_PERF_METRICS

2
embedding/tests/mfcembed/Makefile.in
View File

@ -25,7 +25,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
PROGRAM = mfcEmbed$(BIN_SUFFIX) PROGRAM = mfcembed$(BIN_SUFFIX)
RESFILE = MfcEmbed.res RESFILE = MfcEmbed.res
REQUIRES = \ REQUIRES = \

2
extensions/access-builtin/accessproxy/Makefile.in
View File

@ -35,7 +35,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = accessproxy MODULE = accessproxy
XPIDL_MODULE = accessproxy XPIDL_MODULE = accessproxy
LIBRARY_NAME = accessproxy LIBRARY_NAME = accessproxy
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = accproxy SHORT_LIBNAME = accproxy
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
docshell \ docshell \

2
extensions/inspector/build/src/Makefile.in
View File

@ -29,7 +29,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = inspector MODULE = inspector
LIBRARY_NAME = inspector LIBRARY_NAME = inspector
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = inspectr SHORT_LIBNAME = inspectr
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
gfx \ gfx \

2
extensions/pref/autoconfig/src/Makefile.in
View File

@ -41,7 +41,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = autoconfig MODULE = autoconfig
LIBRARY_NAME = autoconfig LIBRARY_NAME = autoconfig
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = autocfg SHORT_LIBNAME = autocfg
endif
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsAutoConfigModule MODULE_NAME = nsAutoConfigModule

2
extensions/transformiix/build/Makefile.in
View File

@ -29,7 +29,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = transformiix MODULE = transformiix
LIBRARY_NAME = transformiix LIBRARY_NAME = transformiix
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = t8iix SHORT_LIBNAME = t8iix
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
dom \ dom \

2
extensions/universalchardet/src/Makefile.in
View File

@ -31,7 +31,9 @@ LIBRARY_NAME = universalchardet
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsUniversalCharDetModule MODULE_NAME = nsUniversalCharDetModule
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = ucdet SHORT_LIBNAME = ucdet
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
uconv \ uconv \

2
extensions/xmlextras/build/src/Makefile.in
View File

@ -29,7 +29,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xmlextras MODULE = xmlextras
LIBRARY_NAME = xmlextras LIBRARY_NAME = xmlextras
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = xmlextra SHORT_LIBNAME = xmlextra
endif
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsXMLExtrasModule MODULE_NAME = nsXMLExtrasModule
REQUIRES = xpcom \ REQUIRES = xpcom \

2
gfx/src/windows/Makefile.in
View File

@ -27,7 +27,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = gfxwin MODULE = gfxwin
LIBRARY_NAME = gfxwin LIBRARY_NAME = gkgfxwin
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsGfxModule MODULE_NAME = nsGfxModule

2
intl/uconv/src/Makefile.in
View File

@ -32,8 +32,10 @@ EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsUConvModule MODULE_NAME = nsUConvModule
ifneq ($(OS_ARCH),WINNT)
# To avoid conflict with OS/2 system uconv.dll # To avoid conflict with OS/2 system uconv.dll
SHORT_LIBNAME = mozuconv SHORT_LIBNAME = mozuconv
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
intl \ intl \

1
jpeg/Makefile.in
View File

@ -31,6 +31,7 @@ LIBRARY_NAME = mozjpeg
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = jpeg$(MOZ_BITS)$(VERSION_NUMBER)
MAPFILE=$(LIBRARY_NAME).map MAPFILE=$(LIBRARY_NAME).map
endif endif

4
js/jsd/Makefile.in
View File

@ -32,6 +32,10 @@ MODULE = jsdebug
LIBRARY_NAME = jsd LIBRARY_NAME = jsd
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = jsd$(MOZ_BITS)$(VERSION_NUMBER)
endif
# REQUIRES = java js # REQUIRES = java js
REQUIRES = js REQUIRES = js

4
js/src/Makefile.in
View File

@ -43,6 +43,10 @@ MODULE = js
LIBRARY_NAME = mozjs LIBRARY_NAME = mozjs
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = js$(MOZ_BITS)$(VERSION_NUMBER)
endif
ifdef NS_TRACE_MALLOC ifdef NS_TRACE_MALLOC
REQUIRES = xpcom REQUIRES = xpcom
endif endif

1
js/src/liveconnect/Makefile.in
View File

@ -42,6 +42,7 @@ MODULE = java
LIBRARY_NAME = jsj LIBRARY_NAME = jsj
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = jsj$(MOZ_BITS)$(VERSION_NUMBER)
MAPFILE = $(LIBRARY_NAME).map MAPFILE = $(LIBRARY_NAME).map
endif endif
REQUIRES = js \ REQUIRES = js \

13
js/src/xpconnect/src/Makefile.in
View File

@ -45,6 +45,11 @@ EXPORT_LIBRARY = 1
SHORT_LIBNAME = xpconect SHORT_LIBNAME = xpconect
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = xpconnect MODULE_NAME = xpconnect
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
SHORT_LIBNAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
js \ js \
@ -82,14 +87,6 @@ CPPSRCS = \
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
# this is automatically discovered under BeOS
ifneq ($(OS_ARCH),BeOS)
LIBS += \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
endif
EXTRA_DSO_LDOPTS += \ EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \ $(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \ $(MOZ_JS_LIBS) \

2
layout/build/Makefile.in
View File

@ -29,7 +29,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = layout MODULE = layout
LIBRARY_NAME = gklayout LIBRARY_NAME = gklayout
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = gkhtml SHORT_LIBNAME = gkhtml
endif
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsLayoutModule MODULE_NAME = nsLayoutModule
EXTRA_DSO_LIBS = gkgfx EXTRA_DSO_LIBS = gkgfx

3
mailnews/base/build/Makefile.in
View File

@ -28,6 +28,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = msgbase MODULE = msgbase
LIBRARY_NAME = mailnews LIBRARY_NAME = mailnews
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = msgbase
endif
META_COMPONENT = mail META_COMPONENT = mail
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1

3
mailnews/compose/build/Makefile.in
View File

@ -33,6 +33,9 @@ EXPORT_LIBRARY = 1
SHORT_LIBNAME = msgcompo SHORT_LIBNAME = msgcompo
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsMsgComposeModule MODULE_NAME = nsMsgComposeModule
ifeq ($(OS_ARCH),WINNT)
XPIDL_MODULE = msgcompo
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
msgbase \ msgbase \

3
mailnews/compose/public/Makefile.in
View File

@ -27,6 +27,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = msgcompose MODULE = msgcompose
ifeq ($(OS_ARCH),WINNT)
XPIDL_MODULE = msgcompo
endif
EXPORTS = \ EXPORTS = \
$(NULL) $(NULL)

3
modules/libimg/mng/Makefile.in
View File

@ -29,6 +29,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = mng MODULE = mng
LIBRARY_NAME = mozmng LIBRARY_NAME = mozmng
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = mng
endif
REQUIRES = $(JPEG_REQUIRES) \ REQUIRES = $(JPEG_REQUIRES) \
$(ZLIB_REQUIRES) \ $(ZLIB_REQUIRES) \

4
modules/libimg/png/Makefile.in
View File

@ -30,6 +30,10 @@ MODULE = png
LIBRARY_NAME = mozpng LIBRARY_NAME = mozpng
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = png
endif
REQUIRES = $(ZLIB_REQUIRES) \ REQUIRES = $(ZLIB_REQUIRES) \
$(NULL) $(NULL)

4
modules/libpref/src/Makefile.in
View File

@ -31,6 +31,10 @@ LIBRARY_NAME = pref
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = nsPrefModule MODULE_NAME = nsPrefModule
ifeq ($(OS_ARCH),WINNT)
LIBRARY_NAME = xppref$(MOZ_BITS)
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
js \ js \

6
modules/oji/src/Makefile.in
View File

@ -52,7 +52,11 @@ REQUIRES = xpcom \
ifdef MOZ_OJI ifdef MOZ_OJI
LIBRARY_NAME = oji LIBRARY_NAME = oji
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LIBS = jsj$(MOZ_BITS)$(VERSION_NUMBER)
else
EXTRA_DSO_LIBS = jsj EXTRA_DSO_LIBS = jsj
endif
CPPSRCS = \ CPPSRCS = \
jvmmgr.cpp \ jvmmgr.cpp \
@ -76,7 +80,7 @@ EXPORTS = \
endif endif
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \ $(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \ $(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \ $(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \ $(MOZ_JS_LIBS) \

2
modules/plugin/samples/default/windows/Makefile.in
View File

@ -50,6 +50,8 @@ FORCE_SHARED_LIB = 1
# Force use of PIC # Force use of PIC
FORCE_USE_PIC = 1 FORCE_USE_PIC = 1
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
CXXFLAGS += -GX CXXFLAGS += -GX

4
netwerk/socket/base/Makefile.in
View File

@ -47,6 +47,10 @@ XPIDLSRCS = \
nsISSLSocketControl.idl \ nsISSLSocketControl.idl \
$(NULL) $(NULL)
ifeq ($(OS_ARCH),WINNT)
NO_GEN_XPT=1
endif
# we don't want the shared lib, but we want to force the creation of a # we don't want the shared lib, but we want to force the creation of a
# static lib. # static lib.
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1

8
netwerk/test/Makefile.in
View File

@ -61,8 +61,14 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LIBS = dbm$(MOZ_BITS)
else
EXTRA_DSO_LIBS = mozdbm_s
endif
LIBS = \ LIBS = \
$(DIST)/lib/$(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) \ $(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \ $(XPCOM_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

4
security/manager/Makefile.in
View File

@ -90,7 +90,11 @@ depend dependclean export::
# due to bug 114748, so use _NSS_LIB_PREFIX instead # due to bug 114748, so use _NSS_LIB_PREFIX instead
libs:: libs::
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX)
else
cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX) cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
ifdef NSS_3_4 ifdef NSS_3_4

6
webshell/tests/viewer/Makefile.in
View File

@ -108,12 +108,16 @@ XP_DIST_LIBS = \
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
RESFILE = viewer.res RESFILE = viewer.res
XP_DIST_LIBS += -lxpwidgets_s -lDebugRobot XP_DIST_LIBS += -lxpwidgets_s -ldbgrobot
endif endif
ifdef MOZ_OJI ifdef MOZ_OJI
ifeq ($(OS_ARCH),WINNT)
XP_DIST_LIBS += -ljsj$(MOZ_BITS)$(VERSION_NUMBER)
else
XP_DIST_LIBS += -ljsj XP_DIST_LIBS += -ljsj
endif endif
endif
ifdef MOZ_PERF_METRICS ifdef MOZ_PERF_METRICS
XP_DIST_LIBS += -lmozutil_s XP_DIST_LIBS += -lmozutil_s
endif endif

4
widget/src/windows/expose/ISimpleDOMDocument/Makefile.in
View File

@ -26,8 +26,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = ISimpleDOMDocumentMarshall MODULE = ISimpleDOMDocumentMarshal
LIBRARY_NAME = ISimpleDOMDocumentMarshall LIBRARY_NAME = ISimpleDOMDocumentMarshal
DEFFILE = $(srcdir)/ISimpleDOMDocument.def DEFFILE = $(srcdir)/ISimpleDOMDocument.def
DEFINES += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400 DEFINES += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400

4
widget/src/windows/expose/ISimpleDOMNode/Makefile.in
View File

@ -26,8 +26,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = ISimpleDOMNodeMarshall MODULE = ISimpleDOMNodeMarshal
LIBRARY_NAME = ISimpleDOMNodeMarshall LIBRARY_NAME = ISimpleDOMNodeMarshal
DEFFILE = $(srcdir)/ISimpleDOMNode.def DEFFILE = $(srcdir)/ISimpleDOMNode.def
DEFINES += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400 DEFINES += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400

4
xpcom/proxy/public/Makefile.in
View File

@ -27,7 +27,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = xpcom MODULE = xpcom
ifeq ($(OS_ARCH),WINNT)
XPIDL_MODULE = proxyObject
else
XPIDL_MODULE = proxyObjInst XPIDL_MODULE = proxyObjInst
endif
EXPORTS = \ EXPORTS = \
nsProxyEvent.h \ nsProxyEvent.h \

4
xpcom/threads/Makefile.in
View File

@ -27,7 +27,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = xpcom MODULE = xpcom
ifeq ($(OS_ARCH),WINNT)
XPIDL_MODULE = xpcom_thread
else
XPIDL_MODULE = xpcom_threads XPIDL_MODULE = xpcom_threads
endif
LIBRARY_NAME = xpcomthreads_s LIBRARY_NAME = xpcomthreads_s
REQUIRES = string \ REQUIRES = string \
$(NULL) $(NULL)

4
xpfe/bootstrap/Makefile.in
View File

@ -83,9 +83,13 @@ endif
else else
EXTRA_DSO_LIBS = gkgfx mpfilelocprovider_s EXTRA_DSO_LIBS = gkgfx mpfilelocprovider_s
ifdef MOZ_OJI ifdef MOZ_OJI
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LIBS += jsj$(MOZ_BITS)$(VERSION_NUMBER)
else
EXTRA_DSO_LIBS += jsj EXTRA_DSO_LIBS += jsj
endif endif
endif endif
endif
CPPSRCS = \ CPPSRCS = \

4
xpinstall/packager/Makefile.in
View File

@ -100,7 +100,11 @@ include $(topsrcdir)/config/rules.mk
GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE) GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE)
OSPACKAGE = unix OSPACKAGE = unix
ifdef USE_SHORT_LIBNAME
MOZILLA_BIN = $(DIST)/bin/mozilla$(BIN_SUFFIX)
else
MOZILLA_BIN = $(DIST)/bin/mozilla-bin MOZILLA_BIN = $(DIST)/bin/mozilla-bin
endif
ifeq ($(OS_ARCH),IRIX) ifeq ($(OS_ARCH),IRIX)
STRIP_FLAGS = -f STRIP_FLAGS = -f

2
xpinstall/wizard/windows/GetShortPathName/Makefile.in
View File

@ -32,6 +32,8 @@ USE_NON_MT_LIBS = 1
CPPSRCS = GetShortPathName.cpp CPPSRCS = GetShortPathName.cpp
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
#ifdef MOZ_TOOLS #ifdef MOZ_TOOLS

2
xpinstall/wizard/windows/ds32/Makefile.in
View File

@ -32,6 +32,8 @@ USE_NON_MT_LIBS = 1
CPPSRCS = ds32.cpp CPPSRCS = ds32.cpp
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
#ifdef MOZ_TOOLS #ifdef MOZ_TOOLS

2
xpinstall/wizard/windows/nsinstall/Makefile.in
View File

@ -36,6 +36,8 @@ CPPSRCS = nsinstall.cpp
LIBS = $(EXTRA_DSO_LIBS) LIBS = $(EXTRA_DSO_LIBS)
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
libs:: $(PROGRAM) libs:: $(PROGRAM)

2
xpinstall/wizard/windows/nsztool/Makefile.in
View File

@ -35,6 +35,8 @@ CPPSRCS = nsztool.cpp
LIBS = $(EXTRA_DSO_LIBS) LIBS = $(EXTRA_DSO_LIBS)
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
LDFLAGS += /SUBSYSTEM:WINDOWS /MACHINE:i386 LDFLAGS += /SUBSYSTEM:WINDOWS /MACHINE:i386

2
xpinstall/wizard/windows/ren8dot3/Makefile.in
View File

@ -32,6 +32,8 @@ USE_NON_MT_LIBS = 1
CPPSRCS = ren8dot3.cpp CPPSRCS = ren8dot3.cpp
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
libs:: $(PROGRAM) libs:: $(PROGRAM)

5
xpinstall/wizard/windows/setup/Makefile.in
View File

@ -30,7 +30,6 @@ PROGRAM = setup$(BIN_SUFFIX)
RESFILE = setup.res RESFILE = setup.res
REQUIRES = \ REQUIRES = \
setuprsc \ setuprsc \
uninstall \
xpnet \ xpnet \
$(NULL) $(NULL)
@ -59,6 +58,10 @@ CPPSRCS = \
LIBS = $(EXTRA_DSO_LIBS) LIBS = $(EXTRA_DSO_LIBS)
LOCAL_INCLUDES = -I$(srcdir)/../uninstall
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
OS_LIBS += ole32.lib comdlg32.lib shell32.lib version.lib OS_LIBS += ole32.lib comdlg32.lib shell32.lib version.lib

2
xpinstall/wizard/windows/uninstall/Makefile.in
View File

@ -46,6 +46,8 @@ CPPSRCS = \
OS_LIBS += shell32.lib version.lib OS_LIBS += shell32.lib version.lib
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
libs:: $(PROGRAM) libs:: $(PROGRAM)