diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-05-17 20:18:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:52 -0500 |
| commit | f9ad3029ae97f5d5beed3f85ad912830fa8d7930 (patch) | |
| tree | 9153a648327da6e8425d75d6ad83cbb975e539c6 /source4 | |
| parent | 6e3b2448eb6cc48a95eeec24f397d3243f9473bf (diff) | |
| download | samba-f9ad3029ae97f5d5beed3f85ad912830fa8d7930.tar.gz samba-f9ad3029ae97f5d5beed3f85ad912830fa8d7930.tar.bz2 samba-f9ad3029ae97f5d5beed3f85ad912830fa8d7930.zip | |
r6863: lib-friendlier names + fix some dependencies
(This used to be commit cab81a51bfd435b54e6f0d5a308aaf6828d38c00)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/basic.mk | 2 | ||||
| -rw-r--r-- | source4/lib/com/config.mk | 12 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 2 | ||||
| -rw-r--r-- | source4/rpc_server/config.mk | 4 | ||||
| -rw-r--r-- | source4/torture/config.mk | 2 |
5 files changed, 8 insertions, 14 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index c1a34d39bb..5c094a6973 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -86,7 +86,7 @@ ADD_OBJ_FILES = \ lib/credentials.o REQUIRED_SUBSYSTEMS = \ LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \ - SOCKET_WRAPPER + SOCKET_WRAPPER CONFIG # End SUBSYSTEM LIBBASIC ############################## diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index a4fe891864..4c0377795c 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -1,21 +1,17 @@ -[SUBSYSTEM::LIBCOM] +[SUBSYSTEM::COM] INIT_OBJ_FILES = \ lib/com/tables.o \ lib/com/rot.o \ lib/com/main.o -################################################ -# Start SUBSYSTEM LIBDCOM -[SUBSYSTEM::LIBDCOM] +[SUBSYSTEM::DCOM] INIT_OBJ_FILES = \ lib/com/dcom/main.o \ lib/com/dcom/tables.o -REQUIRED_SUBSYSTEMS = LIBCOM DCOM_PROXY_DCOM RPC_NDR_REMACT \ +REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \ RPC_NDR_OXIDRESOLVER -# End SUBSYSTEM LIBDCOM -################################################ [MODULE::com_simple] -SUBSYSTEM = LIBCOM +SUBSYSTEM = COM INIT_OBJ_FILES = lib/com/classes/simple.o INIT_FUNCTION = com_simple_init diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 2c8217afd7..0ee9c0f501 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -9,7 +9,7 @@ ADD_OBJ_FILES = \ librpc/ndr/ndr_compression.o \ librpc/ndr/ndr_obfuscate.o \ librpc/ndr/ndr_misc.o -REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBCOMPRESSION +REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBCOMPRESSION LIBTALLOC LIBBASIC # End SUBSYSTEM NDR_RAW ################################################ diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index e9abd726e4..74483c9362 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -24,9 +24,7 @@ INIT_OBJ_FILES = \ librpc/gen_ndr/ndr_dcom_d.o REQUIRED_SUBSYSTEMS = \ DCERPC_COMMON \ - NDR_OXIDRESOLVER \ - NDR_REMACT \ - LIBCOM + DCOM \ # End MODULE dcerpc_dcom ################################################ diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 7b8ebe3e10..ca1b09eb05 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -63,7 +63,7 @@ REQUIRED_SUBSYSTEMS = \ ADD_OBJ_FILES = \ torture/com/simple.o REQUIRED_SUBSYSTEMS = \ - LIBCOM LIBDCOM + COM DCOM # End SUBSYSTEM TORTURE_COM ################################# |