sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Merge ldb_map into LIBLDB.

Browse Source 
(This used to be commit 4d7925f953)
This commit is contained in:
Jelmer Vernooij 2008-05-11 02:15:32 +02:00
parent 7c7de11f20
commit b48e2e4c41
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/configure.ac
View File

@ -59,7 +59,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
[ [
SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk) SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
SMB_INCLUDE_MK(lib/ldb/tools/config.mk) SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
SMB_SUBSYSTEM(ldb_map, [], [LIBLDB])
define_ldb_modulesdir=no define_ldb_modulesdir=no
], ],
[ [

4
source4/dsdb/samdb/ldb_modules/config.mk
View File

@ -96,7 +96,7 @@ ldb_samldb_OBJ_FILES = \
SUBSYSTEM = LIBLDB SUBSYSTEM = LIBLDB
OUTPUT_TYPE = SHARED_LIBRARY OUTPUT_TYPE = SHARED_LIBRARY
INIT_FUNCTION = LDB_MODULE(samba3sam) INIT_FUNCTION = LDB_MODULE(samba3sam)
PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER LIBSECURITY \ PRIVATE_DEPENDENCIES = LIBTALLOC SMBPASSWD NSS_WRAPPER LIBSECURITY \
NDR_SECURITY NDR_SECURITY
# End MODULE ldb_samldb # End MODULE ldb_samldb
################################################ ################################################
@ -110,7 +110,7 @@ ldb_samba3sam_OBJ_FILES = \
SUBSYSTEM = LIBLDB SUBSYSTEM = LIBLDB
OUTPUT_TYPE = SHARED_LIBRARY OUTPUT_TYPE = SHARED_LIBRARY
INIT_FUNCTION = LDB_MODULE(simple_ldap_map) INIT_FUNCTION = LDB_MODULE(simple_ldap_map)
PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map LIBNDR NDR_MISC PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC
ENABLE = YES ENABLE = YES
ALIASES = entryuuid nsuniqueid ALIASES = entryuuid nsuniqueid
# End MODULE ldb_entryuuid # End MODULE ldb_entryuuid

12
source4/lib/ldb/config.mk
View File

@ -70,16 +70,10 @@ INIT_FUNCTION = LDB_MODULE(rdn_name)
ldb_rdn_name_OBJ_FILES = lib/ldb/modules/rdn_name.o ldb_rdn_name_OBJ_FILES = lib/ldb/modules/rdn_name.o
################################################
# Start MODULE ldb_map
[SUBSYSTEM::ldb_map]
PRIVATE_DEPENDENCIES = LIBTALLOC
CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_map
# End MODULE ldb_map
################################################
ldb_map_OBJ_FILES = $(addprefix lib/ldb/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o) ldb_map_OBJ_FILES = $(addprefix lib/ldb/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o)
$(ldb_map_OBJ_FILES): CFLAGS+=-Ilib/ldb/ldb_map
################################################ ################################################
# Start MODULE ldb_skel # Start MODULE ldb_skel
[MODULE::ldb_skel] [MODULE::ldb_skel]
@ -134,7 +128,7 @@ PC_FILES += $(ldbdir)/ldb.pc
LIBLDB_VERSION = 0.0.1 LIBLDB_VERSION = 0.0.1
LIBLDB_SOVERSION = 0 LIBLDB_SOVERSION = 0
LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o) LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o) $(ldb_map_OBJ_FILES)
PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h