summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/config.mk
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/lib/ldb/config.mk
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/lib/ldb/config.mk')
-rw-r--r--source4/lib/ldb/config.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 9cb74f551b..96cd0dbad8 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -2,6 +2,7 @@
# Start MODULE libldb_operational
[MODULE::libldb_operational]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
modules/operational.o
# End MODULE libldb_operational
@@ -11,6 +12,7 @@ OBJ_FILES = \
# Start MODULE libldb_objectclass
[MODULE::libldb_objectclass]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
modules/objectclass.o
# End MODULE libldb_objectclass
@@ -20,6 +22,7 @@ OBJ_FILES = \
# Start MODULE libldb_rdn_name
[MODULE::libldb_rdn_name]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
modules/rdn_name.o
# End MODULE libldb_rdn_name
@@ -29,6 +32,7 @@ OBJ_FILES = \
# Start MODULE libldb_schema
[MODULE::libldb_schema]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
modules/schema.o
# End MODULE libldb_schema
@@ -38,6 +42,7 @@ OBJ_FILES = \
# Start MODULE libldb_ildap
[MODULE::libldb_ildap]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
ldb_ildap/ldb_ildap.o
REQUIRED_SUBSYSTEMS = \
@@ -50,6 +55,7 @@ NOPROTO = YES
# Start MODULE libldb_map
[MODULE::libldb_map]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = modules/ldb_map.o
# End MODULE libldb_map
################################################
@@ -58,6 +64,7 @@ OBJ_FILES = modules/ldb_map.o
# Start MODULE libldb_sqlite3
[MODULE::libldb_sqlite3]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
ldb_sqlite3/ldb_sqlite3.o
REQUIRED_SUBSYSTEMS = \
@@ -70,6 +77,7 @@ NOPROTO = YES
# Start MODULE libldb_tdb
[MODULE::libldb_tdb]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
ldb_tdb/ldb_tdb.o \
ldb_tdb/ldb_search.o \