Merged the makefile changes from Netscape's internal development versionRHAPSODY_NSPR_BASENSPRPUB_19980421_BASE

of NSPR to the public ns/nsprpub on mozilla.org.
Removed ns/nsprpub/tools/winsock.lib, which should not have been
released.  This file can be generated from winsock.dll by following
the NSPR build instructions for Windows 3.11 at
http://www.mozilla.org/docs/refList/refNSPR/win16.html.

2 files changed, 4 insertions, 17 deletions

diff --git a/tools/Makefile b/tools/Makefile
index 32adc1b1..0e8b3aa5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -31,7 +31,6 @@ DIRS =
 CSRCS =             \
 	httpget.c	    \
 	tail.c		    \
-	unbundle.c		\
 	$(NULL)
 
 ifeq ($(OS_ARCH), WINNT)
@@ -105,10 +104,6 @@ ifeq ($(OS_RELEASE), 5.4)
 EXTRA_LIBS = -lthread
 endif
 
-ifeq ($(OS_RELEASE), 5.4_i86pc)
-EXTRA_LIBS = -lthread
-endif
-
 ifeq ($(OS_RELEASE), 5.5)
 ifdef USE_PTHREADS
 EXTRA_LIBS = -lpthread
@@ -170,10 +165,10 @@ ifeq ($(AIX_PRE_4_2),1)
 # get at the original system select().
 #
 # We use a pattern rule in ns/nspr20/config/rules.mk to generate
-# the .o file from the .c source file, then do the two-step linking
-# hack below.
+# the .$(OBJ_SUFFIX) file from the .c source file, then do the
+# two-step linking hack below.
 
-$(OBJDIR)/%: $(OBJDIR)/%.o
+$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
 	rm -f $@ $(AIX_TMP)
 	$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(NSPR_VERSION).a
@@ -184,15 +179,7 @@ else
 
 # All platforms that are not AIX pre-4.2.
 
-
-# ifeq ($(USE_PTHREADS), 1)
-# $(OBJDIR)/attach: $(OBJDIR)/attach.o
-# 	@$(MAKE_OBJDIR)
-# 	$(CC) $< $(LDOPTS) $(LIBPR) $(LIBPLC) -lpthread -o $@
-# endif
-
-
-$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.o
+$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET),WIN16)
diff --git a/tools/winsock.lib b/tools/winsock.lib
deleted file mode 100644
index 0da11ca0..00000000
--- a/tools/winsock.lib
+++ /dev/null