From 65f394e4b844a3a8bafb256bd4b28f95eba048a0 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <devnull@localhost>
Date: Sat, 30 Dec 2000 00:47:58 +0000
Subject: Sync'ing long lost changes between Makefile & Makefile.in

---
 lib/msgc/src/Makefile.in   | 17 +++++++++++------
 lib/msgc/tests/Makefile.in | 28 +++++++++++++++-------------
 2 files changed, 26 insertions(+), 19 deletions(-)

(limited to 'lib/msgc')

diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in
index e717eb82..593262ec 100644
--- a/lib/msgc/src/Makefile.in
+++ b/lib/msgc/src/Makefile.in
@@ -57,20 +57,20 @@ ifeq ($(OS_ARCH),WINNT)
 ifeq ($(OS_TARGET),WIN16)
 CSRCS += win16gc.c
 else
-ifeq ($(OS_TARGET),OS2)
-CSRCS += os2gc.c
-else
 CSRCS += win32gc.c
 endif
-endif
+else
+ifeq ($(OS_ARCH),OS2)
+CSRCS += os2gc.c
 else
 CSRCS += unixgc.c
 endif
+endif
 
 NSPR_VERSION = $(MOD_VERSION)
 
 ifeq ($(OS_ARCH), WINNT)
-ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
+ifeq ($(OS_TARGET), WIN16)
 EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).lib
 else
 DLLBASE=/BASE:0x30000000
@@ -84,8 +84,12 @@ ifdef GLOWCODE
 EXTRA_LIBS += $(GLOWDIR)/glowcode.lib
 endif
 endif
-
 endif
+
+else
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).$(LIB_SUFFIX)
+
 else
 ifeq ($(OS_ARCH), AIX)
 ifeq ($(CLASSIC_NSPR),1)
@@ -100,6 +104,7 @@ else
 EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)
 endif
 endif
+endif
 
 # On NCR and SCOOS, we can't link with extra libraries when
 # we build a shared library.  If we do so, the linker doesn't
diff --git a/lib/msgc/tests/Makefile.in b/lib/msgc/tests/Makefile.in
index fb98e1ae..0940e905 100644
--- a/lib/msgc/tests/Makefile.in
+++ b/lib/msgc/tests/Makefile.in
@@ -53,7 +53,7 @@ endif
 
 CSRCS = gc1.c thrashgc.c
 
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 PROG_SUFFIX = .exe
 else
 PROG_SUFFIX =
@@ -79,12 +79,6 @@ ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
   LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib
   LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib
-else
-ifeq ($(OS_TARGET),OS2)
-  LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
-  LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
-  LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib
-  LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib
 else
   LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
   LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
@@ -92,6 +86,16 @@ else
   LIBGC= $(DIST)/lib/libmsgc$(GC_VERSION).$(LIB_SUFFIX)
 endif
 endif
+
+ifeq ($(OS_ARCH),OS2)
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+  LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
+  LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
+  LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib
+  LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib
+else
+  LDOPTS += -Zomf -Zlinker /PM:VIO
+endif
 endif
 
 ifneq ($(OS_ARCH), WINNT)
@@ -290,17 +294,15 @@ ifeq ($(OS_TARGET),WIN16)
 	echo $(LIBGC),		 >>w16link
 	echo winsock.lib     >>w16link
 	wlink @w16link.
-else
-ifeq ($(OS_TARGET),OS2)
-	$(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) so32dll.lib tcp32dll.lib -MAP:$(@:.exe=.map) -out:$@
 else
 	link $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) wsock32.lib -out:$@
-endif
-endif
+else
+ifeq ($(OS_ARCH),OS2)
+	$(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
 else
 	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBGC) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
 endif
-
+endif
 endif
 
 export:: $(TARGETS)
-- 
cgit v1.2.1