Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-25 22:29:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Latest batch of OS/2 makefile changes. Batch 09. Bug #34106

Browse Source
This commit is contained in:
cls%seawood.org 2000-04-18 10:27:21 +00:00
parent c4e4f69d22
commit ad1dd19d63
6 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
layout/build/Makefile.in
View File

@ -30,7 +30,15 @@ BUILD_DATE = gbdate.h
MODULE = layout
LIBRARY_NAME = raptorhtml
SHORT_LIBNAME = nglayout
IS_COMPONENT = 1
EXTRA_DSO_LIBS = jsdom
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS += nggfx
else
EXTRA_DSO_LIBS += raptorgfx
endif
REQUIRES = xpcom raptor dom js
@ -47,38 +55,38 @@ endif
EXPORTS = nsLayoutCID.h $(BUILD_DATE)
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libraptorevents_s.a \
$(DIST)/lib/libraptorhtmlbase_s.a \
$(DIST)/lib/libnglhtmlcon_s.a \
$(DIST)/lib/libraptorhtmldoc_s.a \
$(DIST)/lib/libraptorhtmlforms_s.a \
$(DIST)/lib/libraptorhtmlstyle_s.a \
$(DIST)/lib/libraptorhtmltable_s.a \
$(DIST)/lib/libraptorxmlcontent_s.a \
$(DIST)/lib/libraptorxmldoc_s.a \
$(DIST)/lib/libraptorxulcontent_s.a \
$(DIST)/lib/libraptorxulbase_s.a \
$(DIST)/lib/libraptorxbl_s.a \
$(DIST)/lib/libraptorlayout_s.a \
$(DIST)/lib/libraptorevents_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorhtmlbase_s.$(LIB_SUFFIX) \
$(DIST)/lib/libnglhtmlcon_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorhtmldoc_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorhtmlforms_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorhtmlstyle_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorhtmltable_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorxmlcontent_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorxmldoc_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorxulcontent_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorxulbase_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorxbl_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorlayout_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_PERF
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/libmozutil_s.a \
$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
$(NULL)
endif
ifdef MOZ_MATHML
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/libraptormathmlcontent_s.a \
$(DIST)/lib/libraptormathmlbase_s.a \
$(DIST)/lib/libraptormathmlcontent_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptormathmlbase_s.$(LIB_SUFFIX) \
$(NSNULL)
endif
ifdef MOZ_SVG
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/libraptorsvgcontent_s.a \
$(DIST)/lib/libraptorsvgbase_s.a \
$(DIST)/lib/libraptorsvgcontent_s.$(LIB_SUFFIX) \
$(DIST)/lib/libraptorsvgbase_s.$(LIB_SUFFIX) \
$(NSNULL)
endif
@ -88,13 +96,15 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
$(NSPR_LIBS) \
$(XPCOM_LIBS) \
-lraptorgfx \
-ljsdom \
-lmozjs \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
EXPORT_OBJS = 1
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_HTML
@ -112,3 +122,8 @@ $(BUILD_DATE): FORCE
$(RM) $@
$(PERL) $(srcdir)/gbdate.pl > $@
# To prevent ILink from crashing
ifeq ($(MOZ_OS2_TOOLS),VACPP)
OS_DLLFLAGS := ilink /FREE /NOE /NOL /DLL /O:nglayout.dll /M /INC:_dllentry
endif

6
netwerk/build/Makefile.in
View File

@ -33,9 +33,9 @@ IS_COMPONENT = 1
CPPSRCS = nsNetModule.cpp
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libneckobase_s.a \
$(DIST)/lib/libneckodns_s.a \
$(DIST)/lib/libneckosocket_s.a \
$(DIST)/lib/libneckobase_s.$(LIB_SUFFIX) \
$(DIST)/lib/libneckodns_s.$(LIB_SUFFIX) \
$(DIST)/lib/libneckosocket_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES = \

9
profile/pref-migrator/src/Makefile.in
View File

@ -41,9 +41,14 @@ EXPORTS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(NSPR_LIBS) \
$(XPCOM_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
# XXX os/2's gcc crashes on nsPrefMigration.cpp ("virtual memory exhausted")
ifeq ($(MOZ_OS2_TOOLS),EMX)
CXXFLAGS := $(filter-out -g,$(CXXFLAGS))
endif

2
rdf/brprof/build/Makefile.in
View File

@ -34,7 +34,7 @@ CPPSRCS = nsBrowsingProfileFactory.cpp
REQUIRES = xpcom
SHARED_LIBRARY_LIBS = $(DIST)/lib/libbrprof_s.a
SHARED_LIBRARY_LIBS = $(DIST)/lib/libbrprof_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \

6
rdf/chrome/build/Makefile.in
View File

@ -36,7 +36,7 @@ CPPSRCS = nsChromeFactory.cpp
LOCAL_INCLUDES = -I$(srcdir)/../src
SHARED_LIBRARY_LIBS = $(DIST)/lib/libchrome_s.a
SHARED_LIBRARY_LIBS = $(DIST)/lib/libchrome_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
@ -45,6 +45,10 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifeq ($(OS_ARCH),os2)
EXTRA_DSO_LDOPTS += $(MOZ_TIMER_LIBS)
endif
include $(topsrcdir)/config/rules.mk
$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile

10
webshell/src/Makefile.in
View File

@ -28,6 +28,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = raptor
LIBRARY_NAME = raptorwebwidget
SHORT_LIBNAME = webshell
EXTRA_DSO_LIBS = jsdom docshell
ifeq ($(OS_ARCH),Rhapsody)
IS_COMPONENT = 1
@ -42,14 +44,14 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
-ljsdom \
-lmozjs \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \
-ldocshell \
$(NULL)
ifdef MOZ_PERF
EXTRA_DSO_LDOPTS += \
$(DIST)/lib/libmozutil_s.a \
$(MKSHLIB_FORCE_ALL) \
$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
$(MKSHLIB_UNFORCE_ALL) \
$(NULL)
endif