mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-02 20:42:49 +00:00
Fix bug # 184219 - get cvs version of Ldap C-SDK and make of ldap c sdk failed.
Updated NSPR and NSS component revision numbers. Handle for part release numbers on Linux, e.g., 2.4.20-6 Use correct paths for NSPR headers and libraries. Remove obsolete LDAP Makefiles (generated by configure these days). Fix command line tools link error on Linux: link with -lstdc++
This commit is contained in:
mcs%pearlcrescent.com
parent
7341c1f1b5
commit
a6ad0ee4f5
@ -40,13 +40,13 @@ COMPONENTS_DIR = /share/builds/components
|
||||
|
||||
# NSPR - Netscape Portable Runtime
|
||||
NSPR_LIBVERSION = 4
|
||||
NSPR_RELEASE_TAG = v4.1.2
|
||||
NSPR_RELEASE_TAG = v4.2.2
|
||||
NSPR_RELEASE_TREE = $(COMPONENTS_DIR)
|
||||
|
||||
# NSS - Network Security Services
|
||||
NSSVERS = 3
|
||||
NSS_RELEASE_TAG = NSS_3_3_2_RTM
|
||||
#NSS_DYNAMIC_SOFTOKN = 1
|
||||
NSS_RELEASE_TAG = NSS_3_7_7_RTM
|
||||
NSS_DYNAMIC_SOFTOKN = 1
|
||||
NSS_RELEASE_TREE = $(COMPONENTS_DIR)
|
||||
|
||||
# SVRCORE - Client/server utility library
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
Makefile
|
||||
autoconf.mk
|
||||
now
|
||||
nsinstall
|
||||
|
||||
@ -1,141 +0,0 @@
|
||||
#! gmake
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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 the Initial Developer are Copyright (C) 1998-2000
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
MOD_DEPTH = ..
|
||||
|
||||
# Indicate that this directory builds build tools.
|
||||
INTERNAL_TOOLS = 1
|
||||
|
||||
include $(MOD_DEPTH)/config/config.mk
|
||||
|
||||
CSRCS = now.c
|
||||
|
||||
# This version hasn't been ported for us; the one in mozilla/config has
|
||||
ifneq ($(OS_ARCH),OS2)
|
||||
CSRCS += nsinstall.c
|
||||
|
||||
PLSRCS = nfspwd.pl
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
|
||||
PROG_SUFFIX = .exe
|
||||
else
|
||||
PROG_SUFFIX =
|
||||
endif
|
||||
|
||||
# Temporary workaround to disable the generation of
|
||||
# library build time because now.c uses the 'long long'
|
||||
# data type that's not available on some platforms.
|
||||
ifeq (,$(filter-out NEC NEXTSTEP QNX SCOOS UNIXWARE,$(OS_ARCH)))
|
||||
DEFINES += -DOMIT_LIB_BUILD_TIME
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), IRIX)
|
||||
ifeq ($(basename $(OS_RELEASE)),6)
|
||||
ifeq ($(USE_N32),1)
|
||||
XLDOPTS += -n32 -Wl,-woff,85
|
||||
ifeq ($(OS_RELEASE), 6_2)
|
||||
XLDOPTS += -Wl,-woff,85
|
||||
endif
|
||||
else
|
||||
ifeq ($(USE_64),1)
|
||||
XLDOPTS += -64
|
||||
else
|
||||
XLDOPTS += -32
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), HP-UX)
|
||||
ifeq ($(USE_64),1)
|
||||
XLDOPTS += +DA2.0W
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
XCFLAGS = $(OS_EXE_CFLAGS)
|
||||
ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
|
||||
XLDOPTS = -Zlinker /PM:VIO
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),PGCC)
|
||||
XCFLAGS = $(OS_EXE_CFLAGS)
|
||||
XLDOPTS = -Zlinker /PM:VIO
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
OS_CFLAGS = $(OS_EXE_CFLAGS)
|
||||
endif
|
||||
|
||||
include $(MOD_DEPTH)/config/rules.mk
|
||||
|
||||
PROGS = $(OBJDIR)/now$(PROG_SUFFIX)
|
||||
|
||||
ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||
TARGETS = $(PROGS)
|
||||
else
|
||||
PROGS += $(OBJDIR)/nsinstall$(PROG_SUFFIX)
|
||||
TARGETS = $(PROGS) $(PLSRCS:.pl=)
|
||||
endif
|
||||
|
||||
OUTOPTION = -o # end of the line
|
||||
ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
|
||||
OUTOPTION = /Fe
|
||||
endif
|
||||
|
||||
# Redefine MAKE_OBJDIR for just this directory
|
||||
define MAKE_OBJDIR
|
||||
if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
|
||||
endef
|
||||
|
||||
export:: $(TARGETS)
|
||||
|
||||
$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
|
||||
@$(MAKE_OBJDIR)
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(LINK) $(EXEFLAGS) $<
|
||||
else
|
||||
$(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
|
||||
endif
|
||||
|
||||
cleanconfig: FORCE
|
||||
$(RM) -r $(OBJDIR)
|
||||
|
||||
FORCE:
|
||||
1
directory/c-sdk/configure
vendored
1
directory/c-sdk/configure
vendored
@ -2864,6 +2864,7 @@ fi
|
||||
|
||||
if test "$OS_ARCH" = "Linux"; then
|
||||
OS_RELEASE=`echo $OS_RELEASE | sed 's/-.*//'`
|
||||
OS_RELEASE=`echo $OS_RELEASE | awk -F. '{ print $1 "." $2 }'`
|
||||
fi
|
||||
|
||||
#######################################################################
|
||||
|
||||
@ -549,6 +549,7 @@ fi
|
||||
|
||||
if test "$OS_ARCH" = "Linux"; then
|
||||
OS_RELEASE=`echo $OS_RELEASE | sed 's/-.*//'`
|
||||
OS_RELEASE=`echo $OS_RELEASE | awk -F. '{ print $1 "." $2 }'`
|
||||
fi
|
||||
|
||||
#######################################################################
|
||||
|
||||
1
directory/c-sdk/ldap/clients/tools/.cvsignore
Normal file
1
directory/c-sdk/ldap/clients/tools/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
||||
@ -1,504 +0,0 @@
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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 Mozilla Communicator client code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1996-2000
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
#
|
||||
# GNU Makefile for LDAP client tools.
|
||||
#
|
||||
|
||||
LDAP_SRC = ../..
|
||||
MCOM_ROOT = ../../../..
|
||||
|
||||
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
|
||||
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
|
||||
NSPR20=true # probably should be defined somewhere else (not sure where)
|
||||
|
||||
OBJDEST = $(OBJDIR)/clients/tools/obj
|
||||
BINDIR = $(OBJDIR)/clients/bin
|
||||
|
||||
include $(MCOM_ROOT)/c-sdk/nsdefs.mk
|
||||
include $(MCOM_ROOT)/c-sdk/nsconfig.mk
|
||||
|
||||
include $(LDAP_SRC)/nsldap.mk
|
||||
ifndef LDAP_USE_OLD_DB
|
||||
include $(MCOM_ROOT)/c-sdk/ns_usedb.mk
|
||||
endif
|
||||
|
||||
# NLS Library
|
||||
|
||||
NLS_COMP_NAME = libnls
|
||||
NLS_VERS_NUM = 31
|
||||
NLS_COMP_DIR = $(NLS_COMP_NAME)$(NLS_VERS_NUM)
|
||||
NLS_ROOT = $(MCOM_ROOT)/../components/$(NLS_COMP_DIR)
|
||||
|
||||
NLS_LIBPATH = $(NLS_ROOT)/$(NLSOBJDIR)/lib
|
||||
NLS_INCLUDE = $(NLS_ROOT)/$(NLSOBJDIR)/include
|
||||
NLS_LOCALE = $(NLS_ROOT)/$(NLSOBJDIR)/locale$(NLS_VERS_NUM)
|
||||
NLS_CONV = $(NLS_ROOT)/$(NLSOBJDIR)/conv$(NLS_VERS_NUM)
|
||||
NLS_VERSION_FILE = $(NLS_ROOT)/Version
|
||||
|
||||
|
||||
NLS_RELDATE=v3.2
|
||||
|
||||
NLS_VERSION = $(NLS_RELDATE)
|
||||
|
||||
ifeq ($(ARCH), WINNT)
|
||||
ifeq ($(OS_TARGET), WIN95)
|
||||
ifeq ($(DEBUG), full)
|
||||
NLSOBJDIR = WIN954.0_DBG.OBJ
|
||||
else
|
||||
ifeq ($(DEBUG), fulld)
|
||||
NLSOBJDIR = WIN954.0_DBG.OBJD
|
||||
else
|
||||
NLSOBJDIR = WIN954.0_OPT.OBJ
|
||||
endif
|
||||
endif
|
||||
else
|
||||
ifeq ($(DEBUG), full)
|
||||
NLSOBJDIR = WINNT4.0_DBG.OBJ
|
||||
else
|
||||
ifeq ($(DEBUG), fulld)
|
||||
NLSOBJDIR = WINNT4.0_DBG.OBJD
|
||||
else
|
||||
NLSOBJDIR = WINNT4.0_OPT.OBJ
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
NLS_RELEASE = $(COMPONENTS_DIR)/libnls$(NLS_VERS_NUM)/$(NLS_VERSION)/$(NLSOBJDIR)
|
||||
# NLS_LIBNAMES = brk32$(NLS_VERS_NUM) cnv32$(NLS_VERS_NUM) col32$(NLS_VERS_NUM) fmt32$(NLS_VERS_NUM) res32$(NLS_VERS_NUM) uni32$(NLS_VERS_NUM)
|
||||
NLS_LIBNAMES = cnv32$(NLS_VERS_NUM)
|
||||
NLS_CONV_LIBNAMES = jpn32$(NLS_VERS_NUM) cck32$(NLS_VERS_NUM) sb32$(NLS_VERS_NUM)
|
||||
NLS_LIBS = $(addsuffix .lib, $(addprefix ns, $(NLS_LIBNAMES)))
|
||||
NLS_CONV_LIBS = $(addsuffix .lib, $(addprefix ns, $(NLS_CONV_LIBNAMES)))
|
||||
NLSDLL_NAMES = $(addsuffix .dll, $(addprefix ns, $(NLS_LIBNAMES)))
|
||||
NLS_CONVDLL_NAMES = $(addsuffix .dll, $(addprefix ns, $(NLS_CONV_LIBNAMES)))
|
||||
LIBNLS = $(addprefix $(NLS_LIBPATH)/, $(NLS_LIBS))
|
||||
LIBNLS_CONV = $(addprefix $(NLS_LIBPATH)/, $(NLS_CONV_LIBS))
|
||||
NLSOBJNAME = $(NLS_LIBNAMES)
|
||||
else
|
||||
ifeq ($(ARCH), HPUX)
|
||||
ifeq ($(NSOS_RELEASE), B.11.00)
|
||||
NLSOBJDIR = $(NSOBJDIR_NAME)
|
||||
NLS_RELEASE = $(COMPONENTS_DIR)/libnls$(NLS_VERS_NUM)/$(NLS_VERSION)/$(NLSOBJDIR)
|
||||
else
|
||||
NLSOBJDIR = $(NSOBJDIR_NAME)
|
||||
NLS_RELEASE = $(COMPONENTS_DIR)/libnls$(NLS_VERS_NUM)/$(NLS_VERSION)/$(NLSOBJDIR)
|
||||
endif
|
||||
else
|
||||
# Here is a hack to replace _PTH with n32, this must be done before
|
||||
# the _PTH substitustion
|
||||
|
||||
ifeq ($(ARCH),IRIX)
|
||||
ifeq ($(USE_N32),1)
|
||||
NLSOBJDIR = $(NSOBJDIR_NAME2_NOTAG)
|
||||
else
|
||||
NLSOBJDIR = $(NSOBJDIR_NAME_NOTAG)
|
||||
endif
|
||||
else
|
||||
NLSOBJDIR = $(NSOBJDIR_NAME_NOTAG)
|
||||
|
||||
ifeq ($(ARCH), OSF1)
|
||||
NLSOBJDIR = $(NSOBJDIR_NAME)
|
||||
endif
|
||||
endif
|
||||
|
||||
# NLS Does not has PTH version, so here is the hack which treat non PTH
|
||||
# version as PTH version
|
||||
ifeq ($(USE_PTHREADS), 1)
|
||||
NLS_RELEASE = $(COMPONENTS_DIR)/libnls$(NLS_VERS_NUM)/$(NLS_VERSION)/$(NLSOBJDIR)
|
||||
else
|
||||
NLS_RELEASE = $(COMPONENTS_DIR)/libnls$(NLS_VERS_NUM)/$(NLS_VERSION)/$(NLSOBJDIR)
|
||||
endif
|
||||
endif # HPUX
|
||||
NLS_LIBNAMES = cnv$(NLS_VERS_NUM)
|
||||
NLS_CONV_LIBNAMES = jpn$(NLS_VERS_NUM) cck$(NLS_VERS_NUM) sb$(NLS_VERS_NUM)
|
||||
NLS_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF), $(addprefix libns, $(NLS_LIBNAMES)))
|
||||
NLS_CONV_SOLIB_NAMES = $(addsuffix $(DLL_PRESUF), $(addprefix libns, $(NLS_CONV_LIBNAMES)))
|
||||
NLS_LIBS = $(addsuffix .a, $(NLS_SOLIB_NAMES))
|
||||
NLS_CONV_LIBS = $(addsuffix .a, $(NLS_CONV_SOLIB_NAMES))
|
||||
NLS_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(NLS_SOLIB_NAMES))
|
||||
NLS_CONV_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(NLS_CONV_SOLIB_NAMES))
|
||||
NLSOBJNAME = $(NLS_SOLIBS)
|
||||
LIBNLS = $(addprefix $(NLS_LIBPATH)/, $(NLS_SOLIBS))
|
||||
|
||||
ifeq ($(ARCH), OSF1)
|
||||
NLSLINK = -L$(NLS_LIBPATH) $(addprefix -l, $(addsuffix $(DLL_PRESUF), $(addprefix ns, $(NLS_LIBNAMES)))) -lcxx
|
||||
NLSLINK_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_LIBS)) -lcxx
|
||||
NLSLINK_CONV_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_CONV_LIBS))
|
||||
else
|
||||
ifeq ($(ARCH),HPUX)
|
||||
#linking with libC is *BAD* on HPUX11
|
||||
NLSLINK = -L$(NLS_LIBPATH) $(addprefix -l, $(addsuffix $(DLL_PRESUF), $(addprefix ns, $(NLS_LIBNAMES))))
|
||||
NLSLINK_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_LIBS))
|
||||
NLSLINK_CONV_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_CONV_LIBS))
|
||||
else
|
||||
ifeq ($(ARCH),Linux)
|
||||
NLSLINK = -L$(NLS_LIBPATH) $(addprefix -l, $(addsuffix $(DLL_PRESUF), $(addprefix ns, $(NLS_LIBNAMES)))) -lresolv -lpthread
|
||||
NLSLINK_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_LIBS)) -lresolv -lpthread
|
||||
else
|
||||
ifeq ($(ARCH),IRIX)
|
||||
NLSLINK = -L$(NLS_LIBPATH) $(addprefix -l, $(addsuffix $(DLL_PRESUF), $(addprefix ns, $(NLS_LIBNAMES)))) -lpthread
|
||||
NLSLINK_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_LIBS)) -lpthread
|
||||
else
|
||||
NLSLINK = -L$(NLS_LIBPATH) $(addprefix -l, $(addsuffix $(DLL_PRESUF), $(addprefix ns, $(NLS_LIBNAMES)))) -lC
|
||||
NLSLINK_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_LIBS)) -lC
|
||||
endif # Irix
|
||||
endif # Linux
|
||||
NLSLINK_CONV_STATIC = $(addprefix $(NLS_LIBPATH)/, $(NLS_CONV_LIBS))
|
||||
endif # HPUX
|
||||
endif # OSF1
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH), SOLARIS)
|
||||
NLSLINK += -lw
|
||||
endif
|
||||
|
||||
$(LIBNLS): $(NLS_VERSION_FILE) nls_version_check
|
||||
|
||||
$(NLS_VERSION_FILE):
|
||||
mkdir -p $(NLS_ROOT); \
|
||||
cd $(NLS_ROOT); echo "garbage" > Version
|
||||
|
||||
ifneq ($(ARCH), WINNT)
|
||||
ifndef FORCE_FTP
|
||||
nls_version_check:
|
||||
@if [ `cat $(NLS_VERSION_FILE)` != "$(NLS_VERSION)" -o ! -d $(NLS_ROOT)/$(NLSOBJDIR) ]; then \
|
||||
if [ -d $(NLS_RELEASE) ]; then \
|
||||
if [ "$(RELEASE_TREE)" != "" ]; then \
|
||||
(cd $(NLS_ROOT); \
|
||||
\rm -rf $(NLSOBJDIR) $(NLS_VERSION_FILE); \
|
||||
ln -s $(RELEASE_TREE)/libnls31/$(NLSOBJDIR) $(NLSOBJDIR)); \
|
||||
echo "$(NLS_VERSION)" > $(NLS_VERSION_FILE); \
|
||||
else \
|
||||
(cd $(NLS_ROOT); \
|
||||
\rm -rf $(NLSOBJDIR) $(NLS_VERSION_FILE); \
|
||||
ln -s $(NLS_RELEASE) $(NLSOBJDIR)); \
|
||||
echo "$(NLS_VERSION)" > $(NLS_VERSION_FILE); \
|
||||
fi; \
|
||||
else \
|
||||
echo "************************** ERROR *************************"; \
|
||||
echo "LIBNLS client libraries are missing. Make sure your machine"; \
|
||||
echo "has access to $(NLS_RELEASE)"; \
|
||||
echo "**********************************************************"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
fi; \
|
||||
|
||||
else
|
||||
|
||||
nls_version_check:
|
||||
# The following shell script recalculates $(NLS_INCLUDE), $(NLS_LIBPATH) and
|
||||
# $(NLS_VERSION_FILE)
|
||||
sh $(MCOM_ROOT)/c-sdk/compver.sh $(NLS_ROOT) $(NLS_VERSION) \
|
||||
$(NLSOBJDIR) $(MCOM_ROOT) $(MODULE) $(NLS_RELEASE) libnls$(NLS_VERS_NUM) \
|
||||
"' include lib conv$(NLS_VERS_NUM) locale$(NLS_VERS_NUM) '" $(NLS_ROOT)/$(NLSOBJDIR)/locale$(NLS_VERS_NUM)/index.txt
|
||||
endif
|
||||
else
|
||||
|
||||
nls_version_check:
|
||||
# The following shell script recalculates $(NLS_INCLUDE), $(NLS_LIBPATH) and
|
||||
# $(NLS_VERSION_FILE)
|
||||
sh $(MCOM_ROOT)/c-sdk/compver.sh $(NLS_ROOT) $(NLS_VERSION) \
|
||||
$(NLSOBJDIR) $(MCOM_ROOT) ldapsdk $(NLS_RELEASE) \
|
||||
libnls$(NLS_VERS_NUM) \
|
||||
"' include lib conv$(NLS_VERS_NUM) locale$(NLS_VERS_NUM) '" \
|
||||
$(NLS_ROOT)/$(NLSOBJDIR)/locale$(NLS_VERS_NUM)/index.txt
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH), HPUX)
|
||||
ifeq ($(NSOS_RELEASE), B.11.00)
|
||||
EXTRA_LIBS += -lrt
|
||||
CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L
|
||||
LINK_EXE_NOLIBSOBJS_NOCXX = $(CXX) -Wl,-E $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@
|
||||
LINK_EXE_NOCXX = $(CXX) -Wl,-E $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(OBJS) $(EXTRA_LIBS)
|
||||
endif
|
||||
ifeq ($(NSOS_RELEASE), B.11.00_64)
|
||||
EXTRA_LIBS += -lrt
|
||||
CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L +DA2.0W +DS2.0
|
||||
LINK_EXE_NOLIBSOBJS_NOCXX = $(CXX) -Wl,-E $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@
|
||||
LINK_EXE_NOCXX = $(CXX) -Wl,-E $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG) -o $@ $(OBJS) $(EXTRA_LIBS)
|
||||
endif
|
||||
ifeq ($(NSOS_RELEASE), B.10.10)
|
||||
CC= CC +a1
|
||||
# CXX=CC -D__STDC_EXT__
|
||||
# $(subst "+e", "",$(CFLAGS))
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),Linux)
|
||||
CXX = egcs
|
||||
LINK_EXE = $(CXX) $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) \
|
||||
-o $@ $(OBJS) $(EXTRA_LIBS)
|
||||
LINK_EXE_NOLIBSOBJS = $(CXX) $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) -o $@
|
||||
|
||||
else
|
||||
ifeq ($(ARCH), OSF1)
|
||||
ifdef USE_LD_RUN_PATH
|
||||
#does RPATH differently. instead we export RPATHFLAG as LD_RUN_PATH
|
||||
#see ns/c-sdk/ldap/clients/tools/Makefile for an example
|
||||
export LD_RUN_PATH=$(RPATHFLAG)
|
||||
LINK_EXE = $(CXX) $(ALDFLAGS) $(LDFLAGS) \
|
||||
-o $@ $(OBJS) $(EXTRA_LIBS)
|
||||
LINK_EXE_NOLIBSOBJS = $(CXX) $(ALDFLAGS) $(LDFLAGS) -o $@
|
||||
else # USE_LD_RUN_PATH
|
||||
LINK_EXE = $(CXX) $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) \
|
||||
-o $@ $(OBJS) $(EXTRA_LIBS)
|
||||
LINK_EXE_NOLIBSOBJS = $(CXX) $(ALDFLAGS) $(LDFLAGS) \
|
||||
$(RPATHFLAG_PREFIX)$(RPATHFLAG)$(RPATHFLAG_EXTRAS) -o $@
|
||||
endif # USE_LD_RUN_PATH
|
||||
endif
|
||||
endif
|
||||
MCOM_INCLUDE += -I$(NLS_INCLUDE)
|
||||
|
||||
INCLUDES += $(SSLINCLUDE) $(NO_LIBLCACHE)
|
||||
DEFS += $(SSL)
|
||||
|
||||
ALDFLAGS += $(SSLLIBFLAG)
|
||||
|
||||
ifeq ($(ARCH), WINNT)
|
||||
SUBSYSTEM=console
|
||||
endif
|
||||
|
||||
ifneq ($(ARCH), WINNT)
|
||||
# Run-time search path for shared libraries: in admin server 3.x installations,
|
||||
# the ldap tools get installed under NSHOME/userdb/ldap/tools and the LDAP SDK
|
||||
# libraries (libldap and liblcache) get installed under NSHOME/lib, so the
|
||||
# correct library search path is ../../../lib. We also want to search
|
||||
# NSHOME/bin/slapd, where more recent versions of the SDK so's may be.
|
||||
RPATHFLAG=..:../lib:../../lib:../../../lib:../../../../lib
|
||||
ifdef USE_LD_RUN_PATH
|
||||
LD_RUN_PATH=$(RPATHFLAG)
|
||||
export LD_RUN_PATH
|
||||
endif
|
||||
endif
|
||||
|
||||
# svrcore is used by ntpinobj, and pinarg handling
|
||||
LIBSVRCORE_DEP= $(NSCP_DISTDIR)/lib/svrcore.$(LIB_SUFFIX)
|
||||
ifeq ($(ARCH), WINNT)
|
||||
LIBSVRCORE= $(NSCP_DISTDIR)/lib/svrcore.$(LIB_SUFFIX)
|
||||
else
|
||||
LIBSVRCORE = -lsvrcore
|
||||
endif
|
||||
|
||||
ifeq ($(INCLUDE_SSL),1)
|
||||
# libsec and friends are already in libldap, so don't link with them here
|
||||
LDTOOLS_LIBS_DEP = $(LDAP_SDK_LIBLDAP_DLL_DEP) $(EXTRA_LIBS_DEP)
|
||||
LDTOOLS_LIBS = $(LDAP_SDK_LIBLDAP_DLL)
|
||||
ifneq ($(LDAP_NO_LIBLCACHE),1)
|
||||
LDTOOLS_LIBS_DEP += $(LDAP_LIBLDIF_DEP)
|
||||
LDTOOLS_LIBS += $(LDAP_LIBLDIF) $(LDAP_SDK_LIBLCACHE_DLL)
|
||||
else
|
||||
LDTOOLS_LIBS_DEP += $(LDAP_LIBLDIF_DEP)
|
||||
LDTOOLS_LIBS += $(LDAP_LIBLDIF)
|
||||
endif
|
||||
|
||||
LDTOOLS_LIBS += $(EXTRA_LIBS) $(EXTRA_MALLOC_LIBS) $(LDAP_SDK_LIBLDAP_DLL) $(LIBSVRCORE)
|
||||
|
||||
# XXXceb The linker on NT is auto optimizing. We still need to have libsec around for svrcore
|
||||
# Do Not Mess with the link order. This was not straightforward, and "optimizing" the text
|
||||
# will break the builds.
|
||||
ifeq ($(ARCH), WINNT)
|
||||
LDTOOLS_LIBS += $(LIBSEC)
|
||||
endif
|
||||
ifeq ($(ARCH), SOLARIS)
|
||||
LDTOOLS_LIBS += $(LIBSEC) $(LIBDB)
|
||||
endif
|
||||
ifeq ($(ARCH), HPUX)
|
||||
LDTOOLS_LIBS += $(LIBSEC)
|
||||
endif
|
||||
ifeq ($(ARCH), IRIX)
|
||||
LDTOOLS_LIBS += $(LIBSEC) $(LIBDB)
|
||||
endif
|
||||
ifeq ($(ARCH), AIX)
|
||||
LDTOOLS_LIBS += $(LIBSEC) $(LIBDB)
|
||||
endif
|
||||
ifeq ($(ARCH), WINNT)
|
||||
LDTOOLS_LIBS += $(LIBNSPR)
|
||||
else
|
||||
LDTOOLS_LIBS += $(DYNAMICNSPR)
|
||||
endif
|
||||
else
|
||||
# SSL is not included in the LDAP shared library...
|
||||
# need to link with libsec and friends explicitly
|
||||
LDTOOLS_LIBS_DEP = $(LDAP_SDK_LIBS_DEP) $(LDAP_LIBLDIF_DEP) \
|
||||
$(EXTRA_LIBS_DEP)
|
||||
LDTOOLS_LIBS_DEP += $(LDAP_LIBLDIF_DEP)
|
||||
ifeq ($(ARCH), OSF1)
|
||||
LDTOOLS_LIBS = $(LDAP_SDK_LIBSSLDAP_LIB) $(LDAP_SDK_LIBLDAP_DLL) $(LDAP_SDK_LIBPRLDAP_DLL)
|
||||
else
|
||||
LDTOOLS_LIBS = $(LDAP_SDK_LIBSSLDAP_LIB) $(LDAP_SDK_LIBPRLDAP_DLL) $(LDAP_SDK_LIBLDAP_DLL)
|
||||
endif
|
||||
ifneq ($(LDAP_NO_LIBLCACHE),1)
|
||||
LDTOOLS_LIBS += $(LDAP_SDK_LIBLCACHE_DLL)
|
||||
endif
|
||||
LDTOOLS_LIBS += $(LIBSVRCORE) $(LIBSEC) $(LIBDB) $(EXTRA_LIBS)\
|
||||
$(EXTRA_MALLOC_LIBS) $(LDAP_LIBLDIF)
|
||||
|
||||
ifneq ($(LDAP_NO_LIBLCACHE),1)
|
||||
ifndef LDAP_USE_OLD_DB
|
||||
LDTOOLS_LIBS_DEP+=$(DB_LIB_DEP)
|
||||
LDTOOLS_LIBS+=$(DB_LIB)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(LDAP_NO_LIBLCACHE),1)
|
||||
CFLAGS+=-DNO_LIBLCACHE
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH), WINNT)
|
||||
LDTOOLS_LIBS += $(LIBNSPR)
|
||||
else
|
||||
LDTOOLS_LIBS += $(DYNAMICNSPR)
|
||||
endif
|
||||
|
||||
# INCLUDE_SSL
|
||||
endif
|
||||
|
||||
LDTOOLS_LIBS_DEP += $(LIBNLS)
|
||||
ifeq ($(ARCH), WINNT)
|
||||
LDTOOLS_LIBS += $(LIBNLS) $(LIBNLS_CONV)
|
||||
else
|
||||
LDTOOLS_LIBS += $(NLSLINK_STATIC) $(NLSLINK_CONV_STATIC)
|
||||
endif
|
||||
|
||||
|
||||
|
||||
|
||||
#LDTOOLS_LIBS += $(LIBSVRCORE)
|
||||
|
||||
ifeq ($(ARCH), AIX)
|
||||
LDTOOLS_LIBS += $(EXE_EXTRA_LIBS)
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH), WINNT)
|
||||
ALDFLAGS += -FORCE:MULTIPLE /NODEFAULTLIB:MSVCRTD
|
||||
endif
|
||||
|
||||
#ifeq ($(ARCH), HPUX)
|
||||
#CC=CC +a1
|
||||
#LINK_EXE = $(LINK_EXE_NOCXX)
|
||||
#endif
|
||||
|
||||
ifeq ($(ARCH),IRIX)
|
||||
ifeq ($(USE_N32),1)
|
||||
CXX=CC
|
||||
LDFLAGS += -n32 -mips3
|
||||
CC=cc
|
||||
LINK_EXE = $(CXX) $(ALDFLAGS) $(LDFLAGS) \
|
||||
-o $@ $(OBJS) $(EXTRA_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH), SOLARIS)
|
||||
ifeq ($(USE_64), 1)
|
||||
LINK_EXE += -xarch=v9 -L/usr/lib/sparcv9 -lCrun
|
||||
endif
|
||||
endif
|
||||
|
||||
LINK_EXE += -$(LIBPATH)../$(MCOM_ROOT)/dist/$(NC_BUILD_FLAVOR)/lib
|
||||
|
||||
LDAPDELETE_OBJ = $(addprefix $(OBJDEST)/, ldapdelete.o)
|
||||
LDAPMODIFY_OBJ = $(addprefix $(OBJDEST)/, ldapmodify.o fileurl.o)
|
||||
LDAPMODRDN_OBJ = $(addprefix $(OBJDEST)/, ldapmodrdn.o)
|
||||
LDAPSEARCH_OBJ = $(addprefix $(OBJDEST)/, ldapsearch.o fileurl.o)
|
||||
LDAPCMP_OBJ = $(addprefix $(OBJDEST)/, ldapcmp.o)
|
||||
LDAPTOOLCOMMON_OBJ = $(addprefix $(OBJDEST)/, common.o convutf8.o argpin.o ntuserpin.o)
|
||||
|
||||
CLIENT_OBJS = $(LDAPDELETE_OBJ) $(LDAPMODIFY_OBJ) $(LDAPMODRDN_OBJ) \
|
||||
$(LDAPSEARCH_OBJ) $(LDAPCMP_OBJ) $(LDAPTOOLCOMMON_OBJ)
|
||||
|
||||
LDAPDELETE = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapdelete))
|
||||
LDAPMODIFY = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapmodify))
|
||||
LDAPMODRDN = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapmodrdn))
|
||||
LDAPSEARCH = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapsearch))
|
||||
LDAPADD = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapadd))
|
||||
LDAPCMP = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapcmp))
|
||||
|
||||
BINS= $(LDAPDELETE) $(LDAPMODIFY) $(LDAPSEARCH) $(LDAPCMP)
|
||||
|
||||
all: $(OBJDEST) $(BINDIR) $(BINS)
|
||||
cmp: $(LDAPCMP)
|
||||
|
||||
$(LDAPTOOLCOMMON_OBJ): $(LIBNLS)
|
||||
|
||||
$(LDAPDELETE): $(LDAPDELETE_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS_DEP)
|
||||
$(LINK_EXE) $(LDAPDELETE_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS)
|
||||
|
||||
$(LDAPMODIFY): $(LDAPMODIFY_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS_DEP)
|
||||
$(LINK_EXE) $(LDAPMODIFY_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS)
|
||||
|
||||
$(LDAPMODRDN): $(LDAPMODRDN_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS_DEP)
|
||||
$(LINK_EXE) $(LDAPMODRDN_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS)
|
||||
|
||||
$(LDAPSEARCH): $(LDAPSEARCH_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS_DEP)
|
||||
$(LINK_EXE) $(LDAPSEARCH_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS)
|
||||
|
||||
$(LDAPADD): $(LDAPMODIFY) $(LDTOOLS_LIBS_DEP)
|
||||
$(RM) $(LDAPADD)
|
||||
$(HARDLN) $(LDAPMODIFY) $(LDAPADD)
|
||||
|
||||
$(LDAPCMP): $(LDAPCMP_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS_DEP)
|
||||
$(LINK_EXE) $(LDAPCMP_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDTOOLS_LIBS)
|
||||
|
||||
clientSDK: all
|
||||
|
||||
$(OBJDEST):
|
||||
$(MKDIR) $(OBJDEST)
|
||||
|
||||
$(BINDIR):
|
||||
$(MKDIR) $(BINDIR)
|
||||
|
||||
clean:
|
||||
$(RM) $(CLIENT_OBJS)
|
||||
$(RM) $(BINS)
|
||||
|
||||
#
|
||||
# Simple, local dependencies
|
||||
#
|
||||
LDAPTOOL_COMMON_DEPS = ldaptool.h Makefile
|
||||
$(LDAPTOOLCOMMON_OBJ): $(LDAPTOOL_COMMON_DEPS)
|
||||
$(LDAPDELETE_OBJ): $(LDAPTOOL_COMMON_DEPS)
|
||||
$(LDAPMODIFY_OBJ): $(LDAPTOOL_COMMON_DEPS) fileurl.h
|
||||
$(LDAPMODRDN_OBJ): $(LDAPTOOL_COMMON_DEPS)
|
||||
$(LDAPSEARCH_OBJ): $(LDAPTOOL_COMMON_DEPS) fileurl.h
|
||||
$(LDAPCMP_OBJ): $(LDAPTOOL_COMMON_DEPS)
|
||||
@ -44,11 +44,13 @@ include $(MOD_DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/build.mk
|
||||
|
||||
INSTALLDIR = $(DIST)/$(OBJDIR_NAME)/bin
|
||||
DIST_LIB_PATH = $(DIST)/$(RELEASE_OBJDIR_NAME)/lib
|
||||
HEADERDIR = $(MOD_DEPTH)/dist/$(OBJDIR_NAME)
|
||||
|
||||
INCLUDES += -I$(HEADERDIR)/include \
|
||||
-I$(DIST)/include/obsolete \
|
||||
-I$(DIST)/include/nspr \
|
||||
-I$(DIST)/$(RELEASE_OBJDIR_NAME)/include \
|
||||
-I$(DIST)/include \
|
||||
-I$(DIST)/public/security \
|
||||
-I$(DIST)/public/nss \
|
||||
@ -127,6 +129,9 @@ endif
|
||||
CLIENT_OBJS = $(LDAPDELETE_OBJ) $(LDAPMODIFY_OBJ) \
|
||||
$(LDAPSEARCH_OBJ) $(LDAPCOMPARE_OBJ) $(LDAPCMP_OBJ) $(LDAPTOOLCOMMON_OBJ)
|
||||
|
||||
# For 'clean' target:
|
||||
TARGETS=$(BINDIR) $(LIBDIR) $(CLIENT_OBJS)
|
||||
|
||||
LDAPDELETE = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapdelete))
|
||||
LDAPMODIFY = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapmodify))
|
||||
LDAPSEARCH = $(addsuffix $(EXE_SUFFIX), $(addprefix $(BINDIR)/, ldapsearch))
|
||||
@ -150,7 +155,7 @@ endif
|
||||
ifeq ($(OS_ARCH), SunOS)
|
||||
EXTRA_LIBS = -L$(DIST)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME) \
|
||||
-l$(LDIF_LIBNAME) -l$(SSLDAP_LIBNAME) -l$(PRLDAP_LIBNAME) \
|
||||
-L$(DIST)/lib $(SVRCORE_LINK) \
|
||||
-L$(DIST)/lib -L$(DIST_LIB_PATH) $(SVRCORE_LINK) \
|
||||
$(LDAPTOOLS_NSS_LINK) \
|
||||
-lthread -lposix4 -lsocket -lnls \
|
||||
-ldl -lresolv -lgen
|
||||
@ -183,7 +188,7 @@ endif
|
||||
ifeq ($(OS_ARCH), OSF1)
|
||||
EXTRA_LIBS = -L$(DIST)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME) \
|
||||
-l$(LDIF_LIBNAME) -l$(SSLDAP_LIBNAME) -l$(PRLDAP_LIBNAME) \
|
||||
-L$(DIST)/lib $(SVRCORE_LINK) \
|
||||
-L$(DIST)/lib -L$(DIST_LIB_PATH) $(SVRCORE_LINK) \
|
||||
$(LDAPTOOLS_NSS_LINK) \
|
||||
-lcxx -lpthread -lrt -lmach -lexc
|
||||
EXTRA_LIBS += -L$(DIST)/lib $(DYNAMICNSPR)
|
||||
@ -192,26 +197,29 @@ endif
|
||||
ifeq ($(OS_ARCH), Linux)
|
||||
EXTRA_LIBS = -L$(DIST)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME) \
|
||||
-l$(LDIF_LIBNAME) -l$(SSLDAP_LIBNAME) -l$(PRLDAP_LIBNAME) \
|
||||
-L$(DIST)/lib $(SVRCORE_LINK) \
|
||||
-L$(DIST)/lib -L$(DIST_LIB_PATH) $(SVRCORE_LINK) \
|
||||
$(LDAPTOOLS_NSS_LINK) \
|
||||
-l$(LBER_LIBNAME) \
|
||||
-ldl -lresolv -lpthread
|
||||
EXTRA_LIBS += -L$(DIST)/lib $(DYNAMICNSPR)
|
||||
# On Linux, we must link with stdc++ because one of
|
||||
# our object files (convutf8.o) was compiled as a C++ object.
|
||||
EXTRA_LIBS += -lstdc++
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), HP-UX)
|
||||
EXTRA_LIBS = -ldld -lm -lpthread -lrt \
|
||||
-L$(DIST)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME) \
|
||||
-l$(LDIF_LIBNAME) -l$(SSLDAP_LIBNAME) -l$(PRLDAP_LIBNAME) \
|
||||
-L$(DIST)/lib $(SVRCORE_LINK) -l$(LBER_LIBNAME) \
|
||||
$(LDAPTOOLS_NSS_LINK)
|
||||
-L$(DIST)/lib -L$(DIST_LIB_PATH) $(SVRCORE_LINK) \
|
||||
-l$(LBER_LIBNAME) $(LDAPTOOLS_NSS_LINK)
|
||||
EXTRA_LIBS += -L$(DIST)/lib $(DYNAMICNSPR)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), AIX)
|
||||
EXTRA_LIBS = -L$(DIST)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME) \
|
||||
-l$(LDIF_LIBNAME) -l$(SSLDAP_LIBNAME) -l$(PRLDAP_LIBNAME) \
|
||||
-L$(DIST)/lib $(SVRCORE_LINK) \
|
||||
-L$(DIST)/lib -L$(DIST_LIB_PATH) $(SVRCORE_LINK) \
|
||||
$(LDAPTOOLS_NSS_LINK) \
|
||||
-ldl -brtl -lpthreads -lc_r -lm
|
||||
EXTRA_LIBS += -L$(DIST)/lib $(DYNAMICNSPR)
|
||||
@ -254,7 +262,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
###########################################################################
|
||||
|
||||
all:: $(BINS) $(OBJDEST) linklibnls libdir $(BINS)
|
||||
all:: $(OBJDEST) linklibnls libdir $(BINS)
|
||||
|
||||
libdir: linklibnls
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
@ -268,6 +276,7 @@ else
|
||||
endif
|
||||
ifeq ($(COMPS_FROM_OBJDIR), 1)
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
# Windows, COMPS_FROM_OBJDIR
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/$(PLC_BASENAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/$(PLDS_BASENAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/$(NSPR_BASENAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
@ -277,6 +286,7 @@ ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/$(SOFTOKN_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
endif
|
||||
else
|
||||
# Non-Windows, COMPS_FROM_OBJDIR
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/lib$(PLC_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/lib$(PLDS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/lib$(NSPR_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
@ -291,6 +301,7 @@ ifeq ($(COPYFREEBL), 1)
|
||||
$(NSINSTALL) $(DIST)/$(OBJDIR_NAME)/lib/lib$(PURE32_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
endif
|
||||
else
|
||||
# Windows, !COMPS_FROM_OBJDIR
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
$(NSINSTALL) $(DIST)/lib/$(PLC_BASENAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/lib/$(PLDS_BASENAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
@ -301,18 +312,19 @@ ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
|
||||
$(NSINSTALL) $(DIST)/lib/$(SOFTOKN_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
endif
|
||||
else
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(PLC_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(PLDS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(NSPR_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(SSL_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(NSS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
# Non-Windows, !COMPS_FROM_OBJDIR
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(PLC_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(PLDS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(NSPR_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(SSL_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(NSS_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
ifeq ($(NSS_DYNAMIC_SOFTOKN),1)
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(SOFTOKN_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(SOFTOKN_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(COPYFREEBL), 1)
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(HYBRID_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST)/lib/lib$(PURE32_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(HYBRID_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
$(NSINSTALL) $(DIST_LIB_PATH)/lib$(PURE32_LIBNAME).$(DLL_SUFFIX) $(LIBDIR)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -372,7 +384,7 @@ $(LDAPCMP): $(LDAPCMP_OBJ) $(LDAPTOOLCOMMON_OBJ) \
|
||||
$(LDAPTOOLCPPCOMMON_OBJ) $(LDTOOLS_LIBS_DEP)
|
||||
$(LINK_EXE) $(LDAPCMP_OBJ) $(LDAPTOOLCOMMON_OBJ) $(LDAPTOOLCPPCOMMON_OBJ) $(LDTOOLS_LIBS)
|
||||
|
||||
$(OBJDEST):
|
||||
$(OBJDEST): FORCE
|
||||
$(NSINSTALL) -D $(OBJDEST)
|
||||
$(NSINSTALL) -D $(BINDIR)
|
||||
$(NSINSTALL) -D $(LIBDIR)
|
||||
|
||||
@ -65,7 +65,7 @@ static void *ldaptool_debug_realloc( void *ptr, size_t size );
|
||||
static void ldaptool_debug_free( void *ptr );
|
||||
#endif /* LDAPTOOL_DEBUG_MEMORY */
|
||||
|
||||
#if defined(NET_SSL)
|
||||
#if defined(NET_SSL) && defined(LDAP_TOOL_PKCS11)
|
||||
static void ldaptool_setcallbacks( struct ldapssl_pkcs_fns *pfns);
|
||||
static char * buildTokenCertName( const char *tokenName, const char *certName);
|
||||
#ifdef FORTEZZA
|
||||
|
||||
@ -92,7 +92,9 @@ all export:: $(INCLUDEDIR) $(GENHEADERS)
|
||||
$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
|
||||
$(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR)
|
||||
rm -rf $(NSPRINCDIR)/*
|
||||
cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR)
|
||||
if [ -d $(DIST)/$(OBJDIR_NAME)/include/nspr ]; then \
|
||||
cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR); \
|
||||
fi
|
||||
|
||||
$(INCLUDEDIR): FORCE
|
||||
$(NSINSTALL) -D $(INCLUDEDIR)
|
||||
|
||||
1
directory/c-sdk/ldap/libraries/libiutil/.cvsignore
Normal file
1
directory/c-sdk/ldap/libraries/libiutil/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
||||
@ -1,83 +0,0 @@
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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 Mozilla Communicator client code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998-1999
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
|
||||
#
|
||||
# GNU Makefile for libiutil
|
||||
#
|
||||
|
||||
LDAP_SRC = ../..
|
||||
MCOM_ROOT = ../../../..
|
||||
|
||||
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
|
||||
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
|
||||
NSPR20=true # probably should be defined somewhere else (not sure where)
|
||||
|
||||
OBJDEST = $(OBJDIR)/lib/libiutil
|
||||
LIBDIR = $(LDAP_LIBDIR)
|
||||
|
||||
include $(MCOM_ROOT)/netsite/nsdefs.mk
|
||||
include $(MCOM_ROOT)/netsite/nsconfig.mk
|
||||
include $(LDAP_SRC)/nsldap.mk
|
||||
|
||||
CFLAGS += $(SLCFLAGS)
|
||||
|
||||
LIBIUTIL_OBJS= iutil-lock.o
|
||||
|
||||
OBJS = $(addprefix $(OBJDEST)/, $(LIBIUTIL_OBJS))
|
||||
|
||||
LIBIUTIL= $(addprefix $(LIBDIR)/, libiutil.$(LIB_SUFFIX))
|
||||
|
||||
clientSDK: all
|
||||
|
||||
all: $(OBJDEST) $(LIBDIR) $(LIBIUTIL)
|
||||
|
||||
$(LIBDIR):
|
||||
$(MKDIR) $(LIBDIR)
|
||||
|
||||
$(LIBIUTIL): $(OBJS)
|
||||
$(LINK_LIB)
|
||||
|
||||
veryclean: clean
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS)
|
||||
$(RM) $(LIBIUTIL)
|
||||
|
||||
$(OBJDEST):
|
||||
$(MKDIR) $(OBJDEST)
|
||||
|
||||
1
directory/c-sdk/ldap/libraries/libldif/.cvsignore
Normal file
1
directory/c-sdk/ldap/libraries/libldif/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
||||
@ -1,82 +0,0 @@
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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 Mozilla Communicator client code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998-1999
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
#
|
||||
# GNU Makefile for libldif
|
||||
#
|
||||
|
||||
LDAP_SRC = ../..
|
||||
MCOM_ROOT = ../../../..
|
||||
|
||||
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
|
||||
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
|
||||
NSPR20=true # probably should be defined somewhere else (not sure where)
|
||||
|
||||
OBJDEST = $(OBJDIR)/lib/libldif
|
||||
LIBDIR = $(LDAP_LIBDIR)
|
||||
|
||||
include $(MCOM_ROOT)/c-sdk/nsdefs.mk
|
||||
include $(MCOM_ROOT)/c-sdk/nsconfig.mk
|
||||
include $(LDAP_SRC)/nsldap.mk
|
||||
|
||||
CFLAGS += $(SLCFLAGS)
|
||||
|
||||
LIBLDIF_OBJS= line64.o
|
||||
|
||||
OBJS = $(addprefix $(OBJDEST)/, $(LIBLDIF_OBJS))
|
||||
|
||||
LIBLDIF= $(addprefix $(LIBDIR)/, libldif.$(LIB_SUFFIX))
|
||||
|
||||
clientSDK: all
|
||||
|
||||
all: $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLDIF)
|
||||
|
||||
$(LIBDIR):
|
||||
$(MKDIR) $(LIBDIR)
|
||||
|
||||
$(LIBLDIF): $(OBJS)
|
||||
$(LINK_LIB)
|
||||
|
||||
veryclean: clean
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS)
|
||||
$(RM) $(LIBLDIF)
|
||||
|
||||
$(OBJDEST):
|
||||
$(MKDIR) $(OBJDEST)
|
||||
|
||||
@ -74,7 +74,8 @@ GARBAGE += $(LIBPRLDAP) $(DLLPRLDAP)
|
||||
|
||||
LOCAL_INCLUDES = -I$(PUBLIC)/nspr
|
||||
INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
|
||||
-I$(DIST)/include/nspr
|
||||
-I$(DIST)/include/nspr \
|
||||
-I$(DIST)/$(RELEASE_OBJDIR_NAME)/include
|
||||
DEFINES += $(DEFS)
|
||||
|
||||
PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS
|
||||
|
||||
1
directory/c-sdk/ldap/libraries/libssldap/.cvsignore
Normal file
1
directory/c-sdk/ldap/libraries/libssldap/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
||||
@ -1,82 +0,0 @@
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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 Mozilla Communicator client code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998-1999
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
#
|
||||
# GNU Makefile for libssldap
|
||||
#
|
||||
|
||||
LDAP_SRC = ../..
|
||||
MCOM_ROOT = ../../../..
|
||||
|
||||
NOSTDCLEAN=true # don't let nsconfig.mk define target clean
|
||||
NOSTDSTRIP=true # don't let nsconfig.mk define target strip
|
||||
NSPR20=true # probably should be defined somewhere else (not sure where)
|
||||
|
||||
OBJDEST = $(OBJDIR)/lib/libssldap
|
||||
LIBDIR = $(LDAP_LIBDIR)
|
||||
|
||||
include $(MCOM_ROOT)/c-sdk/nsdefs.mk
|
||||
include $(MCOM_ROOT)/c-sdk/nsconfig.mk
|
||||
include $(LDAP_SRC)/nsldap.mk
|
||||
|
||||
CFLAGS += $(SLCFLAGS)
|
||||
|
||||
LIBSSLDAP_OBJS= clientinit.o ldapsinit.o errormap.o
|
||||
|
||||
OBJS = $(addprefix $(OBJDEST)/, $(LIBSSLDAP_OBJS))
|
||||
|
||||
LIBSSLDAP= $(addprefix $(LIBDIR)/, $(LIBSSLDAP_LIB).$(LIB_SUFFIX))
|
||||
|
||||
clientSDK: all
|
||||
|
||||
all: $(OBJDEST) $(LIBDIR) $(LIBSSLDAP)
|
||||
|
||||
$(LIBDIR):
|
||||
$(MKDIR) $(LIBDIR)
|
||||
|
||||
$(LIBSSLDAP): $(OBJS)
|
||||
$(LINK_LIB)
|
||||
|
||||
veryclean: clean
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS)
|
||||
$(RM) $(LIBSSLDAP)
|
||||
|
||||
$(OBJDEST):
|
||||
$(MKDIR) $(OBJDEST)
|
||||
|
||||
@ -71,7 +71,9 @@ INCLUDES += -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
|
||||
-I$(DIST)/include \
|
||||
-I$(DIST)/public/security \
|
||||
-I$(DIST)/public/nss \
|
||||
-I$(DIST)/include/nspr
|
||||
-I$(DIST)/include/nspr \
|
||||
-I$(DIST)/$(RELEASE_OBJDIR_NAME)/include
|
||||
|
||||
DEFINES += $(DEFS)
|
||||
|
||||
PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user