r19676: Fix some more dependencies.

(This used to be commit 8768bec81f57131a0c9754e8121b345c0be4a5d0)

1 files changed, 20 insertions, 19 deletions

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 91c9a499aa2..4b2a8c9b696 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -11,7 +11,8 @@ OBJ_FILES = \
 		ndr/ndr_basic.o \
 		ndr/ndr_string.o \
 		ndr/uuid.o
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL \
+					  LIBSAMBA-CONFIG
 # End SUBSYSTEM LIBNDR
 ################################################
 
@@ -24,7 +25,7 @@ DESCRIPTION = NDR support for compressed subcontexts
 PRIVATE_PROTO_HEADER = ndr/ndr_compression.h
 OBJ_FILES = \
 		ndr/ndr_compression.o
-PUBLIC_DEPENDENCIES = LIBCOMPRESSION LIBSAMBA-ERRORS
+PUBLIC_DEPENDENCIES = LIBCOMPRESSION LIBSAMBA-ERRORS LIBNDR
 # End SUBSYSTEM NDR_COMPRESSION
 ################################################
 
@@ -61,7 +62,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_irpc.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_NBT
 
 [LIBRARY::NDR_DSBACKUP]
 VERSION = 0.0.1
@@ -82,7 +83,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
 
 [SUBSYSTEM::NDR_ROT]
 OBJ_FILES = gen_ndr/ndr_rot.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
 
 [LIBRARY::NDR_LSA]
 VERSION = 0.0.1
@@ -95,7 +96,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_dfs.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
 [LIBRARY::NDR_FRSRPC]
 VERSION = 0.0.1
@@ -113,13 +114,13 @@ PUBLIC_DEPENDENCIES = LIBNDR
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_drsuapi.o ndr/ndr_drsuapi.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_SAMR
 
 [LIBRARY::NDR_DRSBLOBS]
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_drsblobs.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI
 
 [SUBSYSTEM::NDR_SASL_HELPERS]
 OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
@@ -154,7 +155,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_SECURITY
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_spoolss.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY
 
 [SUBSYSTEM::NDR_SPOOLSS_BUF]
 PRIVATE_PROTO_HEADER = ndr/ndr_spoolss_buf.h
@@ -164,20 +165,20 @@ OBJ_FILES = ndr/ndr_spoolss_buf.o
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_wkssvc.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SRVSVC NDR_MISC NDR_SECURITY
 
 [LIBRARY::NDR_SRVSVC]
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_srvsvc.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL NDR_SECURITY
 
 [LIBRARY::NDR_SVCCTL]
 VERSION = 0.0.1
 PUBLIC_HEADERS = gen_ndr/svcctl.h
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_svcctl.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
 [LIBRARY::NDR_ATSVC]
 VERSION = 0.0.1
@@ -189,13 +190,13 @@ PUBLIC_DEPENDENCIES = LIBNDR
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_eventlog.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA
 
 [LIBRARY::NDR_EPMAPPER]
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_epmapper.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
 [LIBRARY::NDR_DBGIDL]
 VERSION = 0.0.1
@@ -207,7 +208,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_dssetup.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
 [LIBRARY::NDR_MSGSVC]
 VERSION = 0.0.1
@@ -225,7 +226,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_winreg.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN
+PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN NDR_SECURITY NDR_MISC
 
 [LIBRARY::NDR_INITSHUTDOWN]
 VERSION = 0.0.1
@@ -237,7 +238,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_mgmt.o
-PUBLIC_DEPENDENCIES = LIBNDR
+PUBLIC_DEPENDENCIES = LIBNDR NDR_DCERPC
 
 [LIBRARY::NDR_PROTECTED_STORAGE]
 VERSION = 0.0.1
@@ -257,13 +258,13 @@ PUBLIC_DEPENDENCIES = LIBNDR
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_oxidresolver.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
+PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
 
 [LIBRARY::NDR_REMACT]
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_remact.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
+PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
 
 [LIBRARY::NDR_WZCSVC]
 VERSION = 0.0.1
@@ -484,7 +485,7 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_epmapper_c.o
-PUBLIC_DEPENDENCIES = NDR_EPMAPPER
+PUBLIC_DEPENDENCIES = dcerpc NDR_EPMAPPER 
 
 [LIBRARY::RPC_NDR_DBGIDL]
 VERSION = 0.0.1