summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-02 00:16:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:35 -0500
commitbc4aebfaecf52678eb40aee2fd4bd81a315c554d (patch)
treedb09ef34f7adc46c9fd6a1398bc225eac0b85917 /source4/dsdb
parent55eaed5aa2c1c4a6c417278ca08652f12fb9e7b9 (diff)
downloadsamba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.gz
samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.tar.bz2
samba-bc4aebfaecf52678eb40aee2fd4bd81a315c554d.zip
r12670: Make a couple of dependencies stricter
Re-introduce and use the OUTPUT_TYPE property for MODULEs to force specific modules to always be included (This used to be commit f9eede3d40098eddc3618ee48f9253cdddb94a6f)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/config.mk2
-rw-r--r--source4/dsdb/samdb/ldb_modules/config.mk7
2 files changed, 8 insertions, 1 deletions
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index d7188e43b5..b1a00cc387 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -6,7 +6,7 @@ include samdb/ldb_modules/config.mk
# Start SUBSYSTEM SAMDB
[SUBSYSTEM::SAMDB]
PRIVATE_PROTO_HEADER = samdb/samdb.h
-REQUIRED_SUBSYSTEMS = DB_WRAP
+REQUIRED_SUBSYSTEMS = DB_WRAP LIBCLI_LDAP
OBJ_FILES = \
samdb/samdb.o \
samdb/samdb_privilege.o \
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index f9c267e2db..a18d2c4359 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -2,6 +2,7 @@
# Start MODULE libldb_objectguid
[MODULE::libldb_objectguid]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
objectguid.o
REQUIRED_SUBSYSTEMS = \
@@ -13,8 +14,10 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE libldb_samldb
[MODULE::libldb_samldb]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
samldb.o
+REQUIRED_SUBSYSTEMS = SAMDB
#
# End MODULE libldb_samldb
################################################
@@ -23,6 +26,7 @@ OBJ_FILES = \
# Start MODULE libldb_samba3sam
[MODULE::libldb_samba3sam]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
samba3sam.o
#
@@ -33,6 +37,7 @@ OBJ_FILES = \
# Start MODULE libldb_proxy
[MODULE::libldb_proxy]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
proxy.o
#
@@ -44,6 +49,7 @@ OBJ_FILES = \
# Start MODULE libldb_rootdse
[MODULE::libldb_rootdse]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
rootdse.o
#
@@ -54,6 +60,7 @@ OBJ_FILES = \
# Start MODULE libldb_password_hash
[MODULE::libldb_password_hash]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
password_hash.o
REQUIRED_SUBSYSTEMS = \