зеркало из https://github.com/mozilla/gecko-dev.git
Merged NSPRPUB_CLIENT_BRANCH onto the trunk.
This commit is contained in:
wtc%netscape.com
Родитель
f32c53c48b
Коммит
75ea362396
|
|
@ -0,0 +1 @@
|
|||
Makefile
|
||||
|
|
@ -42,7 +42,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
# Disable optimization of the nspr on SunOS4.1.3
|
||||
ifeq ($(OS_ARCH),SunOS)
|
||||
ifeq ($(OS_RELEASE),4.1.3_U1)
|
||||
|
|
@ -69,9 +68,8 @@ endif
|
|||
ifeq ($(OS_ARCH), BeOS)
|
||||
CFLAGS += -frtti -fexceptions
|
||||
endif
|
||||
endif # !USE_AUTOCONF
|
||||
|
||||
INCLUDES = -I$(includedir)
|
||||
INCLUDES = -I$(dist_includedir)
|
||||
|
||||
HEADERS = $(wildcard $(srcdir)/*.h)
|
||||
|
||||
|
|
@ -85,28 +83,19 @@ CXXSRCS = \
|
|||
|
||||
OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
|
||||
|
||||
ifndef USE_AUTOCONF
|
||||
LIBRARY_NAME = prstrms
|
||||
LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
|
||||
|
||||
RELEASE_HEADERS = $(HEADERS)
|
||||
RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
|
||||
RELEASE_LIBS = $(TARGETS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
ifeq ($(OS_TARGET), WIN16)
|
||||
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
|
||||
else
|
||||
DLLBASE=/BASE:0x30000000
|
||||
RES=$(OBJDIR)/prstrms.res
|
||||
RESNAME=prstrms.rc
|
||||
OS_LIBS = user32.lib
|
||||
ifeq ($(OS_TARGET), WIN95)
|
||||
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
|
||||
else
|
||||
EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib
|
||||
endif
|
||||
endif
|
||||
else
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
|
||||
else
|
||||
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -lstdcpp
|
||||
endif
|
||||
else
|
||||
ifeq ($(OS_ARCH), AIX)
|
||||
ifeq ($(OS_RELEASE), 4.1)
|
||||
|
|
@ -126,12 +115,6 @@ else
|
|||
OS_LIBS += -ldl
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
|
||||
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr
|
||||
else
|
||||
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# On NCR and SCOOS, we can't link with extra libraries when
|
||||
|
|
@ -145,26 +128,23 @@ ifeq ($(OS_ARCH),SCOOS)
|
|||
EXTRA_LIBS =
|
||||
endif
|
||||
ifeq ($(OS_ARCH),BeOS)
|
||||
EXTRA_LIBS = -lstdc++.r4 -L$(libdir) -lnspr$(MOD_VERSION)
|
||||
EXTRA_LIBS = -lstdc++.r4 -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), UNIXWARE)
|
||||
OS_LIBS += -lC
|
||||
endif
|
||||
endif # !USE_AUTOCONF
|
||||
|
||||
ifdef RESOLVE_LINK_SYMBOLS
|
||||
EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION)
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += user32.lib
|
||||
endif
|
||||
|
||||
LIBRARY_NAME = prstrms
|
||||
LIBRARY_VERSION = $(MOD_VERSION)
|
||||
EXTRA_LIBS = $(LIBNSPR)
|
||||
|
||||
RELEASE_HEADERS = $(HEADERS)
|
||||
RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
|
||||
RELEASE_LIBS = $(TARGETS)
|
||||
ifdef RESOLVE_LINK_SYMBOLS
|
||||
EXTRA_LIBS += $(OS_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
#
|
||||
# Version information generation (begin)
|
||||
|
|
@ -198,9 +178,9 @@ ifeq ($(OS_ARCH), WINNT)
|
|||
$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
|
||||
else
|
||||
ifeq ($(MOZ_OS2_TOOLS), VACPP)
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
|
||||
$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
|
||||
else
|
||||
$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
|
||||
$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
|
||||
endif
|
||||
endif
|
||||
#
|
||||
|
|
@ -208,21 +188,21 @@ endif
|
|||
#
|
||||
|
||||
export:: $(TARGETS) $(HEADERS)
|
||||
$(INSTALL) -m 444 $(HEADERS) $(includedir)
|
||||
$(INSTALL) -m 444 $(TARGETS) $(libdir)
|
||||
$(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
|
||||
$(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
$(INSTALL) -m 444 $(TARGETS) $(bindir)
|
||||
$(INSTALL) -m 444 $(TARGETS) $(dist_bindir)
|
||||
endif
|
||||
ifeq ($(OS_ARCH),HP-UX)
|
||||
ifdef SHARED_LIBRARY
|
||||
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
|
||||
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_ARCH),OpenVMS)
|
||||
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir)
|
||||
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_libdir)
|
||||
ifdef SHARED_LIBRARY
|
||||
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
|
||||
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(bindir)
|
||||
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(dist_libdir)
|
||||
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(dist_bindir)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Makefile
|
||||
|
|
@ -62,26 +62,26 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(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)
|
||||
LIBPRSTRMS = -lprstrms$(MOD_VERSION)
|
||||
LDOPTS = -L$(dist_libdir)
|
||||
LIBPR = -lnspr$(MOD_MAJOR_VERSION)
|
||||
LIBPRSTRMS = -lprstrms$(MOD_MAJOR_VERSION)
|
||||
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
ifeq ($(OS_TARGET), WIN16)
|
||||
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
|
||||
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).lib
|
||||
LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
|
||||
LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).lib
|
||||
else
|
||||
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
|
||||
ifeq ($(OS_TARGET), WIN95)
|
||||
LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
|
||||
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
|
||||
LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
|
||||
LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
|
||||
else
|
||||
LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
|
||||
LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).$(LIB_SUFFIX)
|
||||
LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
|
||||
LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
|
@ -89,8 +89,8 @@ endif
|
|||
ifeq ($(OS_ARCH),OS2)
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768
|
||||
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
|
||||
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
|
||||
LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
|
||||
LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
|
||||
else
|
||||
LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
|
||||
endif
|
||||
|
|
@ -101,23 +101,23 @@ PWD = $(shell pwd)
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), IRIX)
|
||||
LDOPTS += -rpath $(PWD)/$(libdir)
|
||||
LDOPTS += -rpath $(PWD)/$(dist_libdir)
|
||||
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
|
||||
LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr
|
||||
LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr
|
||||
LIBPRSTRMS = -lprstrms$(MOD_MAJOR_VERSION)_shr
|
||||
else
|
||||
LDOPTS += -brtl
|
||||
EXTRA_LIBS = -ldl
|
||||
|
|
@ -128,9 +128,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)
|
||||
# CC on SunOS 5.4 and 5.5.x need to link with -lthread or -lpthread
|
||||
# (or use the -mt switch) even though we already linked with these
|
||||
# system libraries when we built libnspr.so.
|
||||
|
|
@ -147,8 +147,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
|
||||
LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).a
|
||||
LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
|
||||
LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).a
|
||||
EXTRA_LIBS = -lsocket -lnsl -ldl
|
||||
|
||||
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
|
||||
|
|
@ -158,7 +158,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), SCOOS)
|
||||
|
|
@ -168,11 +168,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
|
||||
|
||||
#####################################################
|
||||
|
|
@ -205,7 +205,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)
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче