mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-02-23 14:09:39 +08:00
Moved ldbm into back-ldbm. No more libldbm.
This commit is contained in:
Howard Chu
parent
20c8ea8a44
commit
3152932e96
@ -152,10 +152,6 @@ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
|
||||
LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la
|
||||
LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
|
||||
|
||||
LDAP_LIBLDBM_A_no =
|
||||
LDAP_LIBLDBM_A_yes = $(LDAP_LIBDIR)/libldbm/libldbm.a
|
||||
|
||||
LDAP_LIBLDBM_A = $(LDAP_LIBLDBM_A_@BUILD_LDBM@)
|
||||
LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a
|
||||
LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a
|
||||
LDAP_LIBLUTIL_A = $(LDAP_LIBDIR)/liblutil/liblutil.a
|
||||
@ -164,8 +160,7 @@ LDAP_L = $(LDAP_LIBLUTIL_A) \
|
||||
$(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
|
||||
SLURPD_L = $(LDAP_LIBLUTIL_A) \
|
||||
$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||||
SLAPD_L = $(LDAP_LIBLDBM_A) \
|
||||
$(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
|
||||
SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
|
||||
$(SLURPD_L)
|
||||
|
||||
WRAP_LIBS = @WRAP_LIBS@
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# Makefile for -lldbm
|
||||
# $OpenLDAP$
|
||||
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||
##
|
||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||
## All rights reserved.
|
||||
##
|
||||
## Redistribution and use in source and binary forms, with or without
|
||||
## modification, are permitted only as authorized by the OpenLDAP
|
||||
## Public License.
|
||||
##
|
||||
## A copy of this license is available in the file LICENSE in the
|
||||
## top-level directory of the distribution or, alternatively, at
|
||||
## <http://www.OpenLDAP.org/license.html>.
|
||||
|
||||
LIBRARY = libldbm.a
|
||||
SRCS = ldbm.c
|
||||
OBJS = ldbm.o
|
||||
|
||||
LDAP_INCDIR= ../../include
|
||||
LDAP_LIBDIR= ../../libraries
|
||||
|
||||
XLIBS = $(LIBRARY)
|
||||
XXLIBS = $(LDBM_LIBS)
|
||||
|
||||
@ -1,137 +0,0 @@
|
||||
# Microsoft Developer Studio Project File - Name="libldbm" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Static Library" 0x0104
|
||||
|
||||
CFG=libldbm - Win32 Single Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "libldbm.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "libldbm.mak" CFG="libldbm - Win32 Single Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "libldbm - Win32 Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "libldbm - Win32 Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "libldbm - Win32 Single Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "libldbm - Win32 Single Release" (based on\
|
||||
"Win32 (x86) Static Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
|
||||
!IF "$(CFG)" == "libldbm - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "..\..\Release"
|
||||
# PROP Intermediate_Dir "..\..\Release\libldbm"
|
||||
# PROP Target_Dir ""
|
||||
RSC=rc.exe
|
||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\..\Release\oldbm32.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "libldbm - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\Debug"
|
||||
# PROP Intermediate_Dir "..\..\Debug\libldbm"
|
||||
# PROP Target_Dir ""
|
||||
RSC=rc.exe
|
||||
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo /out:"..\..\Debug\oldbm32.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "libldbm - Win32 Single Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "libldbm_"
|
||||
# PROP BASE Intermediate_Dir "libldbm_"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\SDebug"
|
||||
# PROP Intermediate_Dir "..\..\SDebug\libldbm"
|
||||
# PROP Target_Dir ""
|
||||
RSC=rc.exe
|
||||
# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\Debug\oldbm32.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\SDebug\oldbm32.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "libldbm - Win32 Single Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "libldbm0"
|
||||
# PROP BASE Intermediate_Dir "libldbm0"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "..\..\SRelease"
|
||||
# PROP Intermediate_Dir "..\..\SRelease\libldbm"
|
||||
# PROP Target_Dir ""
|
||||
RSC=rc.exe
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\Release\oldbm32.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\SRelease\oldbm32.lib"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "libldbm - Win32 Release"
|
||||
# Name "libldbm - Win32 Debug"
|
||||
# Name "libldbm - Win32 Single Debug"
|
||||
# Name "libldbm - Win32 Single Release"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ldbm.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\ldbm.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
@ -18,13 +18,13 @@ SRCS = idl.c add.c search.c cache.c dbcache.c dn2id.c entry.c \
|
||||
compare.c modify.c modrdn.c delete.c init.c \
|
||||
config.c bind.c attr.c filterindex.c close.c \
|
||||
alias.c tools.c key.c extended.c \
|
||||
referral.c operational.c
|
||||
referral.c operational.c ldbm.c
|
||||
OBJS = idl.lo add.lo search.lo cache.lo dbcache.lo dn2id.lo entry.lo \
|
||||
id2entry.lo index.lo id2children.lo nextid.lo \
|
||||
compare.lo modify.lo modrdn.lo delete.lo init.lo \
|
||||
config.lo bind.lo attr.lo filterindex.lo close.lo \
|
||||
alias.lo tools.lo key.lo extended.lo \
|
||||
referral.lo operational.lo $(@BUILD_LDBM@_OBJS)
|
||||
referral.lo operational.lo ldbm.lo
|
||||
|
||||
LDAP_INCDIR= ../../../include
|
||||
LDAP_LIBDIR= ../../../libraries
|
||||
@ -33,15 +33,12 @@ BUILD_OPT = "--enable-ldbm"
|
||||
BUILD_MOD = @BUILD_LDBM@
|
||||
BUILD_MOD_DYNAMIC = @BUILD_LDBM_DYNAMIC@
|
||||
|
||||
mod_SRCS = ldbm.c
|
||||
mod_OBJS = ldbm.lo
|
||||
|
||||
mod_DEFS = -DSLAPD_IMPORT
|
||||
MOD_DEFS = $(@BUILD_LDBM@_DEFS)
|
||||
|
||||
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||||
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(LDBM_LIBS)
|
||||
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(LDBM_LIBS)
|
||||
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||||
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||||
|
||||
LIBBASE = back_ldbm
|
||||
|
||||
@ -54,7 +51,4 @@ all-local-lib: ../.backend
|
||||
../.backend: lib$(LIBBASE).a
|
||||
@touch $@
|
||||
|
||||
ldbm.c : $(srcdir)/../../../libraries/libldbm/ldbm.c
|
||||
$(RM) $@; $(LN_S) $(srcdir)/../../../libraries/libldbm/ldbm.c $@
|
||||
|
||||
depend-common: $(XXSRCS)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user