Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 09:30:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OS/2 Makefile.in tweaks. Batch 10 & 11. Bug #34106

Browse Source
This commit is contained in:
cls%seawood.org 2000-05-02 01:18:46 +00:00
parent 44fc19a1b5
commit 04417332fe
19 changed files with 99 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docshell/build/Makefile.in
View File

@ -28,19 +28,20 @@ MODULE = docshell
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = docshell
EXTRA_DSO_LIBS = jsdom
CPPSRCS = \
nsDocShellModule.cpp \
$(NULL)
SHARED_LIBRARY_LIBS= \
$(DIST)/lib/libbasedocshell_s.a \
$(DIST)/lib/libbasedocshell_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS= \
-L$(DIST)/bin \
-lmozjs \
-ljsdom \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NULL)

14
dom/src/build/Makefile.in
View File

@ -39,18 +39,18 @@ CPPSRCS = \
$(NULL)
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libjsdombase_s.a \
$(DIST)/lib/libjsdomcore_s.a \
$(DIST)/lib/libjsdomevents_s.a \
$(DIST)/lib/libjsdomrange_s.a \
$(DIST)/lib/libjsdomhtml_s.a \
$(DIST)/lib/libjsdomcss_s.a \
$(DIST)/lib/libjsdombase_s.$(LIB_SUFFIX) \
$(DIST)/lib/libjsdomcore_s.$(LIB_SUFFIX) \
$(DIST)/lib/libjsdomevents_s.$(LIB_SUFFIX) \
$(DIST)/lib/libjsdomrange_s.$(LIB_SUFFIX) \
$(DIST)/lib/libjsdomhtml_s.$(LIB_SUFFIX) \
$(DIST)/lib/libjsdomcss_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_TIMER_LIBS) \
$(MOZ_COMPONENT_LIBS) \
-lmozjs \
$(MOZ_JS_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

7
embedding/browser/build/Makefile.in
View File

@ -30,19 +30,20 @@ IS_COMPONENT = 1
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = webbrwsr
EXTRA_DSO_LIBS = jsdom
CPPSRCS = \
nsWebBrowserModule.cpp \
$(NULL)
SHARED_LIBRARY_LIBS= \
$(DIST)/lib/libnsWebBrowser_s.a \
$(DIST)/lib/libnsWebBrowserSetup_s.a \
$(DIST)/lib/libnsWebBrowser_s.$(LIB_SUFFIX) \
$(DIST)/lib/libnsWebBrowserSetup_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS= \
-L$(DIST)/bin \
-ljsdom \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)

8
extensions/wallet/build/Makefile.in
View File

@ -41,10 +41,10 @@ LOCAL_INCLUDES = \
$(NULL)
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libcookieviewer_s.a \
$(DIST)/lib/libsignonviewer_s.a \
$(DIST)/lib/libwalletpreview_s.a \
$(DIST)/lib/libwalleteditor_s.a \
$(DIST)/lib/libcookieviewer_s.$(LIB_SUFFIX) \
$(DIST)/lib/libsignonviewer_s.$(LIB_SUFFIX) \
$(DIST)/lib/libwalletpreview_s.$(LIB_SUFFIX) \
$(DIST)/lib/libwalleteditor_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \

7
gfx/src/Makefile.in
View File

@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = raptor
LIBRARY_NAME = raptorgfx
SHORT_LIBNAME = nggfx
REQUIRES = util img xpcom raptor netlib dom js
@ -68,7 +69,7 @@ CPPSRCS = \
nsImageNetContextAsync.cpp \
nsImageNetContextSync.cpp \
nsImageRenderer.cpp \
nsRenderingContextImpl.cpp \
nsRenderingContextImpl.cpp \
nsImageRequest.cpp \
nsImageSystemServices.cpp \
nsImageURL.cpp \
@ -79,8 +80,8 @@ CPPSRCS = \
$(NULL)
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libimg_s.a \
$(DIST)/lib/libmozutil_s.a \
$(DIST)/lib/libimg_s.$(LIB_SUFFIX) \
$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \

8
htmlparser/src/Makefile.in
View File

@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = htmlparser
LIBRARY_NAME = raptorhtmlpars
IS_COMPONENT = 1
SHORT_LIBNAME = htmlpars
EXTRA_DSO_LIBS = expat_s xmltok_s mozutil_s
REQUIRES = xpcom netlib raptor
@ -109,12 +111,12 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/libexpat_s.a \
$(DIST)/lib/libxmltok_s.a \
$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_PERF
EXTRA_DSO_LDOPTS += \
$(DIST)/lib/libmozutil_s.a \
$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
$(NULL)
endif

4
intl/locale/src/Makefile.in
View File

@ -29,7 +29,11 @@ include $(DEPTH)/config/autoconf.mk
MODULE = locale
LIBRARY_NAME = nslocale_s
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
DIRS = os2
else
DIRS = unix
endif
REQUIRES = xpcom unicharutil

8
intl/locale/src/os2/Makefile.in
View File

@ -40,8 +40,8 @@ CPPSRCS = \
$(NULL)
EXTRA_DSO_LDOPTS = $(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_DSO_LDOPTS += libuls.lib
@ -51,7 +51,5 @@ endif
include $(topsrcdir)/config/rules.mk
INCLUDES += $(srcdir)/..
OS_LIBS += $(NSPR_LIBS)
INCLUDES += -I$(srcdir)/..

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

@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = uconv
LIBRARY_NAME = uconv
IS_COMPONENT = 1
# To avoid conflict with OS/2 system uconv.dll
SHORT_LIBNAME = mozuconv
REQUIRES = libxpcom
@ -43,7 +45,6 @@ CPPSRCS = \
nsTextToSubURI.cpp \
nsUnicodeDecodeHelper.cpp \
nsUnicodeEncodeHelper.cpp \
nsUNIXCharset.cpp \
nsCharsetAliasImp.cpp \
nsURLProperties.cpp \
nsMappingCache.cpp \
@ -53,17 +54,34 @@ CPPSRCS = \
$(NULL)
EXPORT_RESOURCE = \
$(srcdir)/unixcharset.properties \
$(srcdir)/charsetalias.properties \
$(srcdir)/charsetTitles.properties \
$(srcdir)/charsetData.properties \
$(srcdir)/acceptlanguage.properties \
$(srcdir)/acceptlanguage.properties \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += nsOS2Charset.cpp
EXPORT_RESOURCE += $(srcdir)/os2charset.properties
else
CPPSRCS += nsUNIXCharset.cpp
EXPORT_RESOURCE += $(srcdir)/unixcharset.properties
endif
EXTRA_DSO_LDOPTS = $(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
OS_LIBS += libuls.lib
else
OS_LIBS += -llibuni
endif
endif
LOCAL_INCLUDES = -I$(srcdir)/../ucvlatin -I$(srcdir)/../ucvja
include $(topsrcdir)/config/rules.mk
CFLAGS += -DUSE_NSREG
@ -74,8 +92,6 @@ ifeq (,$(filter AIX OpenVMS QNX,$(OS_ARCH)))
CFLAGS += -D__STDC__
endif
INCLUDES += -I$(srcdir)/../ucvlatin -I$(srcdir)/../ucvja
install::
$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res

8
jpeg/Makefile.in
View File

@ -76,7 +76,7 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
ifeq ($(subst /,_,$(shell uname -s)),OS2)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CSRCS += \
jcapimin.c \
jcparam.c \
@ -94,14 +94,12 @@ CSRCS += \
jcprepct.c \
$(NULL)
OS2_IMPLIB = 1
LIBRARY = $(LIBRARY_NAME)$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
DEF_FILE = $(LIBRARY_NAME).def
TARGETS = $(LIBRARY)
endif
# need static lib for some of the libimg componentry to link properly
ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
override NO_STATIC_LIB=
endif
include $(topsrcdir)/config/rules.mk

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

@ -93,8 +93,8 @@ EXPORTS += \
endif
EXTRA_DSO_LDOPTS += \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \
-lmozjs \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@ -41,6 +41,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xpconnect
LIBRARY_NAME = xpconnect
SHORT_LIBNAME = xpconect
CPPSRCS = \
nsXPConnect.cpp \
@ -76,9 +77,8 @@ IS_COMPONENT = 1
# this is automatically discovered under BeOS
ifneq ($(OS_ARCH),BeOS)
LIBS += \
-lmozjs \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
endif

1
mailnews/base/util/Makefile.in
View File

@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = msgbaseutil
LIBRARY_NAME = msgbaseutil
SHORT_LIBNAME = msgbutil
CPPSRCS = \
nsMsgGroupRecord.cpp \

12
mailnews/imap/build/Makefile.in
View File

@ -30,19 +30,25 @@ MODULE = msgimap
LIBRARY_NAME = msgimap
IS_COMPONENT = 1
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbutil
else
EXTRA_DSO_LIBS = msgbaseutil
endif
CPPSRCS = nsImapFactory.cpp
EXPORTS = nsMsgImapCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libmsgimap_s.a \
$(DIST)/lib/libmsgimap_s.$(LIB_SUFFIX) \
$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(EXTRA_DSO_LIBS) \
$(XPCOM_LIBS) \
-lrdfutil_s \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

8
parser/htmlparser/src/Makefile.in
View File

@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = htmlparser
LIBRARY_NAME = raptorhtmlpars
IS_COMPONENT = 1
SHORT_LIBNAME = htmlpars
EXTRA_DSO_LIBS = expat_s xmltok_s mozutil_s
REQUIRES = xpcom netlib raptor
@ -109,12 +111,12 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/libexpat_s.a \
$(DIST)/lib/libxmltok_s.a \
$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_PERF
EXTRA_DSO_LDOPTS += \
$(DIST)/lib/libmozutil_s.a \
$(DIST)/lib/libmozutil_s.$(LIB_SUFFIX) \
$(NULL)
endif

14
xpcom/io/Makefile.in
View File

@ -36,7 +36,6 @@ CPPSRCS = \
nsDirectoryService.cpp \
nsEscape.cpp \
nsLinebreakConverter.cpp \
nsLocalFileUnix.cpp \
nsLocalFileCommon.cpp \
nsFileSpec.cpp \
nsFileSpecStreaming.cpp \
@ -54,11 +53,16 @@ CPPSRCS = \
nsByteArrayInputStream.cpp \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += nsLocalFileOS2.cpp
else
CPPSRCS += nsLocalFileUnix.cpp
endif
EXPORTS = \
nsEscape.h \
nsDirectoryService.h \
nsLocalFile.h \
nsLocalFileUnix.h \
nsLinebreakConverter.h \
nsFileSpec.h \
nsFileSpecStreaming.h \
@ -71,6 +75,12 @@ EXPORTS = \
nsStorageStream.h \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
EXPORTS += nsLocalFileOS2.h
else
EXPORTS += nsLocalFileUnix.h
endif
XPIDLSRCS = \
nsIBaseStream.idl \
nsIBinaryInputStream.idl \

2
xpfe/components/timebomb/tools/Makefile.in
View File

@ -6,7 +6,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = timebombgen
SIMPLE_PROGRAMS = timebombgen
SIMPLE_PROGRAMS = timebombgen$(BIN_SUFFIX)
CPPSRCS = \
timebombgen.cpp \

4
xpfe/global/resources/content/Makefile.in
View File

@ -26,7 +26,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
DIRS = os2
else
DIRS = unix
endif
EXPORT_RESOURCE_CONTENT = \
$(srcdir)/browserBindings.xul \

4
xpfe/global/resources/skin/Makefile.in
View File

@ -26,7 +26,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
DIRS = os2
else
DIRS = unix
endif
EXPORT_RESOURCE_CONTENT = \
$(srcdir)/box.css \