diff options
| author | larryh%netscape.com <devnull@localhost> | 1999-02-23 23:56:05 +0000 |
|---|---|---|
| committer | larryh%netscape.com <devnull@localhost> | 1999-02-23 23:56:05 +0000 |
| commit | e5bb7f2ce376e63c34705b918f51c059626ddf7c (patch) | |
| tree | 211fa9f47b2483eeaebf0aa1cabd2c3e73789844 | |
| parent | 1b977761f99fac1224e911a305d0af1a53ed335c (diff) | |
| download | nspr-hg-e5bb7f2ce376e63c34705b918f51c059626ddf7c.tar.gz | |
set old (3.0) library names
| -rw-r--r-- | lib/tests/Makefile | 14 | ||||
| -rw-r--r-- | lib/tests/windows/makefile | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/tests/Makefile b/lib/tests/Makefile index 3db362c0..5c446339 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -21,6 +21,8 @@ MOD_DEPTH = ../.. include $(MOD_DEPTH)/config/config.mk +DIRS = windows + ifeq ($(OS_TARGET), WIN16) OS_CFLAGS = $(OS_EXE_CFLAGS) endif @@ -45,9 +47,9 @@ 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) @@ -57,9 +59,9 @@ ifeq ($(OS_TARGET), WIN16) 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) diff --git a/lib/tests/windows/makefile b/lib/tests/windows/makefile index a2230624..f0bea9bf 100644 --- a/lib/tests/windows/makefile +++ b/lib/tests/windows/makefile @@ -35,9 +35,9 @@ ifeq ($(OS_TARGET), WIN16) 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) |