mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Switch from using $(DIST)/bin, $(DIST)/lib, etc to using $(bindir), $(includedir). This gives us the advantage of being able to set different directories for libs & headers as needed. r=bryner

This commit is contained in:
cls%seawood.org 2001-01-21 06:37:45 +00:00
Родитель e0b5ef51b5
Коммит 42c24e8ad2
72 изменённых файлов: 427 добавлений и 1207 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

126
nsprpub/Makefile
Просмотреть файл

@ -1,126 +0,0 @@
#! gmake
#
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Netscape Portable Runtime (NSPR).
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient
# may use your version of this file under either the MPL or the
# GPL.
#
MOD_DEPTH = .
DIRS = config pr lib
ifdef MOZILLA_CLIENT
PR_CLIENT_BUILD = 1
PR_CLIENT_BUILD_UNIX = 1
endif
include $(MOD_DEPTH)/config/rules.mk
#
# The -ll option of zip converts CR LF to LF.
#
ifeq ($(OS_ARCH),WINNT)
ZIP_ASCII_OPT = -ll
endif
ifdef PR_CLIENT_BUILD
export::
rm -r -f $(DIST)/../public/nspr
ifdef PR_CLIENT_BUILD_UNIX
rm -f $(DIST)/lib/libnspr.a
rm -f $(DIST)/bin/libnspr.$(DLL_SUFFIX)
endif
endif
distclean::
@echo "cd pr/tests; $(MAKE) $@"
@$(MAKE) -C pr/tests $@
rm -f config/my_config.mk config/my_overrides.mk
release::
echo $(BUILD_NUMBER) > $(RELEASE_DIR)/$(BUILD_NUMBER)/version.df
@if test -f imports.df; then \
echo "cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df"; \
cp -f imports.df $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df; \
else \
echo "echo > $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df"; \
echo > $(RELEASE_DIR)/$(BUILD_NUMBER)/imports.df; \
fi
cd $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
rm -rf META-INF; mkdir META-INF; cd META-INF; \
echo "Manifest-Version: 1.0" > MANIFEST.MF; \
echo "" >> MANIFEST.MF; \
cd ..; rm -f mdbinary.jar; zip -r mdbinary.jar META-INF bin lib; \
rm -rf META-INF; \
cd include; \
rm -rf META-INF; mkdir META-INF; cd META-INF; \
echo "Manifest-Version: 1.0" > MANIFEST.MF; \
echo "" >> MANIFEST.MF; \
cd ..; rm -f mdheader.jar; zip $(ZIP_ASCII_OPT) -r mdheader.jar *; \
rm -rf META-INF
ifeq ($(OS_ARCH),WINNT)
@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); then \
rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
echo "making directory /m/dist/$(MOD_NAME)/$(BUILD_NUMBER)"; \
config/prmkdir.bat $(MDIST_DOS)\\$(MOD_NAME)\\$(BUILD_NUMBER); \
fi
@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); then \
rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
echo "making directory /m/dist/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME)"; \
config/prmkdir.bat $(MDIST_DOS)\\$(MOD_NAME)\\$(BUILD_NUMBER)\\$(OBJDIR_NAME); \
fi
else
@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); then \
rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
echo "making directory /m/dist/$(MOD_NAME)/$(BUILD_NUMBER)"; \
$(NSINSTALL) -D $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
chmod 775 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
fi
@if test ! -d $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); then \
rm -rf $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
echo "making directory /m/dist/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME)"; \
$(NSINSTALL) -D $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
chmod 775 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
fi
endif
cd $(RELEASE_DIR)/$(BUILD_NUMBER); \
cp -f version.df imports.df $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER); \
chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/version.df; \
chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/imports.df; \
cd $(OBJDIR_NAME); \
cp -f mdbinary.jar $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/mdbinary.jar; \
cd include; \
cp -f mdheader.jar $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME); \
chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/mdheader.jar
depend:
@echo "NSPR20 has no dependencies. Skipped."

4
nsprpub/Makefile.in
Просмотреть файл

@ -63,8 +63,8 @@ ifdef PR_CLIENT_BUILD
export::
rm -r -f $(DIST)/../public/nspr
ifdef PR_CLIENT_BUILD_UNIX
rm -f $(DIST)/lib/libnspr.a
rm -f $(DIST)/bin/libnspr.$(DLL_SUFFIX)
rm -f $(libdir)/libnspr.a
rm -f $(bindir)/libnspr.$(DLL_SUFFIX)
endif
endif

7
nsprpub/config/autoconf.mk.in
Просмотреть файл

@ -1,7 +1,14 @@
INCLUDED_AUTOCONF_MK = 1
USE_AUTOCONF = 1
MOZILLA_CLIENT = @MOZILLA_CLIENT@
DIST = @prefix@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
includedir = @includedir@
libdir = @libdir@
OBJDIR_NAME = @OBJDIR_NAME@
OBJDIR = @OBJDIR@
OBJ_SUFFIX = @OBJ_SUFFIX@

7
nsprpub/config/config.mk
Просмотреть файл

@ -177,6 +177,13 @@ MOZ_INCL = $(NSDEPTH)/dist/public/win16
MOZ_DIST = $(NSDEPTH)/dist/WIN16D_D.OBJ
endif
# if not using autoconf, set these values accordingly
prefix = $(DIST)
exec_prefix = $(prefix)
bindir = $(prefix)/bin
includedir = $(prefix)/include
libdir = $(prefix)/lib
VPATH = $(OBJDIR)
DEPENDENCIES = $(OBJDIR)/.md

28
nsprpub/lib/ds/Makefile
Просмотреть файл

@ -44,7 +44,7 @@ OPTIMIZER =
endif
endif
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include
CSRCS = \
plarena.c \
@ -61,16 +61,16 @@ HEADERS = \
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
# OS_CFLAGS = $(OS_EXE_CFLAGS)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
DLLBASE=/BASE:0x30000000
RES=$(OBJDIR)/plds.res
RESNAME=plds.rc
OS_LIBS = user32.lib
ifeq ($(OS_TARGET),WIN95)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib
endif
ifdef MOZ_DEBUG
@ -82,7 +82,7 @@ endif
else
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
ifeq ($(OS_ARCH), AIX)
@ -93,9 +93,9 @@ OS_LIBS += -lc_r
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)
endif
endif
endif
@ -164,22 +164,22 @@ endif
#
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir),
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(HEADERS) $(includedir)
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir)
else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(OS_ARCH), OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif
ifeq ($(MOZ_BITS),16)

30
nsprpub/lib/ds/Makefile.in
Просмотреть файл

@ -51,7 +51,7 @@ endif
endif
endif #!USE_AUTOCONF
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include
CSRCS = \
plarena.c \
@ -70,16 +70,16 @@ HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
# OS_CFLAGS = $(OS_EXE_CFLAGS)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
DLLBASE=/BASE:0x30000000
RES=$(OBJDIR)/plds.res
RESNAME=plds.rc
OS_LIBS = user32.lib
ifeq ($(OS_TARGET),WIN95)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib
endif
ifdef MOZ_DEBUG
@ -92,7 +92,7 @@ endif
ifndef USE_AUTOCONF
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
ifeq ($(OS_ARCH), AIX)
@ -103,9 +103,9 @@ OS_LIBS += -lc_r
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)
endif
endif
endif
@ -123,7 +123,7 @@ endif
endif #!USE_AUTOCONF
ifdef RESOLVE_LINK_SYMBOLS
EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION) $(OS_LIBS)
EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS)
endif
LIBRARY_NAME = plds
@ -179,22 +179,22 @@ endif
#
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir),
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(HEADERS) $(includedir)
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir)
else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(OS_ARCH), OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif
ifeq ($(MOZ_BITS),16)

2
nsprpub/lib/libc/include/Makefile
Просмотреть файл

@ -44,7 +44,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
include $(MOD_DEPTH)/config/rules.mk
export:: $(HEADERS)
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(HEADERS) $(includedir)
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
endif

2
nsprpub/lib/libc/include/Makefile.in
Просмотреть файл

@ -49,7 +49,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
include $(topsrcdir)/config/rules.mk
export:: $(HEADERS)
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(HEADERS) $(includedir)
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
endif

26
nsprpub/lib/libc/src/Makefile
Просмотреть файл

@ -44,7 +44,7 @@ OPTIMIZER =
endif
endif
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
CSRCS =\
plvrsion.c \
@ -70,15 +70,15 @@ RELEASE_LIBS = $(TARGETS)
ifeq ($(OS_ARCH),WINNT)
ifeq ($(OS_TARGET), WIN16)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
DLLBASE=/BASE:0x30000000
RES=$(OBJDIR)/plc.res
RESNAME=plc.rc
ifeq ($(OS_TARGET),WIN95)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib
endif
ifdef MOZ_DEBUG
@ -90,7 +90,7 @@ endif
else
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
ifeq ($(OS_ARCH), AIX)
@ -101,9 +101,9 @@ OS_LIBS += -lc_r
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)
endif
endif
endif
@ -165,21 +165,21 @@ endif
#
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir),
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir)
else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(OS_ARCH), OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif
ifeq ($(MOZ_BITS),16)

28
nsprpub/lib/libc/src/Makefile.in
Просмотреть файл

@ -52,7 +52,7 @@ endif
endif
endif #!USE_AUTOCONF
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
CSRCS =\
plvrsion.c \
@ -78,15 +78,15 @@ RELEASE_LIBS = $(TARGETS)
ifeq ($(OS_ARCH),WINNT)
ifeq ($(OS_TARGET), WIN16)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
DLLBASE=/BASE:0x30000000
RES=$(OBJDIR)/plc.res
RESNAME=plc.rc
ifeq ($(OS_TARGET),WIN95)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib
endif
ifdef MOZ_DEBUG
@ -99,7 +99,7 @@ endif
ifndef USE_AUTOCONF
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
ifeq ($(OS_ARCH), AIX)
@ -110,9 +110,9 @@ OS_LIBS += -lc_r
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)
endif
endif
endif
@ -130,7 +130,7 @@ endif
endif #!USE_AUTOCONF
ifdef RESOLVE_LINK_SYMBOLS
EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION) $(OS_LIBS)
EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS)
endif
include $(topsrcdir)/config/rules.mk
@ -179,21 +179,21 @@ endif
#
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir),
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir)
else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(OS_ARCH), OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif
ifeq ($(MOZ_BITS),16)

2
nsprpub/lib/msgc/include/Makefile
Просмотреть файл

@ -45,7 +45,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
include $(MOD_DEPTH)/config/rules.mk
export:: $(EXPORT_HEADERS)
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(includedir)
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
endif

2
nsprpub/lib/msgc/include/Makefile.in
Просмотреть файл

@ -50,7 +50,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
include $(topsrcdir)/config/rules.mk
export:: $(EXPORT_HEADERS)
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(includedir)
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
endif

18
nsprpub/lib/msgc/src/Makefile
Просмотреть файл

@ -44,7 +44,7 @@ OPTIMIZER =
endif
endif
INCLUDES = -I$(DIST)/include -I../include
INCLUDES = -I$(includedir) -I../include
CSRCS = prgcapi.c prmsgc.c
@ -66,13 +66,13 @@ NSPR_VERSION = $(MOD_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).lib
else
DLLBASE=/BASE:0x30000000
#RES=$(OBJDIR)/ds.res
#RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
#OS_LIBS = user32.lib
EXTRA_LIBS = $(DIST)/lib/libnspr$(NSPR_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(NSPR_VERSION).lib
ifdef MOZ_DEBUG
ifdef GLOWCODE
@ -83,7 +83,7 @@ endif
else
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).$(LIB_SUFFIX)
else
ifeq ($(OS_ARCH), AIX)
@ -94,9 +94,9 @@ OS_LIBS += -lc_r
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION)
endif
endif
endif
@ -120,14 +120,14 @@ RELEASE_LIBS = $(TARGETS)
include $(MOD_DEPTH)/config/rules.mk
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir),
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib

18
nsprpub/lib/msgc/src/Makefile.in
Просмотреть файл

@ -49,7 +49,7 @@ OPTIMIZER =
endif
endif
INCLUDES = -I$(DIST)/include -I../include
INCLUDES = -I$(includedir) -I../include
CSRCS = prgcapi.c prmsgc.c
@ -71,13 +71,13 @@ NSPR_VERSION = $(MOD_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).lib
else
DLLBASE=/BASE:0x30000000
#RES=$(OBJDIR)/ds.res
#RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
#OS_LIBS = user32.lib
EXTRA_LIBS = $(DIST)/lib/libnspr$(NSPR_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(NSPR_VERSION).lib
ifdef MOZ_DEBUG
ifdef GLOWCODE
@ -88,7 +88,7 @@ endif
else
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(NSPR_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).$(LIB_SUFFIX)
else
ifeq ($(OS_ARCH), AIX)
@ -99,9 +99,9 @@ OS_LIBS += -lc_r
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(NSPR_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION)
endif
endif
endif
@ -125,14 +125,14 @@ RELEASE_LIBS = $(TARGETS)
include $(topsrcdir)/config/rules.mk
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir),
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib

306
nsprpub/lib/msgc/tests/Makefile
Просмотреть файл

@ -1,306 +0,0 @@
#
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Netscape Portable Runtime (NSPR).
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient
# may use your version of this file under either the MPL or the
# GPL.
#
#! gmake
MOD_DEPTH = ../../..
include $(MOD_DEPTH)/config/config.mk
ifeq ($(OS_TARGET), WIN16)
OS_CFLAGS = $(OS_EXE_CFLAGS)
W16STDIO = $(MOD_DEPTH)/pr/src/md/windows/$(OBJDIR)/w16stdio.$(OBJ_SUFFIX)
endif
ifeq ($(OS_TARGET), OS2)
OS_CFLAGS = $(OS_EXE_CFLAGS)
endif
CSRCS = gc1.c thrashgc.c
ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
PROG_SUFFIX = .exe
else
PROG_SUFFIX =
endif
PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
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
NSPR_VERSION = $(MOD_VERSION)
GC_VERSION = $(MOD_VERSION)
LIBPR = -lnspr$(NSPR_VERSION)
LIBPLC = -lplc$(NSPR_VERSION)
LIBGC = -lmsgc$(GC_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib
else
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
LIBGC= $(DIST)/lib/libmsgc$(GC_VERSION).$(LIB_SUFFIX)
endif
endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib
else
LDOPTS += -Zomf -Zlinker /PM:VIO
endif
endif
ifneq ($(OS_ARCH), WINNT)
PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared
# For 6.x machines, include this flag
ifeq ($(basename $(OS_RELEASE)),6)
ifeq ($(USE_N32),1)
LDOPTS += -n32
else
LDOPTS += -32
endif
endif
endif
ifeq ($(OS_ARCH), OSF1)
# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so
# we do static linking.
ifeq ($(OS_RELEASE), V3.2)
LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a
LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a
EXTRA_LIBS = -lc_r
else
LDOPTS += -rpath $(PWD)/$(DIST)/lib
endif
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -z -Wl,+s,+b,$(PWD)/$(DIST)/lib
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
LIBPR = -lnspr$(NSPR_VERSION)_shr
LIBPLC = -lplc$(NSPR_VERSION)_shr
LIBGC = -lmsgc$(GC_VERSION)_shr
else
LDOPTS += -brtl
EXTRA_LIBS = -ldl
endif
endif
# Solaris
ifeq ($(OS_ARCH), SunOS)
ifneq ($(OS_RELEASE), 4.1.3_U1)
ifdef NS_USE_GCC
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(DIST)/lib
else
LDOPTS += -R $(PWD)/$(DIST)/lib
endif
endif
ifneq ($(LOCAL_THREADS_ONLY),1)
# SunOS 5.4 and 5.5 need to link with -lthread or -lpthread,
# even though we already linked with these system libraries
# when we built libnspr.so.
ifeq ($(OS_RELEASE), 5.4)
EXTRA_LIBS = -lthread
endif
ifeq ($(OS_RELEASE), 5.5)
ifdef USE_PTHREADS
EXTRA_LIBS = -lpthread
else
EXTRA_LIBS = -lthread
endif
endif
endif # LOCAL_THREADS_ONLY
endif # SunOS
ifeq ($(OS_ARCH),NEC)
EXTRA_LIBS = $(OS_LIBS)
# 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
endif
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$(NSPR_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a
LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
# implicitly by $(CC)) again even though we already linked with these
# system libraries when we built libnspr.so.
#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)/$(DIST)/lib
endif
ifeq ($(OS_ARCH), Linux)
ifeq ($(OS_RELEASE), 1.2)
EXTRA_LIBS = -ldl
endif
endif
ifeq ($(OS_ARCH), SCOOS)
# SCO Unix needs to link against -lsocket again even though we
# already linked with these system libraries when we built libnspr.so.
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
endif
ifeq ($(OS_ARCH),SINIX)
EXTRA_LIBS = -lsocket -lnsl -lresolv -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
endif
ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(PWD)/$(DIST)/lib
endif
ifeq ($(OS_ARCH),BSD_OS)
EXTRA_LIBS = -ldl
endif
ifeq ($(OS_ARCH),DGUX)
EXTRA_LIBS = -lsocket -lnsl -ldl
endif
#####################################################
#
# The rules
#
#####################################################
include $(MOD_DEPTH)/config/rules.mk
AIX_PRE_4_2 = 0
ifeq ($(OS_ARCH),AIX)
ifneq ($(OS_RELEASE),4.2)
ifneq ($(USE_PTHREADS), 1)
#AIX_PRE_4_2 = 1
endif
endif
endif
ifeq ($(AIX_PRE_4_2),1)
# AIX releases prior to 4.2 need a special two-step linking hack
# in order to both override the system select() and be able to
# get at the original system select().
#
# We use a pattern rule in ns/nspr20/config/rules.mk to generate
# the .$(OBJ_SUFFIX) file from the .c source file, then do the
# two-step linking hack below.
$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
rm -f $@ $(AIX_TMP)
$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(NSPR_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)
else
# All platforms that are not AIX pre-4.2.
$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET),WIN16)
echo system windows >w16link
echo name $@ >>w16link
echo option map >>w16link
# echo option CASEEXACT >>w16link
echo option stack=16K >>w16link
echo debug $(DEBUGTYPE) all >>w16link
echo file >>w16link
echo $< , >>w16link
echo $(W16STDIO) >>w16link
echo library >>w16link
echo $(LIBPR), >>w16link
echo $(LIBPLC), >>w16link
echo $(LIBGC), >>w16link
echo winsock.lib >>w16link
wlink @w16link.
else
link $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) wsock32.lib -out:$@
else
ifeq ($(OS_ARCH),OS2)
$(LINK) $(LDOPTS) $< $(LIBGC) $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
else
$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBGC) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
endif
endif
endif
export:: $(TARGETS)
export:: install
clean::
rm -f $(TARGETS)

58
nsprpub/lib/msgc/tests/Makefile.in
Просмотреть файл

@ -63,11 +63,11 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(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
LDOPTS = -L$(libdir)
NSPR_VERSION = $(MOD_VERSION)
GC_VERSION = $(MOD_VERSION)
LIBPR = -lnspr$(NSPR_VERSION)
@ -76,23 +76,23 @@ LIBGC = -lmsgc$(GC_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib
LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib
LIBPLC = $(libdir)/plc$(NSPR_VERSION).lib
LIBGC= $(libdir)/msgc$(GC_VERSION).lib
else
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
LIBGC= $(DIST)/lib/libmsgc$(GC_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPLC = $(libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
LIBGC= $(libdir)/libmsgc$(GC_VERSION).$(LIB_SUFFIX)
endif
endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBGC= $(DIST)/lib/msgc$(GC_VERSION).lib
LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib
LIBPLC = $(libdir)/plc$(NSPR_VERSION).lib
LIBGC= $(libdir)/msgc$(GC_VERSION).lib
else
LDOPTS += -Zomf -Zlinker /PM:VIO
endif
@ -103,7 +103,7 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared
LDOPTS += -rpath $(PWD)/$(libdir) -rdata_shared
# For 6.x machines, include this flag
ifeq ($(basename $(OS_RELEASE)),6)
@ -120,22 +120,22 @@ ifeq ($(OS_ARCH), OSF1)
# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so
# we do static linking.
ifeq ($(OS_RELEASE), V3.2)
LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a
LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a
LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a
LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a
LIBGC = $(libdir)/libmsgc$(GC_VERSION).a
EXTRA_LIBS = -lc_r
else
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -z -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -z -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
LIBPR = -lnspr$(NSPR_VERSION)_shr
LIBPLC = -lplc$(NSPR_VERSION)_shr
@ -150,9 +150,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)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(libdir)
endif
endif
@ -179,16 +179,16 @@ EXTRA_LIBS = $(OS_LIBS)
# 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)/$(libdir)
endif
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$(NSPR_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a
LIBGC = $(DIST)/lib/libmsgc$(GC_VERSION).a
LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a
LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a
LIBGC = $(libdir)/libmsgc$(GC_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
@ -198,7 +198,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)/$(libdir)
endif
ifeq ($(OS_ARCH), Linux)
@ -214,7 +214,7 @@ 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)/$(libdir)
endif
ifeq ($(OS_ARCH),SINIX)
@ -222,11 +222,11 @@ EXTRA_LIBS = -lsocket -lnsl -lresolv -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)/$(libdir)
endif
ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(PWD)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH),BSD_OS)
@ -267,7 +267,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$(NSPR_VERSION).a
$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(NSPR_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

30
nsprpub/lib/prstreams/Makefile
Просмотреть файл

@ -64,7 +64,7 @@ ifeq ($(OS_ARCH), BeOS)
CFLAGS += -frtti -fexceptions
endif
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
HEADERS = $(wildcard *.h)
@ -80,24 +80,24 @@ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_S
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
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 = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib
endif
endif
else
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) -lstdcpp
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -lstdcpp
endif
else
ifeq ($(OS_ARCH), AIX)
@ -119,9 +119,9 @@ else
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)
endif
endif
endif
@ -137,7 +137,7 @@ ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),BeOS)
EXTRA_LIBS = -lstdc++.r4 -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -lstdc++.r4 -L$(libdir) -lnspr$(MOD_VERSION)
endif
ifeq ($(OS_ARCH), UNIXWARE)
@ -195,20 +195,20 @@ endif
#
export:: $(TARGETS) $(HEADERS)
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(HEADERS) $(includedir)
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifeq ($(OS_ARCH),OS2)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/bin
$(INSTALL) -m 444 $(TARGETS) $(bindir)
endif
ifeq ($(OS_ARCH),HP-UX)
ifdef SHARED_LIBRARY
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
endif
endif
ifeq ($(OS_ARCH),OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir)
ifdef SHARED_LIBRARY
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif

32
nsprpub/lib/prstreams/Makefile.in
Просмотреть файл

@ -71,7 +71,7 @@ ifeq ($(OS_ARCH), BeOS)
endif
endif # !USE_AUTOCONF
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
HEADERS = $(wildcard $(srcdir)/*.h)
@ -88,24 +88,24 @@ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_S
ifndef USE_AUTOCONF
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
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 = $(DIST)/lib/nspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib
else
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib
endif
endif
else
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) -lstdcpp
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -lstdcpp
endif
else
ifeq ($(OS_ARCH), AIX)
@ -127,9 +127,9 @@ else
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr
else
EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)
endif
endif
endif
@ -145,7 +145,7 @@ ifeq ($(OS_ARCH),SCOOS)
EXTRA_LIBS =
endif
ifeq ($(OS_ARCH),BeOS)
EXTRA_LIBS = -lstdc++.r4 -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS = -lstdc++.r4 -L$(libdir) -lnspr$(MOD_VERSION)
endif
ifeq ($(OS_ARCH), UNIXWARE)
@ -154,7 +154,7 @@ endif
endif # !USE_AUTOCONF
ifdef RESOLVE_LINK_SYMBOLS
EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION)
EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION)
endif
LIBRARY_NAME = prstrms
@ -208,20 +208,20 @@ endif
#
export:: $(TARGETS) $(HEADERS)
$(INSTALL) -m 444 $(HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(HEADERS) $(includedir)
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifeq ($(OS_ARCH),OS2)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/bin
$(INSTALL) -m 444 $(TARGETS) $(bindir)
endif
ifeq ($(OS_ARCH),HP-UX)
ifdef SHARED_LIBRARY
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
endif
endif
ifeq ($(OS_ARCH),OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir)
ifdef SHARED_LIBRARY
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif

44
nsprpub/lib/prstreams/tests/testprstrm/Makefile
Просмотреть файл

@ -57,26 +57,26 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(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
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPRSTRMS = -lprstrms$(MOD_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).lib
else
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
ifeq ($(OS_TARGET), WIN95)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
else
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).$(LIB_SUFFIX)
endif
endif
endif
@ -84,8 +84,8 @@ endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
else
LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
endif
@ -96,20 +96,20 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
LIBPR = -lnspr$(MOD_VERSION)_shr
LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr
@ -123,9 +123,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)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(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.
@ -142,8 +142,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
LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).a
LIBPR = $(libdir)/libnspr$(MOD_VERSION).a
LIBPRSTRMS = $(libdir)/libprstrms$(MOD_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
@ -153,7 +153,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)/$(libdir)
endif
ifeq ($(OS_ARCH), SCOOS)
@ -163,11 +163,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)/$(libdir)
endif
ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(PWD)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(libdir)
endif
#####################################################
@ -200,7 +200,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) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

44
nsprpub/lib/prstreams/tests/testprstrm/Makefile.in
Просмотреть файл

@ -62,26 +62,26 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(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
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPRSTRMS = -lprstrms$(MOD_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).lib
else
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
ifeq ($(OS_TARGET), WIN95)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
else
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPRSTRMS = $(libdir)/libprstrms$(MOD_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 = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(DIST)/lib/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPRSTRMS = $(libdir)/prstrms$(MOD_VERSION).$(LIB_SUFFIX)
else
LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
endif
@ -101,20 +101,20 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
LIBPR = -lnspr$(MOD_VERSION)_shr
LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr
@ -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)/$(DIST)/lib
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(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 = $(DIST)/lib/libnspr$(MOD_VERSION).a
LIBPRSTRMS = $(DIST)/lib/libprstrms$(MOD_VERSION).a
LIBPR = $(libdir)/libnspr$(MOD_VERSION).a
LIBPRSTRMS = $(libdir)/libprstrms$(MOD_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)/$(DIST)/lib
#export LD_RUN_PATH = $(PWD)/$(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)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(PWD)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(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) $< $(DIST)/lib/libnspr$(MOD_VERSION).a
$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

46
nsprpub/lib/tests/Makefile
Просмотреть файл

@ -63,30 +63,30 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(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
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPLC = -lplc$(MOD_VERSION)
LIBPLDS = -lplds$(MOD_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC= $(libdir)/plc$(MOD_VERSION).lib
LIBPLDS= $(libdir)/plds$(MOD_VERSION).lib
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_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX)
else
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLDS= $(libdir)/libplds$(MOD_VERSION).$(LIB_SUFFIX)
endif
endif
endif
@ -94,9 +94,9 @@ endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC = $(libdir)/plc$(MOD_VERSION).lib
LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX)
else
LDOPTS += -Zomf -Zlinker /PM:VIO
endif
@ -107,14 +107,14 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), Linux)
ifeq ($(OS_RELEASE), 1.2)
EXTRA_LIBS = -ldl
else
LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib
LDOPTS += -Xlinker -rpath $(PWD)/$(libdir)
ifeq ($(USE_PTHREADS),1)
EXTRA_LIBS = -lpthread
endif
@ -122,16 +122,16 @@ ifeq ($(OS_ARCH), Linux)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread
LDOPTS += -rpath $(PWD)/$(libdir) -lpthread
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
LIBPR = -lnspr$(MOD_VERSION)_shr
LIBPLC = -lplc$(MOD_VERSION)_shr
endif
@ -140,9 +140,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)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(libdir)
endif
endif
@ -170,7 +170,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)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(libdir)
endif
#####################################################
@ -203,7 +203,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) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

46
nsprpub/lib/tests/Makefile.in
Просмотреть файл

@ -68,30 +68,30 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(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
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPLC = -lplc$(MOD_VERSION)
LIBPLDS = -lplds$(MOD_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC= $(libdir)/plc$(MOD_VERSION).lib
LIBPLDS= $(libdir)/plds$(MOD_VERSION).lib
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_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLDS= $(libdir)/plds$(MOD_VERSION).$(LIB_SUFFIX)
else
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLDS= $(DIST)/lib/libplds$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLDS= $(libdir)/libplds$(MOD_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 = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC = $(libdir)/plc$(MOD_VERSION).lib
LIBPLDS= $(libdir)/plds$(MOD_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)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), Linux)
ifeq ($(OS_RELEASE), 1.2)
EXTRA_LIBS = -ldl
else
LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib
LDOPTS += -Xlinker -rpath $(PWD)/$(libdir)
ifeq ($(USE_PTHREADS),1)
EXTRA_LIBS = -lpthread
endif
@ -127,16 +127,16 @@ ifeq ($(OS_ARCH), Linux)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread
LDOPTS += -rpath $(PWD)/$(libdir) -lpthread
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
LIBPR = -lnspr$(MOD_VERSION)_shr
LIBPLC = -lplc$(MOD_VERSION)_shr
endif
@ -145,9 +145,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)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(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)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(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) $< $(DIST)/lib/libnspr$(MOD_VERSION).a
$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

54
nsprpub/pr/include/Makefile
Просмотреть файл

@ -1,54 +0,0 @@
#
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Netscape Portable Runtime (NSPR).
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient
# may use your version of this file under either the MPL or the
# GPL.
#
#! gmake
MOD_DEPTH = ../..
DIRS = md private obsolete
include $(MOD_DEPTH)/config/config.mk
HEADERS = $(wildcard *.h)
RELEASE_HEADERS = $(HEADERS)
RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
include $(MOD_DEPTH)/config/rules.mk
export:: $(RELEASE_HEADERS)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)
endif

2
nsprpub/pr/include/Makefile.in
Просмотреть файл

@ -52,7 +52,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
include $(topsrcdir)/config/rules.mk
export:: $(RELEASE_HEADERS)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)
endif

205
nsprpub/pr/include/md/Makefile
Просмотреть файл

@ -1,205 +0,0 @@
#
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Netscape Portable Runtime (NSPR).
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient
# may use your version of this file under either the MPL or the
# GPL.
#
#! gmake
MOD_DEPTH = ../../..
HEADERS = $(wildcard *.h)
include $(MOD_DEPTH)/config/rules.mk
ifeq ($(OS_ARCH),IRIX)
ifeq ($(USE_64), 1)
MDCPUCFG_H = _irix64.cfg
else
MDCPUCFG_H = _irix32.cfg
endif
endif
ifeq ($(OS_ARCH),WINNT)
ifeq ($(OS_TARGET), WIN95)
MDCPUCFG_H = _win95.cfg
else
ifeq ($(OS_TARGET), WIN16)
MDCPUCFG_H = _win16.cfg
else
MDCPUCFG_H = _winnt.cfg
endif
endif
endif
ifeq ($(OS_ARCH),OS2)
MDCPUCFG_H = _os2.cfg
endif
ifeq ($(OS_ARCH),AIX)
ifeq ($(USE_64),1)
MDCPUCFG_H = _aix64.cfg
else
ifeq ($(USE_IPV6),1)
MDCPUCFG_H = _aix32in6.cfg
else
MDCPUCFG_H = _aix32.cfg
endif
endif
endif
ifeq ($(OS_ARCH),BSD_OS)
MDCPUCFG_H = _bsdi.cfg
endif
ifeq ($(OS_ARCH),FreeBSD)
MDCPUCFG_H = _freebsd.cfg
endif
ifeq ($(OS_ARCH),OpenBSD)
MDCPUCFG_H = _openbsd.cfg
endif
ifeq ($(OS_ARCH),OpenVMS)
MDCPUCFG_H = _openvms.cfg
endif
ifeq ($(OS_ARCH),NetBSD)
MDCPUCFG_H = _netbsd.cfg
endif
ifeq ($(OS_ARCH),HP-UX)
ifeq ($(USE_64), 1)
MDCPUCFG_H = _hpux64.cfg
else
MDCPUCFG_H = _hpux32.cfg
endif
endif
ifeq ($(OS_ARCH),Linux)
MDCPUCFG_H = _linux.cfg
endif
ifeq ($(OS_ARCH),OSF1)
MDCPUCFG_H = _osf1.cfg
endif
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
MDCPUCFG_H = _sunos4.cfg
else
ifeq ($(USE_64),1)
MDCPUCFG_H = _solaris64.cfg
else
MDCPUCFG_H = _solaris32.cfg
endif
endif
endif
ifeq ($(OS_ARCH),SINIX)
MDCPUCFG_H = _reliantunix.cfg
endif
ifeq ($(OS_ARCH),Rhapsody)
MDCPUCFG_H = _rhapsody.cfg
endif
ifeq ($(OS_ARCH),NEXTSTEP)
MDCPUCFG_H = _nextstep.cfg
endif
ifeq ($(OS_ARCH),NEWS-OS)
MDCPUCFG_H = _sony.cfg
endif
ifeq ($(OS_ARCH),NEC)
MDCPUCFG_H = _nec.cfg
endif
ifeq ($(OS_ARCH),SCOOS)
MDCPUCFG_H = _scoos.cfg
endif
ifeq ($(OS_ARCH),UNIXWARE)
ifeq (,$(filter-out 2.1,$(OS_RELEASE)))
MDCPUCFG_H = _unixware.cfg
else
MDCPUCFG_H = _unixware7.cfg
endif
endif
ifeq ($(OS_ARCH),NCR)
MDCPUCFG_H = _ncr.cfg
endif
ifeq ($(OS_ARCH),DGUX)
MDCPUCFG_H = _dgux.cfg
endif
ifeq ($(OS_ARCH),QNX)
MDCPUCFG_H = _qnx.cfg
endif
ifeq ($(OS_TARGET),NTO)
MDCPUCFG_H = _nto.cfg
endif
ifeq ($(OS_ARCH),BeOS)
MDCPUCFG_H = _beos.cfg
endif
export:: $(MDCPUCFG_H)
$(INSTALL) -m 444 $(MDCPUCFG_H) $(DIST)/include
ifeq ($(MOZ_BITS),16)
cp $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
$(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL)
mv -f $(DIST)/include/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h
else
ifneq ($(OS_ARCH),OpenVMS)
mv -f $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
else
# mv'ing a link causes the file itself to move, not the link.
rm -f $(DIST)/include/$(MDCPUCFG_H)
rm -f $(DIST)/include/prcpucfg.h
ln -fs `pwd`/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
endif
endif
release:: export
@echo "Copying machine-dependent prcpucfg.h"
@if test -z "$(BUILD_NUMBER)"; then \
echo "BUILD_NUMBER must be defined"; \
false; \
fi
@if test ! -d $(RELEASE_INCLUDE_DIR); then \
rm -rf $(RELEASE_INCLUDE_DIR); \
$(NSINSTALL) -D $(RELEASE_INCLUDE_DIR);\
fi
cp $(MDCPUCFG_H) $(RELEASE_INCLUDE_DIR)/prcpucfg.h

16
nsprpub/pr/include/md/Makefile.in
Просмотреть файл

@ -188,19 +188,19 @@ endif # ! USE_AUTOCONF
export:: $(MDCPUCFG_H)
ifeq ($(MOZ_BITS),16)
cp $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
cp $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h
$(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL)
mv -f $(DIST)/include/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h
mv -f $(includedir)/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h
else
$(INSTALL) -m 444 $(CONFIGS) $(DIST)/include/md
$(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(DIST)/include
$(INSTALL) -m 444 $(CONFIGS) $(includedir)/md
$(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(includedir)
ifneq ($(OS_ARCH),OpenVMS)
mv -f $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
mv -f $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h
else
# mv'ing a link causes the file itself to move, not the link.
rm -f $(DIST)/include/$(MDCPUCFG_H)
rm -f $(DIST)/include/prcpucfg.h
ln -fs `pwd`/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
rm -f $(includedir)/$(MDCPUCFG_H)
rm -f $(includedir)/prcpucfg.h
ln -fs `pwd`/$(MDCPUCFG_H) $(includedir)/prcpucfg.h
endif
endif

52
nsprpub/pr/include/obsolete/Makefile
Просмотреть файл

@ -1,52 +0,0 @@
#
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Netscape Portable Runtime (NSPR).
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient
# may use your version of this file under either the MPL or the
# GPL.
#
#! gmake
MOD_DEPTH = ../../..
include $(MOD_DEPTH)/config/config.mk
HEADERS = $(wildcard *.h)
RELEASE_HEADERS = $(HEADERS)
RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete
include $(MOD_DEPTH)/config/rules.mk
export:: $(RELEASE_HEADERS)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/obsolete
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/obsolete
endif

2
nsprpub/pr/include/obsolete/Makefile.in
Просмотреть файл

@ -51,7 +51,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete
include $(topsrcdir)/config/rules.mk
export:: $(RELEASE_HEADERS)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/obsolete
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/obsolete
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/obsolete
endif

51
nsprpub/pr/include/private/Makefile
Просмотреть файл

@ -1,51 +0,0 @@
#
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Netscape Portable Runtime (NSPR).
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998-2000 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the
# terms of the GNU General Public License Version 2 or later (the
# "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. If you wish to allow use of your
# version of this file only under the terms of the GPL and not to
# allow others to use your version of this file under the MPL,
# indicate your decision by deleting the provisions above and
# replace them with the notice and other provisions required by
# the GPL. If you do not delete the provisions above, a recipient
# may use your version of this file under either the MPL or the
# GPL.
#
#! gmake
MOD_DEPTH = ../../..
include $(MOD_DEPTH)/config/config.mk
RELEASE_HEADERS = pprio.h pprthred.h prpriv.h
RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/private
HEADERS = $(RELEASE_HEADERS) pprmwait.h primpl.h
include $(MOD_DEPTH)/config/rules.mk
export:: $(RELEASE_HEADERS)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/private
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/private
endif

2
nsprpub/pr/include/private/Makefile.in
Просмотреть файл

@ -52,7 +52,7 @@ HEADERS = $(RELEASE_HEADERS) $(srcdir)/pprmwait.h $(srcdir)/primpl.h
include $(topsrcdir)/config/rules.mk
export:: $(RELEASE_HEADERS)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/private
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/private
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/private
endif

16
nsprpub/pr/src/Makefile
Просмотреть файл

@ -162,7 +162,7 @@ endif
endif
ifdef GC_LEAK_DETECTOR
OS_LIBS += -L$(DIST)/lib -lboehm
OS_LIBS += -L$(libdir) -lboehm
endif
#
@ -377,7 +377,7 @@ endif
# Version information generation (begin)
#
ECHO = echo
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
TINC = $(OBJDIR)/_pr_bld.h
ifeq ($(OS_TARGET),OS2)
@ -427,21 +427,21 @@ endif
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir),
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir)
else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(OS_ARCH), OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif
ifeq ($(MOZ_BITS),16)

16
nsprpub/pr/src/Makefile.in
Просмотреть файл

@ -163,7 +163,7 @@ OS_LIBS = -lsocket -lnsl -lgen -lresolv
endif
ifdef GC_LEAK_DETECTOR
OS_LIBS += -L$(DIST)/lib -lboehm
OS_LIBS += -L$(libdir) -lboehm
endif
endif # USE_AUTOCONF
@ -398,7 +398,7 @@ endif
# Version information generation (begin)
#
ECHO = echo
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
TINC = $(OBJDIR)/_pr_bld.h
ifeq ($(OS_TARGET),OS2)
@ -448,21 +448,21 @@ endif
#
# The Client build wants the shared libraries in $(DIST)/bin,
# The Client build wants the shared libraries in $(bindir)
# so we also install them there.
#
export:: $(TARGETS)
$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(libdir)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(bindir)
else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(bindir)
endif
ifeq ($(OS_ARCH), OpenVMS)
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(libdir)
endif
endif
ifeq ($(MOZ_BITS),16)

2
nsprpub/pr/src/bthreads/Makefile
Просмотреть файл

@ -43,7 +43,7 @@ CSRCS += $(BTCSRCS)
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk

2
nsprpub/pr/src/bthreads/Makefile.in
Просмотреть файл

@ -48,7 +48,7 @@ CSRCS += $(BTCSRCS)
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
include $(topsrcdir)/config/rules.mk

2
nsprpub/pr/src/cplus/Makefile
Просмотреть файл

@ -55,7 +55,7 @@ OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/cplus/Makefile.in
Просмотреть файл

@ -59,7 +59,7 @@ OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
include $(topsrcdir)/config/rules.mk

42
nsprpub/pr/src/cplus/tests/Makefile
Просмотреть файл

@ -64,16 +64,16 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
INCLUDES = -I.. -I$(DIST)/include
INCLUDES = -I.. -I$(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
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPL = -lplc$(MOD_VERSION)
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared
LDOPTS += -rpath $(PWD)/$(libdir) -rdata_shared
# For 6.x machines, include this flag
ifeq ($(basename $(OS_RELEASE)),6)
ifeq ($(USE_N32),1)
@ -94,9 +94,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)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(libdir)
endif
endif
@ -120,20 +120,20 @@ 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 = $(libdir)/nspr$(MOD_VERSION).lib
LIBPL = $(libdir)/plc$(MOD_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 = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPL = $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)
endif
endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC = $(libdir)/plc$(MOD_VERSION).lib
else
LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
endif
@ -144,16 +144,16 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
LIBPR = -lnspr$(MOD_VERSION)_shr
LIBPLC = -lplc$(MOD_VERSION)_shr
@ -167,7 +167,7 @@ ifeq ($(OS_ARCH), Linux)
ifeq ($(OS_RELEASE), 1.2)
EXTRA_LIBS = -ldl
else
LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib
LDOPTS += -Xlinker -rpath $(PWD)/$(libdir)
ifeq ($(USE_PTHREADS),1)
EXTRA_LIBS = -lpthread
endif
@ -178,8 +178,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 = $(libdir)/libnspr$(MOD_VERSION).a
LIBPL = $(libdir)/libplc$(MOD_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
@ -189,7 +189,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)/$(libdir)
endif
ifeq ($(OS_ARCH), SCO_SV)
@ -199,11 +199,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)/$(libdir)
endif
ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(PWD)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(libdir)
endif
#####################################################
@ -236,7 +236,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) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

42
nsprpub/pr/src/cplus/tests/Makefile.in
Просмотреть файл

@ -69,16 +69,16 @@ PROGS = $(addprefix $(OBJDIR)/, $(CXXSRCS:.cpp=$(PROG_SUFFIX)))
TARGETS = $(PROGS) $(OBJS)
INCLUDES = -I.. -I$(DIST)/include
INCLUDES = -I.. -I$(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
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPL = -lplc$(MOD_VERSION)
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared
LDOPTS += -rpath $(PWD)/$(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)/$(DIST)/lib
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(libdir)
endif
endif
@ -125,20 +125,20 @@ 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 = $(libdir)/nspr$(MOD_VERSION).lib
LIBPL = $(libdir)/plc$(MOD_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 = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPL = $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)
endif
endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC = $(libdir)/plc$(MOD_VERSION).lib
else
LDOPTS += -Zomf -Zlinker /PM:VIO -lstdcpp
endif
@ -149,16 +149,16 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
LIBPR = -lnspr$(MOD_VERSION)_shr
LIBPLC = -lplc$(MOD_VERSION)_shr
@ -172,7 +172,7 @@ ifeq ($(OS_ARCH), Linux)
ifeq ($(OS_RELEASE), 1.2)
EXTRA_LIBS = -ldl
else
LDOPTS += -Xlinker -rpath $(PWD)/$(DIST)/lib
LDOPTS += -Xlinker -rpath $(PWD)/$(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 = $(DIST)/lib/libnspr$(MOD_VERSION).a
LIBPL = $(DIST)/lib/libplc$(MOD_VERSION).a
LIBPR = $(libdir)/libnspr$(MOD_VERSION).a
LIBPL = $(libdir)/libplc$(MOD_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)/$(DIST)/lib
#export LD_RUN_PATH = $(PWD)/$(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)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(PWD)/$(DIST)/lib
export LD_RUN_PATH = $(PWD)/$(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) $< $(DIST)/lib/libnspr$(MOD_VERSION).a
$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

2
nsprpub/pr/src/io/Makefile
Просмотреть файл

@ -70,7 +70,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/io/Makefile.in
Просмотреть файл

@ -75,7 +75,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/linking/Makefile
Просмотреть файл

@ -50,7 +50,7 @@ CSRCS = \
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/linking/Makefile.in
Просмотреть файл

@ -56,7 +56,7 @@ CSRCS = \
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/malloc/Makefile
Просмотреть файл

@ -46,7 +46,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/malloc/Makefile.in
Просмотреть файл

@ -51,7 +51,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/md/Makefile
Просмотреть файл

@ -65,7 +65,7 @@ CSRCS = \
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/md/Makefile.in
Просмотреть файл

@ -74,7 +74,7 @@ CSRCS = \
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/md/beos/Makefile
Просмотреть файл

@ -40,7 +40,7 @@ CSRCS += $(MDCSRCS)
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/md/beos/Makefile.in
Просмотреть файл

@ -46,7 +46,7 @@ CSRCS += $(MDCSRCS)
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/md/os2/Makefile
Просмотреть файл

@ -55,7 +55,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/md/os2/Makefile.in
Просмотреть файл

@ -60,7 +60,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

6
nsprpub/pr/src/md/unix/Makefile
Просмотреть файл

@ -303,7 +303,7 @@ ifeq ($(OS_ARCH),SunOS)
endif
endif
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_
@ -313,7 +313,7 @@ export:: $(TARGETS)
#ifeq ($(OS_ARCH),AIX)
#ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
#ifneq ($(USE_PTHREADS), 1)
# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(DIST)/lib
# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(libdir)
#endif
#endif
#endif
@ -323,7 +323,7 @@ ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(OS_TEST),sun4u)
$(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
$(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS)
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir)
$(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
ifeq ($(USE_64),1)

6
nsprpub/pr/src/md/unix/Makefile.in
Просмотреть файл

@ -324,7 +324,7 @@ TARGETS = $(OBJS)
endif # ! USE_AUTOCONF
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
@ -334,7 +334,7 @@ export:: $(TARGETS)
#ifeq ($(OS_ARCH),AIX)
#ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
#ifneq ($(USE_PTHREADS), 1)
# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(DIST)/lib
# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(libdir)
#endif
#endif
#endif
@ -345,7 +345,7 @@ ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(OS_TEST),sun4u)
$(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
$(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS)
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir)
$(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
ifeq ($(USE_64),1)

2
nsprpub/pr/src/md/windows/Makefile
Просмотреть файл

@ -92,7 +92,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/md/windows/Makefile.in
Просмотреть файл

@ -101,7 +101,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/memory/Makefile
Просмотреть файл

@ -52,7 +52,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/memory/Makefile.in
Просмотреть файл

@ -59,7 +59,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/misc/Makefile
Просмотреть файл

@ -76,7 +76,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/misc/Makefile.in
Просмотреть файл

@ -83,7 +83,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/pthreads/Makefile
Просмотреть файл

@ -53,7 +53,7 @@ CSRCS = \
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/pthreads/Makefile.in
Просмотреть файл

@ -59,7 +59,7 @@ CSRCS = \
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/threads/Makefile
Просмотреть файл

@ -83,7 +83,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/threads/Makefile.in
Просмотреть файл

@ -89,7 +89,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/threads/combined/Makefile
Просмотреть файл

@ -59,7 +59,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_

2
nsprpub/pr/src/threads/combined/Makefile.in
Просмотреть файл

@ -67,7 +67,7 @@ endif
TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_

34
nsprpub/pr/tests/Makefile
Просмотреть файл

@ -220,26 +220,26 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
# Setting the variables LDOPTS and LIBPR. We first initialize
# them to the default values, then adjust them for some platforms.
LDOPTS = -L$(DIST)/lib
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPLC = -lplc$(MOD_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC= $(libdir)/plc$(MOD_VERSION).lib
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)
LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)
else
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)
endif
ifdef PROFILE
LDOPTS += -PROFILE -MAP
@ -250,8 +250,8 @@ endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC = $(libdir)/plc$(MOD_VERSION).lib
else
ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
LDOPTS = -Zlinker /PM:VIO
@ -264,11 +264,11 @@ ifneq ($(OS_ARCH), WINNT)
# or -rpath linker option or the LD_RUN_PATH environment variable).
ifeq (,$(patsubst /%,,$(DIST)))
# $(DIST) is already an absolute pathname.
ABSOLUTE_LIB_DIR = $(DIST)/lib
ABSOLUTE_LIB_DIR = $(libdir)
else
# $(DIST) is a relative pathname: prepend the current directory.
PWD = $(shell pwd)
ABSOLUTE_LIB_DIR = $(PWD)/$(DIST)/lib
ABSOLUTE_LIB_DIR = $(PWD)/$(libdir)
endif
endif
@ -300,8 +300,8 @@ ifeq ($(OS_ARCH), OSF1)
# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so
# we do static linking.
ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a
LIBPR = $(libdir)/libnspr$(MOD_VERSION).a
LIBPLC = $(libdir)/libplc$(MOD_VERSION).a
EXTRA_LIBS = -lc_r
else
LDOPTS += -rpath $(ABSOLUTE_LIB_DIR)
@ -389,8 +389,8 @@ ifeq ($(OS_ARCH), NEWS-OS)
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
#export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a
LIBPR = $(libdir)/libnspr$(MOD_VERSION).a
LIBPLC = $(libdir)/libplc$(MOD_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
endif
@ -489,7 +489,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) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

34
nsprpub/pr/tests/Makefile.in
Просмотреть файл

@ -222,11 +222,11 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
# Setting the variables LDOPTS and LIBPR. We first initialize
# them to the default values, then adjust them for some platforms.
LDOPTS = -L$(DIST)/lib
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(MOD_VERSION)
LIBPLC = -lplc$(MOD_VERSION)
@ -234,16 +234,16 @@ ifndef USE_AUTOCONF
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC= $(libdir)/plc$(MOD_VERSION).lib
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)
LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)
else
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)
endif
ifdef PROFILE
LDOPTS += -PROFILE -MAP
@ -254,8 +254,8 @@ endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLC = $(libdir)/plc$(MOD_VERSION).lib
else
ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
LDOPTS = -Zlinker /PM:VIO
@ -268,11 +268,11 @@ ifneq ($(OS_ARCH), WINNT)
# or -rpath linker option or the LD_RUN_PATH environment variable).
ifeq (,$(patsubst /%,,$(DIST)))
# $(DIST) is already an absolute pathname.
ABSOLUTE_LIB_DIR = $(DIST)/lib
ABSOLUTE_LIB_DIR = $(libdir)
else
# $(DIST) is a relative pathname: prepend the current directory.
PWD = $(shell pwd)
ABSOLUTE_LIB_DIR = $(PWD)/$(DIST)/lib
ABSOLUTE_LIB_DIR = $(PWD)/$(libdir)
endif
endif
@ -304,8 +304,8 @@ ifeq ($(OS_ARCH), OSF1)
# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so
# we do static linking.
ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a
LIBPR = $(libdir)/libnspr$(MOD_VERSION).a
LIBPLC = $(libdir)/libplc$(MOD_VERSION).a
EXTRA_LIBS = -lc_r
else
LDOPTS += -rpath $(ABSOLUTE_LIB_DIR)
@ -393,8 +393,8 @@ ifeq ($(OS_ARCH), NEWS-OS)
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
#export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a
LIBPR = $(libdir)/libnspr$(MOD_VERSION).a
LIBPLC = $(libdir)/libplc$(MOD_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
endif
@ -513,7 +513,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) $< $(libdir)/libnspr$(MOD_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

2
nsprpub/pr/tests/dll/Makefile
Просмотреть файл

@ -46,7 +46,7 @@ endif
CSRCS = mygetval.c mysetval.c
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
OBJS = $(OBJDIR)/mygetval.$(OBJ_SUFFIX) \
$(OBJDIR)/mysetval.$(OBJ_SUFFIX)

2
nsprpub/pr/tests/dll/Makefile.in
Просмотреть файл

@ -51,7 +51,7 @@ endif
CSRCS = mygetval.c mysetval.c
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
OBJS = $(OBJDIR)/mygetval.$(OBJ_SUFFIX) \
$(OBJDIR)/mysetval.$(OBJ_SUFFIX)

6
nsprpub/pr/tests/w16gui/Makefile
Просмотреть файл

@ -48,9 +48,9 @@ CSRCS = poppad.c \
popprnt0.c
INCLUDES = -I$(DIST)/include
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLDS = $(DIST)/lib/plds$(MOD_VERSION).lib
INCLUDES = -I$(includedir)
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLDS = $(libdir)/plds$(MOD_VERSION).lib
TARGETS = $(OBJDIR)/poppad.exe
OS_CFLAGS = $(OS_EXE_CFLAGS)

6
nsprpub/pr/tests/w16gui/Makefile.in
Просмотреть файл

@ -53,9 +53,9 @@ CSRCS = poppad.c \
popprnt0.c
INCLUDES = -I$(DIST)/include
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLDS = $(DIST)/lib/plds$(MOD_VERSION).lib
INCLUDES = -I$(includedir)
LIBPR = $(libdir)/nspr$(MOD_VERSION).lib
LIBPLDS = $(libdir)/plds$(MOD_VERSION).lib
TARGETS = $(OBJDIR)/poppad.exe
OS_CFLAGS = $(OS_EXE_CFLAGS)

38
nsprpub/tools/Makefile
Просмотреть файл

@ -59,32 +59,32 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
NSPR_VERSION = 3
# Setting the variables LDOPTS and LIBPR. We first initialize
# them to the default values, then adjust them for some platforms.
LDOPTS = -L$(DIST)/lib
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(NSPR_VERSION)
LIBPLC = -lplc$(NSPR_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib
LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib
else
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPLC= $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
endif
endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib
LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib
else
LDOPTS += -Zomf -Zlinker /PM:VIO
endif
@ -95,20 +95,20 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread
LDOPTS += -rpath $(PWD)/$(libdir) -lpthread
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
LIBPR = -lnspr$(NSPR_VERSION)_shr
LIBPLC = -lplc$(NSPR_VERSION)_shr
endif
@ -117,9 +117,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)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(libdir)
endif
endif
@ -143,8 +143,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$(NSPR_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a
LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a
LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
@ -154,7 +154,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)/$(libdir)
endif
ifeq ($(OS_ARCH), SCOOS)
@ -164,7 +164,7 @@ 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)/$(libdir)
endif
#####################################################
@ -197,7 +197,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$(NSPR_VERSION).a
$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(NSPR_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)

38
nsprpub/tools/Makefile.in
Просмотреть файл

@ -64,32 +64,32 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS)
INCLUDES = -I$(DIST)/include
INCLUDES = -I$(includedir)
NSPR_VERSION = 3
# Setting the variables LDOPTS and LIBPR. We first initialize
# them to the default values, then adjust them for some platforms.
LDOPTS = -L$(DIST)/lib
LDOPTS = -L$(libdir)
LIBPR = -lnspr$(NSPR_VERSION)
LIBPLC = -lplc$(NSPR_VERSION)
ifeq ($(OS_ARCH), WINNT)
ifeq ($(OS_TARGET), WIN16)
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib
LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib
else
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
LIBPR = $(DIST)/lib/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPLC= $(DIST)/lib/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPR = $(libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX)
LIBPLC= $(libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX)
endif
endif
ifeq ($(OS_ARCH),OS2)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
LIBPR = $(DIST)/lib/nspr$(NSPR_VERSION).lib
LIBPLC= $(DIST)/lib/plc$(NSPR_VERSION).lib
LIBPR = $(libdir)/nspr$(NSPR_VERSION).lib
LIBPLC= $(libdir)/plc$(NSPR_VERSION).lib
else
LDOPTS += -Zomf -Zlinker /PM:VIO
endif
@ -100,20 +100,20 @@ PWD = $(shell pwd)
endif
ifeq ($(OS_ARCH), IRIX)
LDOPTS += -rpath $(PWD)/$(DIST)/lib
LDOPTS += -rpath $(PWD)/$(libdir)
endif
ifeq ($(OS_ARCH), OSF1)
LDOPTS += -rpath $(PWD)/$(DIST)/lib -lpthread
LDOPTS += -rpath $(PWD)/$(libdir) -lpthread
endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -Wl,+s,+b,$(PWD)/$(DIST)/lib
LDOPTS += -Wl,+s,+b,$(PWD)/$(libdir)
endif
# AIX
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
LDOPTS += -blibpath:$(PWD)/$(libdir):/usr/lib:/lib
LIBPR = -lnspr$(NSPR_VERSION)_shr
LIBPLC = -lplc$(NSPR_VERSION)_shr
endif
@ -122,9 +122,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)/$(libdir)
else
LDOPTS += -R $(PWD)/$(DIST)/lib
LDOPTS += -R $(PWD)/$(libdir)
endif
endif
@ -148,8 +148,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$(NSPR_VERSION).a
LIBPLC = $(DIST)/lib/libplc$(NSPR_VERSION).a
LIBPR = $(libdir)/libnspr$(NSPR_VERSION).a
LIBPLC = $(libdir)/libplc$(NSPR_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -ldl
# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
@ -159,7 +159,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)/$(libdir)
endif
ifeq ($(OS_ARCH), SCOOS)
@ -169,7 +169,7 @@ 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)/$(libdir)
endif
#####################################################
@ -202,7 +202,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$(NSPR_VERSION).a
$(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(libdir)/libnspr$(NSPR_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)