Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nobrainer changes while thinking about mingw support

Browse Source 
Bug #134113 r=dmose
This commit is contained in:
seawood%netscape.com 2003-01-03 08:58:59 +00:00
parent 60e790cacd
commit 16e7da2837
24 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/libxpical/Makefile.in
View File

@ -72,8 +72,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(MOZ_COMPONENT_LIBS) \
-lmozicalss \
-lmozical \
$(call EXPAND_MOZLIBNAME,mozicalss mozical) \
$(NULL)
DEFINES += -DICAL_DEBUG

7
config/Makefile.in
View File

@ -111,12 +111,7 @@ libs::
$(RM) -rf $(DIST)/sdk/nspr/bin $(DIST)/sdk/nspr/share
mv $(DIST)/sdk/nspr/lib $(DIST)/sdk/nspr/bin
ifndef DISABLE_DIST_GRE
ifeq ($(OS_ARCH),OS2)
$(NSINSTALL) -D $(GRE_DIST)
cp $(DIST)/sdk/nspr/bin/$(LIB_PREFIX)*$(DLL_SUFFIX) $(GRE_DIST)
else
$(INSTALL) $(DIST)/sdk/nspr/bin/$(LIB_PREFIX)*$(DLL_SUFFIX) $(GRE_DIST)
endif
$(INSTALL) $(DIST)/sdk/nspr/bin/*$(DLL_SUFFIX) $(GRE_DIST)
endif
endif

45
config/rules.mk
View File

@ -81,24 +81,16 @@ else
ELOG :=
endif
#
# Library rules
#
# If BUILD_SHARED_LIBS or FORCE_SHARED_LIB is set and
# FORCE_STATIC_LIB is not set,
# the shared library will be built.
# If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set,
# the static library will be built.
#
ifeq ($(MOZ_OS2_TOOLS),VACPP)
_EXTRA_DSO_RELATIVE_PATHS=1
_LIBNAME_RELATIVE_PATHS=1
else
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
ifeq ($(OS_ARCH),WINNT)
ifndef SRCS_IN_OBJDIR
_NO_AUTO_VARS=1
endif
_EXTRA_DSO_RELATIVE_PATHS=1
ifndef GNU_CC
_LIBNAME_RELATIVE_PATHS=1
endif
endif
endif
@ -112,15 +104,28 @@ else
_VPATH_SRCS = $<
endif
ifdef _EXTRA_DSO_RELATIVE_PATHS
EXTRA_DSO_LIBS := $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(EXTRA_DSO_LIBS)))
EXTRA_DSO_LIBS := $(filter-out %/bin %/lib,$(EXTRA_DSO_LIBS))
EXTRA_DSO_LDOPTS := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(EXTRA_DSO_LDOPTS))
LIBS := $(patsubst -l%,$(DIST)/lib/$(LIB_PREFIX)%.$(LIB_SUFFIX),$(LIBS))
ifdef _LIBNAME_RELATIVE_PATHS
EXPAND_LIBNAME = $(addsuffix .$(LIB_SUFFIX),$(1))
EXPAND_MOZLIBNAME = $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(1)))
else
EXTRA_DSO_LIBS := $(addprefix -l,$(EXTRA_DSO_LIBS))
EXPAND_LIBNAME = $(addprefix -l,$(1))
EXPAND_MOZLIBNAME = $(addprefix -l,$(1))
endif
ifdef EXTRA_DSO_LIBS
EXTRA_DSO_LIBS := $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS))
endif
#
# Library rules
#
# If BUILD_SHARED_LIBS or FORCE_SHARED_LIB is set and
# FORCE_STATIC_LIB is not set,
# the shared library will be built.
# If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set,
# the static library will be built.
#
ifndef LIBRARY
ifdef LIBRARY_NAME
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
@ -160,7 +165,7 @@ DEF_FILE := $(SHARED_LIBRARY:.dll=.def)
endif
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
IMPORT_LIBRARY := $(SHARED_LIBRARY:.dll=.lib)
IMPORT_LIBRARY := $(SHARED_LIBRARY:.dll=.$(LIB_SUFFIX))
endif
endif # MKSHLIB

2
content/build/Makefile.in
View File

@ -104,8 +104,8 @@ endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)

2
intl/build/Makefile.in
View File

@ -80,8 +80,8 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

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

@ -103,9 +103,10 @@ endif
endif
endif
EXTRA_DSO_LDOPTS = $(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
EXTRA_DSO_LDOPTS = \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)

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

@ -131,8 +131,10 @@ endif
endif
ifeq ($(OS_ARCH),WINNT)
ifndef GNU_CXX
# use pre-compiled headers
CXXFLAGS += -YX -Fp$(LIBRARY_NAME).pch
# precompiled headers require write access to .pch which breaks -j builds
.NOTPARALLEL::
endif
endif

2
layout/build/Makefile.in
View File

@ -91,8 +91,8 @@ endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)

2
mailnews/import/src/Makefile.in
View File

@ -77,8 +77,8 @@ include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)

2
mailnews/mapi/mapihook/src/Makefile.in
View File

@ -86,8 +86,8 @@ endif
EXTRA_DSO_LDOPTS= \
$(EXTRA_DSO_LIBS) \
$(XPCOM_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
modules/plugin/base/src/Makefile.in
View File

@ -108,8 +108,8 @@ EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

2
netwerk/build/Makefile.in
View File

@ -91,8 +91,8 @@ endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(ZLIB_LIBS) \
$(NULL)

2
rdf/build/Makefile.in
View File

@ -58,8 +58,8 @@ SHARED_LIBRARY_LIBS = \
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
uriloader/build/Makefile.in
View File

@ -65,8 +65,8 @@ endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)

6
widget/src/build/Makefile.in
View File

@ -60,14 +60,14 @@ SHARED_LIBRARY_LIBS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_WIDGET -DMOZ_UNICODE
DEFINES += -D_IMPL_NS_WIDGET -DMOZ_UNICODE -DMOZ_AIMM

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

@ -100,6 +100,6 @@ include $(topsrcdir)/config/rules.mk
# Silly case-insensitive fs
export:: IENUMFE.CPP
cp $< L_Ienumfe.cpp
cp -a $< L_Ienumfe.cpp

5
xpcom/components/Makefile.in
View File

@ -91,7 +91,8 @@ FORCE_STATIC_LIB = 1
# Force use of PIC
FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM
DEFINES += -D_IMPL_NS_COM -DEXPORT_XPTI_API

2
xpcom/proxy/src/Makefile.in
View File

@ -39,7 +39,7 @@ CPPSRCS = \
nsProxyObjectManager.cpp \
$(NULL)
DEFINES += -D_IMPL_NS_COM -DEXPORT_XPTC_API
DEFINES += -D_IMPL_NS_COM -DEXPORT_XPTC_API -DEXPORT_XPTI_API
# No shared lib; Force creation of static lib
FORCE_STATIC_LIB = 1

2
xpcom/reflect/xptcall/src/Makefile.in
View File

@ -42,5 +42,5 @@ FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DEXPORT_XPTC_API
DEFINES += -DEXPORT_XPTC_API -D_IMPL_NS_COM -D_IMPL_NS_BASE

2
xpcom/reflect/xptcall/src/md/win32/Makefile.in
View File

@ -51,6 +51,6 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DEXPORT_XPTC_API
DEFINES += -DEXPORT_XPTC_API -D_IMPL_NS_COM -D_IMPL_NS_BASE
LOCAL_INCLUDES = -I$(srcdir)/../..

2
xpcom/reflect/xptinfo/src/Makefile.in
View File

@ -55,5 +55,5 @@ include $(topsrcdir)/config/rules.mk
# For nsManifestLineReader class.
LOCAL_INCLUDES = -I$(srcdir)/../../../ds
DEFINES += -DEXPORT_XPTI_API -DEXPORT_XPT_API
DEFINES += -DEXPORT_XPTI_API -DEXPORT_XPT_API -D_IMPL_NS_COM -D_IMPL_NS_BASE

2
xpfe/browser/src/Makefile.in
View File

@ -61,8 +61,8 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
xpfe/components/build/Makefile.in
View File

@ -128,10 +128,10 @@ LOCAL_INCLUDES += \
endif
EXTRA_DSO_LDOPTS = \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/config/rules.mk

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

@ -43,6 +43,8 @@ GARBAGE_DIRS += $(DIST)/include/$(MODULE)
FORCE_SHARED_LIB=1
LOCAL_INCLUDES = -I$(srcdir)
include $(topsrcdir)/config/rules.mk
# Hack to get around the default rules insisting that .lib should exist