|
|
|
|
@ -69,16 +69,16 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX)))
|
|
|
|
|
|
|
|
|
|
TARGETS = $(PROGS) $(OBJS)
|
|
|
|
|
|
|
|
|
|
INCLUDES = -I.. -I$(includedir)
|
|
|
|
|
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$(libdir)
|
|
|
|
|
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)/$(libdir) -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)
|
|
|
|
|
@ -99,9 +99,9 @@ endif
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
@ -125,20 +125,20 @@ endif # SunOS
|
|
|
|
|
|
|
|
|
|
ifeq ($(OS_ARCH), WINNT)
|
|
|
|
|
ifeq ($(OS_TARGET), WIN16)
|
|
|
|
|
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
|
|
|
|
|
LIBPL = $(libdir)/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 = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
|
|
|
|
|
LIBPL = $(libdir)/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 = $(libdir)/nspr$(MOD_VERSION).lib
|
|
|
|
|
LIBPLC = $(libdir)/plc$(MOD_VERSION).lib
|
|
|
|
|
LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
|
|
|
|
|
LIBPLC = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib
|
|
|
|
|
else
|
|
|
|
|
LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
|
|
|
|
|
endif
|
|
|
|
|
@ -149,19 +149,19 @@ PWD = $(shell pwd)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(OS_ARCH), OSF1)
|
|
|
|
|
LDOPTS += -rpath $(PWD)/$(libdir)
|
|
|
|
|
LDOPTS += -rpath $(PWD)/$(dist_libdir)
|
|
|
|
|
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
|
|
|
|
|
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
|
|
|
|
|
@ -172,7 +172,7 @@ 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
|
|
|
|
|
@ -183,8 +183,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 = $(libdir)/libnspr$(MOD_VERSION).a
|
|
|
|
|
LIBPL = $(libdir)/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
|
|
|
|
|
@ -194,7 +194,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)/$(libdir)
|
|
|
|
|
#export LD_RUN_PATH = $(PWD)/$(dist_libdir)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(OS_ARCH), SCO_SV)
|
|
|
|
|
@ -204,11 +204,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)/$(libdir)
|
|
|
|
|
export LD_RUN_PATH = $(PWD)/$(dist_libdir)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifeq ($(OS_ARCH), UNIXWARE)
|
|
|
|
|
export LD_RUN_PATH = $(PWD)/$(libdir)
|
|
|
|
|
export LD_RUN_PATH = $(PWD)/$(dist_libdir)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
#####################################################
|
|
|
|
|
@ -241,7 +241,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)
|
|
|
|
|
|
|
|
|
|
|
wtc%netscape.com