diff options
author | wtc%netscape.com <devnull@localhost> | 2001-05-12 01:47:58 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2001-05-12 01:47:58 +0000 |
commit | 591704b6cfd8a2f76f168bf6441b37157113f316 (patch) | |
tree | a172560019424ec1beda3c1303d7d363e0a95975 /lib/tests | |
parent | ddc4fbfc61fd900170ee2e7bdc2a39e3dab78a7d (diff) | |
download | nspr-hg-591704b6cfd8a2f76f168bf6441b37157113f316.tar.gz |
Merged NSPRPUB_CLIENT_BRANCH onto the trunk.
Diffstat (limited to 'lib/tests')
-rw-r--r-- | lib/tests/Makefile.in | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 974e6639..5ead8a5c 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -68,30 +68,30 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I$(includedir) +INCLUDES = -I$(dist_includedir) # Setting the variables LDOPTS and LIBPR. We first initialize # them to the default values, then adjust them for some platforms. -LDOPTS = -L$(libdir) -LIBPR = -lnspr$(MOD_VERSION) -LIBPLC = -lplc$(MOD_VERSION) -LIBPLDS = -lplds$(MOD_VERSION) +LDOPTS = -L$(dist_libdir) +LIBPR = -lnspr$(MOD_MAJOR_VERSION) +LIBPLC = -lplc$(MOD_MAJOR_VERSION) +LIBPLDS = -lplds$(MOD_MAJOR_VERSION) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(libdir)/nspr$(MOD_VERSION).lib - LIBPLC= $(libdir)/plc$(MOD_VERSION).lib - LIBPLDS= $(libdir)/plds$(MOD_VERSION).lib + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib + LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) - LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) else - LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLDS= $(libdir)/libplds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLC= $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPLDS= $(dist_libdir)/libplds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) endif endif endif @@ -99,9 +99,9 @@ endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 - LIBPR = $(libdir)/nspr$(MOD_VERSION).lib - LIBPLC = $(libdir)/plc$(MOD_VERSION).lib - LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPLC = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib + LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) else LDOPTS += -Zomf -Zlinker /PM:VIO endif @@ -112,14 +112,14 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), IRIX) -LDOPTS += -rpath $(PWD)/$(libdir) +LDOPTS += -rpath $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH), Linux) ifeq ($(OS_RELEASE), 1.2) EXTRA_LIBS = -ldl else - LDOPTS += -Xlinker -rpath $(PWD)/$(libdir) + LDOPTS += -Xlinker -rpath $(PWD)/$(dist_libdir) ifeq ($(USE_PTHREADS),1) EXTRA_LIBS = -lpthread endif @@ -127,27 +127,27 @@ ifeq ($(OS_ARCH), Linux) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(libdir) -lpthread +LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread endif ifeq ($(OS_ARCH), HP-UX) -LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir) +LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir) endif # AIX ifeq ($(OS_ARCH),AIX) -LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib -LIBPR = -lnspr$(MOD_VERSION)_shr -LIBPLC = -lplc$(MOD_VERSION)_shr +LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib +LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr +LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr endif # Solaris ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC -LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir) +LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) else -LDOPTS += -R $(PWD)/$(libdir) +LDOPTS += -R $(PWD)/$(dist_libdir) endif endif @@ -175,7 +175,7 @@ EXTRA_LIBS = -lsocket -lnsl # This hardcodes in the executable programs the directory to find # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(libdir) +export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ##################################################### @@ -208,7 +208,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a + $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a $(CC) -o $@ $(AIX_TMP) $(AIX_WRAP) rm -f $(AIX_TMP) |