r6863: lib-friendlier names + fix some dependencies

diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index c1a34d39bb088a93545a808087b22d147cd4bc49..5c094a69730c6d98ee423fc64429b62b041401c6 100644 (file)
--- a/source/lib/basic.mk
+++ b/source/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/source/lib/com/config.mk b/source/lib/com/config.mk
index a4fe891864b9faa24e62d67dbd336c27e371dc13..4c0377795ca01fad2ec540e5c64d2f965e9c9aee 100644 (file)
--- a/source/lib/com/config.mk
+++ b/source/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/source/librpc/config.mk b/source/librpc/config.mk
index 2c8217afd74dd53bf1d27a94f4b00a1a0ed65e6d..0ee9c0f50127bb8431aca4fd7f7088bf94438e9e 100644 (file)
--- a/source/librpc/config.mk
+++ b/source/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/source/rpc_server/config.mk b/source/rpc_server/config.mk
index e9abd726e499adb68de2cf33c7531d38fa7cd969..74483c9362133edeaac028a0cfbc7190d357241d 100644 (file)
--- a/source/rpc_server/config.mk
+++ b/source/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/source/torture/config.mk b/source/torture/config.mk
index 7b8ebe3e100ece8e0d8af31b79089ed2a28fdc46..ca1b09eb057411ba2bb0138b4445365c28755550 100644 (file)
--- a/source/torture/config.mk
+++ b/source/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
 #################################