diff options
Diffstat (limited to 'pr/src/cplus/tests/Makefile.in')
| -rw-r--r-- | pr/src/cplus/tests/Makefile.in | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/pr/src/cplus/tests/Makefile.in b/pr/src/cplus/tests/Makefile.in index 4a6f3907..371da8a6 100644 --- a/pr/src/cplus/tests/Makefile.in +++ b/pr/src/cplus/tests/Makefile.in @@ -42,7 +42,7 @@ CXXSRCS = \ OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX))) -ifeq ($(OS_ARCH), WINNT) +ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) PROG_SUFFIX = .exe else PROG_SUFFIX = @@ -52,16 +52,16 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX))) TARGETS = $(PROGS) $(OBJS) -INCLUDES = -I.. -I$(DIST)/include +INCLUDES = -I.. -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$(DIST)/lib -LIBPR = -lnspr$(MOD_VERSION) -LIBPL = -lplc$(MOD_VERSION) +LDOPTS = -L$(dist_libdir) +LIBPR = -lnspr$(MOD_MAJOR_VERSION) +LIBPL = -lplc$(MOD_MAJOR_VERSION) ifeq ($(OS_ARCH), IRIX) - LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared + LDOPTS += -rpath $(PWD)/$(dist_libdir) -rdata_shared # For 6.x machines, include this flag ifeq ($(basename $(OS_RELEASE)),6) ifeq ($(USE_N32),1) @@ -82,9 +82,9 @@ endif ifeq ($(OS_ARCH), SunOS) ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC - LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) else - LDOPTS += -R $(PWD)/$(DIST)/lib + LDOPTS += -R $(PWD)/$(dist_libdir) endif endif @@ -108,13 +108,23 @@ endif # SunOS ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) - LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib - LIBPL = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPL = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPL = $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX) + LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) + LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) +endif endif + +ifeq ($(OS_ARCH),OS2) + ifeq ($(MOZ_OS2_TOOLS),VACPP) + LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO + LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib + LIBPLC = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib + else + LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp + endif endif ifneq ($(OS_ARCH), WINNT) @@ -122,19 +132,19 @@ PWD = $(shell pwd) endif ifeq ($(OS_ARCH), OSF1) -LDOPTS += -rpath $(PWD)/$(DIST)/lib +LDOPTS += -rpath $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH), HP-UX) - LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib + LDOPTS += -Wl,+s,+b,$(PWD)/$(dist_libdir) endif # AIX ifeq ($(OS_ARCH),AIX) - LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib + LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) - LIBPR = -lnspr$(MOD_VERSION)_shr - LIBPLC = -lplc$(MOD_VERSION)_shr + LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr + LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr else LDOPTS += -brtl EXTRA_LIBS = -ldl @@ -145,7 +155,7 @@ ifeq ($(OS_ARCH), Linux) ifeq ($(OS_RELEASE), 1.2) EXTRA_LIBS = -ldl else - LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib + LDOPTS += -Xlinker -rpath $(PWD)/$(dist_libdir) ifeq ($(USE_PTHREADS),1) EXTRA_LIBS = -lpthread endif @@ -156,8 +166,8 @@ ifeq ($(OS_ARCH), NCR) # XXX: We see some strange problems when we link with libnspr.so. # So for now we use static libraries on NCR. The shared library # stuff below is commented out. -LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a -LIBPL = $(DIST)/lib/libplc$(MOD_VERSION).a +LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a +LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a EXTRA_LIBS = -lsocket -lnsl -ldl # NCR needs to link against -lsocket -lnsl (and -lc, which is linked @@ -167,7 +177,7 @@ EXTRA_LIBS = -lsocket -lnsl -ldl # 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)/$(DIST)/lib +#export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH), SCO_SV) @@ -177,11 +187,11 @@ EXTRA_LIBS = -lsocket # 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)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ifeq ($(OS_ARCH), UNIXWARE) -export LD_RUN_PATH = $(PWD)/$(DIST)/lib +export LD_RUN_PATH = $(PWD)/$(dist_libdir) endif ##################################################### @@ -214,7 +224,7 @@ ifeq ($(AIX_PRE_4_2),1) $(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) rm -f $@ $(AIX_TMP) - $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/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) @@ -243,13 +253,15 @@ else link $(LDOPTS) $< $(LIBPR) $(LIBPL) wsock32.lib -out:$@ endif else +ifeq ($(OS_ARCH),OS2) + $(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@ +else $(CCC) $(XCFLAGS) $< $(LDOPTS) $(LIBPR) $(LIBPL) $(EXTRA_LIBS) -o $@ endif - +endif endif export:: $(TARGETS) -install:: export clean:: rm -f $(TARGETS) |