зеркало из https://github.com/mozilla/gecko-dev.git
More OS/2 Makefile changes. Bug #34106 Batch 12
This commit is contained in:
cls%seawood.org
Родитель
5c92f915a5
Коммит
4bb89416eb
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = nsinstall
|
||||
PROGRAM = nsinstall$(BIN_SUFFIX)
|
||||
ifdef CROSS_COMPILE
|
||||
HOST_PROGRAM = host_nsinstall
|
||||
endif
|
||||
|
|
@ -61,9 +61,9 @@ ifeq ($(OS_ARCH), Linux)
|
|||
DEFINES += -D_BSD_SOURCE
|
||||
endif
|
||||
|
||||
ifeq ($(subst /,_,$(shell uname -s)),OS2)
|
||||
DIRS = os2
|
||||
LOCAL_INCLUDES += -Ios2
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
LOCAL_INCLUDES += -I$(srcdir)/os2
|
||||
HSRCS += dirent.h getopt.h
|
||||
endif
|
||||
|
||||
ifeq ($(OS_CONFIG),SunOS4.1)
|
||||
|
|
|
|||
|
|
@ -65,5 +65,13 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
|||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
OS_LIBS += libuls.lib
|
||||
else
|
||||
OS_LIBS += -llibuni
|
||||
endif
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = xpcshell
|
||||
SIMPLE_PROGRAMS = xpcshell
|
||||
SIMPLE_PROGRAMS = xpcshell$(BIN_SUFFIX)
|
||||
|
||||
CPPSRCS = xpcshell.cpp
|
||||
|
||||
LIBS = \
|
||||
-lmozjs \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -60,8 +60,12 @@ REQUIRES += zlib
|
|||
EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lzlib
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
|
||||
EXTRA_DSO_LDOPTS = -L$(DIST)/lib $(DIST)/lib/zlib.lib
|
||||
else
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ LIBRARY_NAME = mozreg_s
|
|||
|
||||
REQUIRES = libreg pref js
|
||||
|
||||
PROGRAM = vreg
|
||||
PROGRAM = vreg$(BIN_SUFFIX)
|
||||
|
||||
CSRCS = reg.c VerReg.c vr_stubs.c nr_bufio.c
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ DEFINES += -DUSE_BUFFERED_REGISTRY_IO
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
R_%.o: %.c
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(CC) -Fo$@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
|
||||
else
|
||||
$(CC) -o $@ -c $(COMPILE_CFLAGS) -DSTANDALONE_REGISTRY $<
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ REQUIRES = img java js lay layer plugin plugimpl pref style util xpcom raptor oj
|
|||
|
||||
ifdef MOZ_OJI
|
||||
LIBRARY_NAME = oji
|
||||
EXTRA_DSO_LIBS = jsj
|
||||
|
||||
CPPSRCS = \
|
||||
jvmmgr.cpp \
|
||||
|
|
@ -54,10 +55,11 @@ EXPORTS = \
|
|||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
-L$(DIST)/bin \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
-lmozjs \
|
||||
-ljsj \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = widget_os2
|
||||
OS2_IMPLIB = 1
|
||||
OS2_LIBRARYNAME = wdgtos2
|
||||
LIBRARY_NAME = wdgtos2
|
||||
|
||||
EXTRA_DSO_LIBS = nggfx
|
||||
|
||||
REQUIRES = util img xpcom raptor netlib
|
||||
|
||||
|
|
@ -69,10 +69,20 @@ CPPSRCS = \
|
|||
nsWindow.cpp \
|
||||
$(NULL)
|
||||
|
||||
OS2_LIBS = nggfx timer xpcom
|
||||
OS2_STATLIBS = libraptorbasewidget_s
|
||||
DEF_OBJS = $(OBJS) $(addprefix $(DIST)/lib/,$(addsuffix .$(LIB_SUFFIX),$(OS2_STATLIBS)))
|
||||
OS_LIBS += $(addprefix $(DIST)/lib/,$(addsuffix .$(LIB_SUFFIX),$(OS2_STATLIBS))) $(NSPR_LIBS)
|
||||
# XXX FILES temporarily removed
|
||||
# nsClipboard.cpp \
|
||||
# nsDragService.cpp \
|
||||
|
||||
# nsITabWidget and nsITooltipWidget appear to have been scrapped
|
||||
# nsTabWidget.cpp \
|
||||
# nsTooltipWidget.cpp \
|
||||
|
||||
SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.$(LIB_SUFFIX)
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
OS_LIBS += libuls.lib libconv.lib unikbd.lib
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
OS2_LIBRARYNAME = wdgtres
|
||||
DLL = wdgtres.dll
|
||||
|
||||
RCOPTS = -n -x2 -i . $(RCDEFS)
|
||||
RCOPTS = -n -x2 -i . -i $(RCDEFS)
|
||||
|
||||
ifneq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
OMF_FLAG = -Zomf
|
||||
|
|
@ -38,7 +38,7 @@ install: $(DLL)
|
|||
$(INSTALL) -m 444 $(DLL) $(DIST)/bin
|
||||
|
||||
# XXX Have to copy files because rc and link386 are too stupid for a mirror tree build
|
||||
$(DLL): wdgtres.obj wdgtres.rc
|
||||
$(DLL): wdgtres.obj wdgtres.res
|
||||
cp $(topsrcdir)/widget/src/os2/resID.h ./resID.h
|
||||
cp $(srcdir)/frame.ico ./frame.ico
|
||||
cp $(srcdir)/folder.ico ./folder.ico
|
||||
|
|
@ -46,7 +46,10 @@ $(DLL): wdgtres.obj wdgtres.rc
|
|||
cp $(srcdir)/select.ptr ./select.ptr
|
||||
cp $(srcdir)/wdgtres.def ./wdgtres.def
|
||||
link386 /nol wdgtres,$@,nul,,wdgtres.def
|
||||
rc $(RCOPTS) $(srcdir)/wdgtres.rc $@
|
||||
rc $(RCOPTS) wdgtres.res $@
|
||||
|
||||
wdgtres.res: wdgtres.rc
|
||||
rc $(RCOPTS) -r $(srcdir)/wdgtres.rc $@
|
||||
|
||||
wdgtres.obj: wdgtres.C
|
||||
$(CC) -o $@ -s -c $(CFLAGS) $(OMF_FLAG) $<
|
||||
|
|
|
|||
|
|
@ -32,17 +32,17 @@ LIBRARY_NAME = xpcom
|
|||
CPPSRCS = nsXPComInit.cpp
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/libxpcomds_s.a \
|
||||
$(DIST)/lib/libxpcomio_s.a \
|
||||
$(DIST)/lib/libxpcomcomponents_s.a \
|
||||
$(DIST)/lib/libxpcomthreads_s.a \
|
||||
$(DIST)/lib/libxpcomproxy_s.a \
|
||||
$(DIST)/lib/libxpcombase_s.a \
|
||||
$(DIST)/lib/libxptcall.a \
|
||||
$(DIST)/lib/libxptinfo.a \
|
||||
$(DIST)/lib/libxpt.a \
|
||||
$(DIST)/lib/libxptcmd.a \
|
||||
$(DIST)/lib/libmozreg_s.a \
|
||||
$(DIST)/lib/libxpcomds_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxpcomio_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxpcomcomponents_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxpcomthreads_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxpcomproxy_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxpcombase_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxptcall.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxptinfo.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxpt.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libxptcmd.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libmozreg_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
|
|
@ -63,6 +63,11 @@ ifdef GC_LEAK_DETECTOR
|
|||
EXTRA_DSO_LDOPTS += -lboehm
|
||||
endif
|
||||
|
||||
# Turn off grep filter for .def files
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
|
||||
XPCOM_SWITCH = 1
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE
|
||||
|
|
|
|||
|
|
@ -26,7 +26,11 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = unix
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
|
||||
DIRS = os2
|
||||
else
|
||||
DIRS = unix
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -29,14 +29,44 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = xpconnect
|
||||
LIBRARY_NAME = xptcmd
|
||||
|
||||
CPPSRCS = \
|
||||
xptcinvoke_emx.cpp \
|
||||
xptcstubs_emx.cpp \
|
||||
$(NULL)
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
CPPSRCS = xptcinvoke_icc.cpp
|
||||
else
|
||||
CPPSRCS = xptcinvoke_emx.cpp
|
||||
endif
|
||||
|
||||
CPPSRCS += xptcstubs_os2.cpp
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a static lib.
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CFLAGS += -DEXPORT_XPC_API
|
||||
DEFINES += -DEXPORT_XPC_API -DDEBUG
|
||||
|
||||
INCLUDES += -I$(srcdir)/../..
|
||||
|
||||
# The asm routines are split across two files to facilitate testing; once they
|
||||
# work properly, the files should be combined
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
ASRCS = xptcinvoke_vacpp.asm xptcstubs_vacpp.asm
|
||||
ASFILES = $(ASRCS:.asm=.obj)
|
||||
LIBOBJS += $(ASFILES)
|
||||
ASFLAGS = -Mb # turn off logo
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
ASFLAGS += +Ods
|
||||
endif
|
||||
|
||||
$(ASFILES): %.obj: %.asm
|
||||
alp $(ASFLAGS) $<
|
||||
|
||||
export:: $(ASFILES)
|
||||
endif
|
||||
|
||||
showobjs:
|
||||
@echo $(ASFILES)
|
||||
@echo $(LIBOBJS)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = xpidl
|
||||
PROGRAM = xpidl$(BIN_SUFFIX)
|
||||
INTERNAL_TOOLS = 1
|
||||
|
||||
CSRCS = \
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = xpcom
|
||||
INTERNAL_TOOLS = 1
|
||||
|
||||
SIMPLE_PROGRAMS = xpt_dump xpt_link
|
||||
SIMPLE_PROGRAMS = xpt_dump$(BIN_SUFFIX) xpt_lin$(BIN_SUFFIX)k
|
||||
CSRCS = xpt_dump.c xpt_link.c
|
||||
|
||||
ifdef CROSS_COMPILE
|
||||
|
|
@ -41,7 +41,7 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
# Compile directly against the static lib, so we can use the tools
|
||||
# during the build without the shared library path being set.
|
||||
LIBS = $(DIST)/lib/libxpt.a
|
||||
LIBS = $(DIST)/lib/libxpt.$(LIB_SUFFIX)
|
||||
|
||||
# Tell the $(SIMPLE_PROGRAMS) target that we need to be recompiled
|
||||
# when libxpt changes.
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@ include $(DEPTH)/config/autoconf.mk
|
|||
IS_COMPONENT=1
|
||||
MODULE = raptor
|
||||
LIBRARY_NAME = nsappshell
|
||||
SHORT_LIBNAME = appshell
|
||||
|
||||
EXTRA_DSO_LIBS = jsdom
|
||||
|
||||
CPPSRCS = \
|
||||
nsChromeTreeOwner.cpp \
|
||||
|
|
@ -48,16 +51,16 @@ CPPSRCS = \
|
|||
nsCommonDialogs.cpp \
|
||||
nsAbout.cpp \
|
||||
nsAppShellFactory.cpp \
|
||||
nsUserInfoUnix.cpp \
|
||||
nsUserInfoUnix.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
-L$(DIST)/bin -ljsdom \
|
||||
-L$(DIST)/bin \
|
||||
$(MOZ_NECKO_UTIL_LIBS) \
|
||||
$(FULLCIRCLE_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(MOZ_TIMER_LIBS) \
|
||||
-lmozjs \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -27,7 +27,16 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = apprunner
|
||||
|
||||
ifeq ($(USE_SHORT_LIBNAME),1)
|
||||
PROGRAM = mozilla$(BIN_SUFFIX)
|
||||
EXTRA_DSO_LIBS = nggfx
|
||||
WEBSHELL_LIB = $(DIST)/lib/webshell.$(LIB_SUFFIX)
|
||||
else
|
||||
PROGRAM = mozilla-bin
|
||||
EXTRA_DSO_LIBS = raptorgfx
|
||||
WEBSHELL_LIB = -lraptorwebwidget
|
||||
endif
|
||||
|
||||
CPPSRCS = \
|
||||
nsAppRunner.cpp \
|
||||
|
|
@ -36,9 +45,9 @@ CPPSRCS = \
|
|||
$(NULL)
|
||||
|
||||
XP_DIST_LIBS = \
|
||||
-lraptorgfx \
|
||||
-lmozjs \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(XPCOM_LIBS) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(OJI_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
|
@ -69,7 +78,7 @@ DETECT_WEBSHELL_LEAKS=
|
|||
endif
|
||||
|
||||
ifdef DETECT_WEBSHELL_LEAKS
|
||||
XP_LIBS += -lraptorwebwidget -ldocshell -ljsdom
|
||||
XP_LIBS += $(WEBSHELL_LIB) -ldocshell -ljsdom
|
||||
endif
|
||||
|
||||
ifdef MOZ_JPROF
|
||||
|
|
@ -86,12 +95,9 @@ ifdef GC_LEAK_DETECTOR
|
|||
LIBS += -lboehm
|
||||
endif
|
||||
|
||||
XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
|
||||
|
||||
EXTRA_DEPS = \
|
||||
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a))) \
|
||||
$(XP_NS_UNDERBAR_CRAP) \
|
||||
$(NULL)
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
BIN_FLAGS := -Zlinker /PM:PM -Zlinker /Stack:0x30000
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
|
||||
BEOS_PROGRAM_RESOURCE = $(srcdir)/apprunner-beos.rsrc
|
||||
|
|
@ -109,6 +115,15 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
|
||||
|
||||
ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
|
||||
EXTRA_DEPS = \
|
||||
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a))) \
|
||||
$(XP_NS_UNDERBAR_CRAP) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
|
||||
|
||||
install:: $(srcdir)/mozilla
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
MODULE = directory
|
||||
LIBRARY_NAME = directory
|
||||
SHORT_LIBNAME = directry
|
||||
IS_COMPONENT = 1
|
||||
|
||||
XPIDLSRCS = nsIHTTPIndex.idl
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
MODULE = regviewer
|
||||
LIBRARY_NAME = regviewer
|
||||
SHORT_LIBNAME = regviewr
|
||||
IS_COMPONENT = 1
|
||||
|
||||
XPIDLSRCS = nsIRegistryDataSource.idl
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче