Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#135795

Browse Source 
r=cls
Turn on mkdepend for OS/2


git-svn-id: svn://10.0.0.236/trunk@136374 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2003-01-15 21:36:53 +00:00
parent b49e9014ca
commit 5905e2dfc6
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/config/Makefile.in
View File

@ -63,11 +63,9 @@ endif
ifndef COMPILER_DEPEND ifndef COMPILER_DEPEND
ifndef MOZ_NATIVE_MAKEDEPEND ifndef MOZ_NATIVE_MAKEDEPEND
ifneq ($(OS_ARCH),OS2)
DIRS += mkdepend DIRS += mkdepend
endif endif
endif endif
endif
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk

8
mozilla/config/rules.mk
View File

@ -808,11 +808,15 @@ endif
endif endif
$(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_EXTRA_DEPS) Makefile Makefile.in $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
ifeq ($(MOZ_OS2_TOOLS),VACPP)
$(LD) -OUT:$@ $(LDFLAGS) $(HOST_OBJS) $(HOST_LIBS) $(EXTRA_LIBS) /ST:0x100000
else
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
$(HOST_LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS) $(HOST_LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS)
else else
$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) $(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
endif endif
endif
# #
# This is an attempt to support generation of multiple binaries # This is an attempt to support generation of multiple binaries
@ -1013,7 +1017,6 @@ ifndef COMPILER_DEPEND
# #
_MDDEPFILE = $(MDDEPDIR)/$(@F).pp _MDDEPFILE = $(MDDEPDIR)/$(@F).pp
ifneq ($(OS_ARCH),OS2)
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
define MAKE_DEPS_AUTO define MAKE_DEPS_AUTO
if test -d $(@D); then \ if test -d $(@D); then \
@ -1035,7 +1038,6 @@ if test -d $(@D); then \
fi fi
endef endef
endif # WINNT endif # WINNT
endif # OS2
endif # !COMPILER_DEPEND endif # !COMPILER_DEPEND
@ -1496,7 +1498,6 @@ else # ! COMPILER_DEPEND
ifndef MOZ_AUTO_DEPS ifndef MOZ_AUTO_DEPS
ifneq ($(OS_ARCH),OS2)
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
define MAKE_DEPS_NOAUTO define MAKE_DEPS_NOAUTO
set -e ; \ set -e ; \
@ -1512,7 +1513,6 @@ define MAKE_DEPS_NOAUTO
mv $@ $@.old && cat $@.old | sed "s|^$(<D)/||g" > $@ && rm -f $@.old mv $@ $@.old && cat $@.old | sed "s|^$(<D)/||g" > $@ && rm -f $@.old
endef endef
endif # WINNT endif # WINNT
endif # OS2
$(MDDEPDIR)/%.pp: %.c $(MDDEPDIR)/%.pp: %.c
$(REPORT_BUILD) $(REPORT_BUILD)

4
mozilla/configure.in
View File

@ -752,7 +752,7 @@ case "$host" in
*os2*) *os2*)
HOST_CFLAGS="$HOST_CFLAGS -DXP_OS2 -DNO_X11" HOST_CFLAGS="$HOST_CFLAGS -DXP_OS2 -DNO_X11"
HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"' HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}" HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
;; ;;
@ -1201,7 +1201,7 @@ case "$target" in
;; ;;
*-*-os2*) *-os2*)
MOZ_BUILD_ROOT=`pwd -D` MOZ_BUILD_ROOT=`pwd -D`
USE_SHORT_LIBNAME=1 USE_SHORT_LIBNAME=1
BIN_SUFFIX='.exe' BIN_SUFFIX='.exe'

4
mozilla/widget/src/os2/Makefile.in
View File

@ -92,7 +92,7 @@ DEFINES += -D_IMPL_NS_WIDGET
LOCAL_INCLUDES = -I. -I$(srcdir)/../xpwidgets -I$(srcdir) LOCAL_INCLUDES = -I. -I$(srcdir)/../xpwidgets -I$(srcdir)
export:: export::
-mkdir ./res test -d ./res || mkdir ./res
-cp $(srcdir)/res/*.ptr ./res cp $(srcdir)/res/*.ptr ./res
ADD_TO_DEF_FILE = cat < $(srcdir)/extradefs.os2 >>$(DEF_FILE) ADD_TO_DEF_FILE = cat < $(srcdir)/extradefs.os2 >>$(DEF_FILE)