From 5905e2dfc60b2dc7e35ebfbb0474633eb976bba3 Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 15 Jan 2003 21:36:53 +0000
Subject: [PATCH] #135795 r=cls Turn on mkdepend for OS/2

git-svn-id: svn://10.0.0.236/trunk@136374 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/Makefile.in         | 2 --
 mozilla/config/rules.mk            | 8 ++++----
 mozilla/configure.in               | 4 ++--
 mozilla/widget/src/os2/Makefile.in | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in
index 0e575e7be5f..3f27361a932 100644
--- a/mozilla/config/Makefile.in
+++ b/mozilla/config/Makefile.in
@@ -63,11 +63,9 @@ endif
 
 ifndef COMPILER_DEPEND
 ifndef MOZ_NATIVE_MAKEDEPEND
-ifneq ($(OS_ARCH),OS2)
 DIRS		+= mkdepend
 endif
 endif
-endif
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index 182bd5d55f2..86f6d431d8c 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -808,11 +808,15 @@ endif
 endif
 
 $(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))
 	$(HOST_LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS)
 else
 	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 endif
+endif
 
 #
 # This is an attempt to support generation of multiple binaries
@@ -1013,7 +1017,6 @@ ifndef COMPILER_DEPEND
 #
 _MDDEPFILE = $(MDDEPDIR)/$(@F).pp
 
-ifneq ($(OS_ARCH),OS2)
 ifeq ($(OS_ARCH),WINNT)
 define MAKE_DEPS_AUTO
 if test -d $(@D); then \
@@ -1035,7 +1038,6 @@ if test -d $(@D); then \
 fi
 endef
 endif # WINNT
-endif # OS2
 
 endif # !COMPILER_DEPEND
 
@@ -1496,7 +1498,6 @@ else # ! COMPILER_DEPEND
 
 ifndef MOZ_AUTO_DEPS
 
-ifneq ($(OS_ARCH),OS2)
 ifeq ($(OS_ARCH),WINNT)
 define MAKE_DEPS_NOAUTO
 	set -e ; \
@@ -1512,7 +1513,6 @@ define MAKE_DEPS_NOAUTO
 	mv $@ $@.old && cat $@.old | sed "s|^$(<D)/||g" > $@ && rm -f $@.old
 endef
 endif # WINNT
-endif # OS2
 
 $(MDDEPDIR)/%.pp: %.c
 	$(REPORT_BUILD)
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 4e8c273bec0..b7a41a5d420 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -752,7 +752,7 @@ case "$host" in
 
 *os2*)
     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}"
     ;;
 
@@ -1201,7 +1201,7 @@ case "$target" in
     ;;
 
 
-*-*-os2*)
+*-os2*)
     MOZ_BUILD_ROOT=`pwd -D`
     USE_SHORT_LIBNAME=1
     BIN_SUFFIX='.exe'
diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in
index fb37a6ce7cc..164f39a122e 100644
--- a/mozilla/widget/src/os2/Makefile.in
+++ b/mozilla/widget/src/os2/Makefile.in
@@ -92,7 +92,7 @@ DEFINES		+= -D_IMPL_NS_WIDGET
 LOCAL_INCLUDES	= -I. -I$(srcdir)/../xpwidgets -I$(srcdir)
 
 export::
-	-mkdir ./res
-	-cp $(srcdir)/res/*.ptr ./res
+	test -d ./res || mkdir ./res
+	cp $(srcdir)/res/*.ptr ./res
 
 ADD_TO_DEF_FILE = cat < $(srcdir)/extradefs.os2 >>$(DEF_FILE)