From 4637b271b1de27e864bb147a19c9f3532b146205 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <devnull@localhost>
Date: Thu, 5 Aug 1999 01:09:53 +0000
Subject: Added autodetection of libpthread.  Defaults to USE_PTHREADS if
 libpthread is detected.  Can be overridden via --enable-user-pthread,
 --with-native-threads or --with-bthreads depending upon the platform. Sets
 MOD_VERSION & MOD_NAME to get the nspr version suffix. Gcc under win32 uses
 standard gcc extensions for OBJ_SUFFIX, DLL_SUFFIX & LIB_SUFFIX. Requires
 pr/src/md/platform/objs.mk to set md object files.  Added objs.mk for
 windows.

---
 pr/src/Makefile.in            | 6 ++++--
 pr/src/md/windows/Makefile.in | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index 30503b8c..f0b6b596 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -41,6 +41,7 @@ ifeq ($(USE_CPLUS), 1)
 endif
 
 ifndef USE_AUTOCONF
+
 #
 # Define platform-dependent OS_LIBS
 #
@@ -157,7 +158,7 @@ endif
 endif
 endif
 
-endif # !USE_AUTOCONF
+endif # USE_AUTOCONF
 #
 # Define platform-dependent OBJS
 #
@@ -250,7 +251,7 @@ endif
 
 ifdef USE_AUTOCONF
 
-OBJS += $(addprefix md/$(PR_MD_ARCH_DIR)/$(OBJDIR)/, $(PR_MD_CSRCS:.c=.$(OBJ_SUFFIX)))
+include $(srcdir)/md/$(PR_MD_ARCH_DIR)/objs.mk
 
 else
 
@@ -422,3 +423,4 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
 endif
 
 install:: export
+
diff --git a/pr/src/md/windows/Makefile.in b/pr/src/md/windows/Makefile.in
index 1633bc49..6e462ebc 100644
--- a/pr/src/md/windows/Makefile.in
+++ b/pr/src/md/windows/Makefile.in
@@ -27,8 +27,9 @@ include $(MOD_DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 ifdef USE_AUTOCONF
-CSRCS = $(PR_MD_CSRCS)
-else
+OS_TARGET=$(MOZ_TARGET)
+endif
+
 ifeq ($(OS_TARGET), WIN16)
 CSRCS = \
 	w16null.c \
@@ -73,7 +74,6 @@ CSRCS =          \
     $(NULL)
 endif
 endif
-endif # USE_AUTOCONF
 
 TARGETS	= $(OBJS)
 
-- 
cgit v1.2.1