diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-01-02 00:16:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:49:35 -0500 |
| commit | bc4aebfaecf52678eb40aee2fd4bd81a315c554d (patch) | |
| tree | db09ef34f7adc46c9fd6a1398bc225eac0b85917 /source4/lib | |
| parent | 55eaed5aa2c1c4a6c417278ca08652f12fb9e7b9 (diff) | |
| download | samba-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')
| -rw-r--r-- | source4/lib/basic.mk | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 8 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/socket/config.mk | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 92b60bfd40..d5bff95f01 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -97,7 +97,7 @@ REQUIRED_SUBSYSTEMS = \ [SUBSYSTEM::DB_WRAP] OBJ_FILES = db_wrap.o \ gendb.o -REQUIRED_SUBSYSTEMS = LIBLDB +REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB [SUBSYSTEM::PIDFILE] OBJ_FILES = pidfile.o 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 \ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index fbef97a299..a977e0ea5c 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -46,6 +46,7 @@ OBJ_FILES = \ # Start MODULE registry_rpc [MODULE::registry_rpc] INIT_FUNCTION = registry_rpc_init +OUTPUT_TYPE = MERGEDOBJ SUBSYSTEM = REGISTRY OBJ_FILES = \ reg_backend_rpc.o diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index 60db3ab07e..ad555522a3 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -3,6 +3,7 @@ # Start MODULE socket_ipv4 [MODULE::socket_ipv4] SUBSYSTEM = SOCKET +OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv4.o NOPROTO=YES @@ -13,6 +14,7 @@ NOPROTO=YES # Start MODULE socket_ipv6 [MODULE::socket_ipv6] SUBSYSTEM = SOCKET +OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv6.o NOPROTO=YES @@ -23,6 +25,7 @@ NOPROTO=YES # Start MODULE socket_unix [MODULE::socket_unix] SUBSYSTEM = SOCKET +OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_unix.o NOPROTO=YES |