diff options
Diffstat (limited to 'source4/lib')
-rw-r--r-- | source4/lib/basic.mk | 2 | ||||
-rw-r--r-- | source4/lib/com/config.mk | 8 | ||||
-rw-r--r-- | source4/lib/ldb/config.mk | 32 | ||||
-rw-r--r-- | source4/lib/registry/config.mk | 26 | ||||
-rw-r--r-- | source4/lib/tdb/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/util/config.mk | 2 |
6 files changed, 36 insertions, 36 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 43e838967b..0ed7a69146 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -60,4 +60,4 @@ OBJ_FILES = \ PRIVATE_PROTO_HEADER = db_wrap_proto.h OBJ_FILES = db_wrap.o \ gendb.o -REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB LDBSAMBA +REQUIRED_SUBSYSTEMS = ldb LIBTDB LDBSAMBA diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index 5933168885..f0c13886d0 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -1,19 +1,19 @@ -[SUBSYSTEM::COM] +[SUBSYSTEM::com] PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = \ tables.o \ rot.o \ main.o -[SUBSYSTEM::DCOM] +[SUBSYSTEM::dcom] PRIVATE_PROTO_HEADER = dcom/proto.h OBJ_FILES = \ dcom/main.o \ dcom/tables.o -REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \ +REQUIRED_SUBSYSTEMS = com DCOM_PROXY_DCOM RPC_NDR_REMACT \ RPC_NDR_OXIDRESOLVER [MODULE::com_simple] -SUBSYSTEM = COM +SUBSYSTEM = com OBJ_FILES = classes/simple.o INIT_FUNCTION = com_simple_init diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 3834ac0213..b87c816402 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -2,7 +2,7 @@ # Start MODULE libldb_asq [MODULE::libldb_asq] INIT_FUNCTION = ldb_asq_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/asq.o # End MODULE libldb_asq @@ -12,7 +12,7 @@ OBJ_FILES = \ # Start MODULE libldb_sort [MODULE::libldb_sort] INIT_FUNCTION = ldb_sort_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/sort.o # End MODULE libldb_sort @@ -22,7 +22,7 @@ OBJ_FILES = \ # Start MODULE libldb_paged_results [MODULE::libldb_paged_results] INIT_FUNCTION = ldb_paged_results_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/paged_results.o # End MODULE libldb_paged_results @@ -31,7 +31,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_operational [MODULE::libldb_operational] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_operational_init OBJ_FILES = \ modules/operational.o @@ -42,7 +42,7 @@ OBJ_FILES = \ # Start MODULE libldb_objectclass [MODULE::libldb_objectclass] INIT_FUNCTION = ldb_objectclass_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/objectclass.o # End MODULE libldb_objectclass @@ -51,7 +51,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_rdn_name [MODULE::libldb_rdn_name] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_rdn_name_init OBJ_FILES = \ modules/rdn_name.o @@ -62,7 +62,7 @@ OBJ_FILES = \ # Start MODULE libldb_schema [MODULE::libldb_schema] INIT_FUNCTION = ldb_schema_init -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = \ modules/schema.o # End MODULE libldb_schema @@ -71,7 +71,7 @@ OBJ_FILES = \ ################################################ # Start MODULE libldb_ildap [MODULE::libldb_ildap] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_ildap_init OBJ_FILES = \ ldb_ildap/ldb_ildap.o @@ -84,7 +84,7 @@ NOPROTO = YES ################################################ # Start MODULE libldb_map [MODULE::libldb_map] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb OBJ_FILES = modules/ldb_map.o # End MODULE libldb_map ################################################ @@ -92,7 +92,7 @@ OBJ_FILES = modules/ldb_map.o ################################################ # Start MODULE libldb_skel [MODULE::libldb_skel] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_skel_init OBJ_FILES = modules/skel.o # End MODULE libldb_skel @@ -101,7 +101,7 @@ OBJ_FILES = modules/skel.o ################################################ # Start MODULE libldb_sqlite3 [MODULE::libldb_sqlite3] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_sqlite3_init OBJ_FILES = \ ldb_sqlite3/ldb_sqlite3.o @@ -114,7 +114,7 @@ NOPROTO = YES ################################################ # Start MODULE libldb_tdb [MODULE::libldb_tdb] -SUBSYSTEM = LIBLDB +SUBSYSTEM = ldb INIT_FUNCTION = ldb_tdb_init OBJ_FILES = \ ldb_tdb/ldb_tdb.o \ @@ -130,8 +130,8 @@ NOPROTO = YES ################################################ ################################################ -# Start SUBSYSTEM LIBLDB -[LIBRARY::LIBLDB] +# Start SUBSYSTEM ldb +[LIBRARY::ldb] MAJOR_VERSION = 0 MINOR_VERSION = 0 DESCRIPTION = LDAP-like embedded database library @@ -157,7 +157,7 @@ NOPROTO = YES MANPAGE = man/ldb.3 PUBLIC_HEADERS = include/ldb.h # -# End SUBSYSTEM LIBLDB +# End SUBSYSTEM ldb ################################################ ################################################ @@ -175,7 +175,7 @@ OBJ_FILES = \ NOPROTO = YES OBJ_FILES= \ tools/cmdline.o -REQUIRED_SUBSYSTEMS = LIBLDB LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS +REQUIRED_SUBSYSTEMS = ldb LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS # End SUBSYSTEM LIBLDB_CMDLINE ################################################ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 5c68bacd94..173d7bc5a4 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -4,7 +4,7 @@ # Start MODULE registry_nt4 [MODULE::registry_nt4] INIT_FUNCTION = registry_nt4_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_nt4.o REQUIRED_SUBSYSTEMS = TDR_REGF @@ -26,7 +26,7 @@ lib/registry/tdr_regf.c: lib/registry/regf.idl # Start MODULE registry_w95 [MODULE::registry_w95] INIT_FUNCTION = registry_w95_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_w95.o # End MODULE registry_w95 @@ -36,7 +36,7 @@ OBJ_FILES = \ # Start MODULE registry_dir [MODULE::registry_dir] INIT_FUNCTION = registry_dir_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_dir.o # End MODULE registry_dir @@ -48,7 +48,7 @@ OBJ_FILES = \ INIT_FUNCTION = registry_rpc_init PRIVATE_PROTO_HEADER = reg_backend_rpc.h OUTPUT_TYPE = MERGEDOBJ -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_rpc.o REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG @@ -61,7 +61,7 @@ REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG # Start MODULE registry_gconf [MODULE::registry_gconf] INIT_FUNCTION = registry_gconf_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_gconf.o REQUIRED_SUBSYSTEMS = EXT_LIB_gconf @@ -72,17 +72,17 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_gconf # Start MODULE registry_ldb [MODULE::registry_ldb] INIT_FUNCTION = registry_ldb_init -SUBSYSTEM = REGISTRY +SUBSYSTEM = registry OBJ_FILES = \ reg_backend_ldb.o REQUIRED_SUBSYSTEMS = \ - LIBLDB + ldb # End MODULE registry_ldb ################################################ ################################################ -# Start SUBSYSTEM REGISTRY -[LIBRARY::REGISTRY] +# Start SUBSYSTEM registry +[LIBRARY::registry] MAJOR_VERSION = 0 MINOR_VERSION = 0 DESCRIPTION = Windows-style registry library @@ -106,7 +106,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regdiff.o REQUIRED_SUBSYSTEMS = \ - CONFIG REGISTRY LIBPOPT POPT_SAMBA POPT_CREDENTIALS + CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regdiff.1 # End BINARY regdiff ################################################ @@ -118,7 +118,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regpatch.o REQUIRED_SUBSYSTEMS = \ - CONFIG REGISTRY LIBPOPT POPT_SAMBA POPT_CREDENTIALS + CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regpatch.1 # End BINARY regpatch ################################################ @@ -130,7 +130,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regshell.o REQUIRED_SUBSYSTEMS = \ - CONFIG LIBPOPT REGISTRY POPT_SAMBA POPT_CREDENTIALS LIBREADLINE + CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE MANPAGE = man/regshell.1 # End BINARY regshell ################################################ @@ -142,7 +142,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regtree.o REQUIRED_SUBSYSTEMS = \ - CONFIG LIBPOPT REGISTRY POPT_SAMBA POPT_CREDENTIALS + CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regtree.1 # End BINARY regtree ################################################ diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 76e0eade85..c9785775d1 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -14,7 +14,7 @@ REQUIRED_SUBSYSTEMS = \ LIBREPLACE PUBLIC_HEADERS = include/tdb.h # -# End SUBSYSTEM LIBLDB +# End SUBSYSTEM ldb ################################################ ################################################ diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 2b2c440e4b..24e36dc72e 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -36,7 +36,7 @@ REQUIRED_SUBSYSTEMS = \ CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \ SOCKET_WRAPPER CONFIG \ # for the base64 functions - LIBLDB + ldb [SUBSYSTEM::PIDFILE] PRIVATE_PROTO_HEADER = pidfile.h |