set old (3.0) library names
authorlarryh%netscape.com
Tue, 23 Feb 1999 23:56:05 +0000
changeset 460 4be0dbd094ba565885c2d6865bb6d273de65bb2b
parent 459 a977ed037250006f866077633c6416c8100befd7
child 461 09d94ad4e70b26266ea6e433b3ba2cdc8614c5cd
push idunknown
push userunknown
push dateunknown
set old (3.0) library names
lib/tests/Makefile
lib/tests/windows/makefile
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@@ -16,16 +16,18 @@
 #
 
 #! gmake
 
 MOD_DEPTH = ../..
 
 include $(MOD_DEPTH)/config/config.mk
 
+DIRS = windows
+
 ifeq ($(OS_TARGET), WIN16)
 OS_CFLAGS = $(OS_EXE_CFLAGS)
 endif
 
 CSRCS = \
 	string.c \
 	event.c \
 	base64t.c
@@ -40,31 +42,31 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:
 
 TARGETS = $(PROGS) $(OBJS)
 
 INCLUDES = -I$(DIST)/include
 
 # Setting the variables LDOPTS and LIBPR.  We first initialize
 # them to the default values, then adjust them for some platforms.
 LDOPTS = -L$(DIST)/lib
-LIBPR = -lnspr$(MOD_VERSION)
-LIBPLC = -lplc$(MOD_VERSION)
-LIBDS = -lplds$(MOD_VERSION)
+LIBPR = -llibnspr$(MOD_VERSION)
+LIBPLC = -llibplc$(MOD_VERSION)
+LIBDS = -llibplds$(MOD_VERSION)
 
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
   LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
   LIBDS= $(DIST)/lib/plds$(MOD_VERSION).lib
 else
   LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
   ifeq ($(OS_TARGET), WIN95)
-  LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX)
   else
   LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
   LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
   LIBDS= $(DIST)/lib/libpds$(MOD_VERSION).$(LIB_SUFFIX)
   endif
 endif
 endif
 
--- a/lib/tests/windows/makefile
+++ b/lib/tests/windows/makefile
@@ -30,19 +30,19 @@ CSRCS = winevent.c
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
   LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
   LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
 else
   LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
   ifeq ($(OS_TARGET), WIN95)
-  LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
-  LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
+  LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
+  LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).lib
   else
   LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
   LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
   LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).lib
   endif
 endif
 endif