Corrected some minor errors. Now builds on Linux 1.2.13. Whee....

base/tests/Makefile

@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -15,38 +14,35 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=../..
+DEPTH		= ../..
 
-REQUIRES=xpcom netlib
+REQUIRES	= xpcom netlib
 
-include $(DEPTH)/config/config.mk
+CPPSRCS		= TestAtoms.cpp TestCRT.cpp
 
-CPPSRCS = \
+OBJS		= $(CPPSRCS:.cpp=.o)
-	TestAtoms.cpp	\
-	TestCRT.cpp	\
-	$(NULL)
 
-INCLUDES+=-I../src 
+EX_LIBS		= \
+		  $(DIST)/lib/libraptorbase.a \
+		  $(DIST)/lib/libxpcom.a \
+		  $(DIST)/lib/libplc21.a \
+		  $(DIST)/lib/libplds21.a \
+		  $(DIST)/lib/libnspr21.a \
+		  $(NULL)
 
-OBJS	= $(CPPSRCS:.cpp=.o)
+PROGS		= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
 
-EX_LIBS = \
+TARGETS		= $(PROGS)
-	$(DIST)/lib/libraptorbase.a \
-	$(DIST)/lib/libxpcom.a  \
-	$(DIST)/lib/libplc21.a	\
-	$(DIST)/lib/libplds21.a	\
-	$(DIST)/lib/libnspr21.a	\
-	$(NULL)
-
-PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
-
-TARGETS = $(PROGS)
 
 include $(DEPTH)/config/rules.mk
 
+INCLUDES	+= -I../src
+
 # needed for mac linux
-ifeq (linux,$(ARCH))
+ifeq ($(OS_ARCH),Linux)
-OS_LIBS += /usr/lib/libdl.so
+ifneq ($(OS_RELEASE),1.2)
+OS_LIBS		+= /usr/lib/libdl.so
+endif
 endif
 
 $(OBJDIR)/%.o: %.cpp
@@ -55,7 +51,7 @@ $(OBJDIR)/%.o: %.cpp
 
 $(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
 	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
+	$(CCC) -o $@ $(LDFLAGS) $^ $(OS_LIBS)
 
 install:: $(TARGETS)
 	$(INSTALL) $(PROGS) $(DIST)/bin