3 files changed, 12 insertions, 17 deletions
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index ac7739fd4b..860d2c73a1 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -8,10 +8,10 @@ OBJ_FILES = \
 		ndrdump.o
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
-		LIBCMDLINE \
 		LIBBASIC \
 		NDR_ALL \
-		LIBRPC
+		LIBPOPT \
+		POPT_SAMBA
 MANPAGE = man/ndrdump.1
 # FIXME: ndrdump shouldn't have to depend on RPC...
 # End BINARY ndrdump
@@ -25,10 +25,9 @@ OBJ_FILES = \
 		ntlm_auth.o
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
-		LIBCMDLINE \
 		LIBBASIC \
-		LIBSMB \
-		LIBRPC
+		LIBPOPT \
+		POPT_SAMBA
 MANPAGE = man/ntlm_auth.1
 # End BINARY ntlm_auth
 #################################
@@ -41,9 +40,7 @@ OBJ_FILES = \
 		getntacl.o
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
-		LIBCMDLINE \
 		LIBBASIC \
-		LIBRPC \
 		NDR_XATTR \
 		EXT_LIB_XATTR
 # End BINARY getntacl
@@ -57,9 +54,8 @@ OBJ_FILES = \
 		setntacl.o
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
-		LIBCMDLINE \
 		LIBBASIC \
-		LIBRPC
+		NDR_XATTR
 # End BINARY setntacl
 #################################
 
@@ -71,9 +67,7 @@ OBJ_FILES = \
 		setnttoken.o
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
-		LIBCMDLINE \
 		LIBBASIC \
-		LIBRPC \
 		NDR_XATTR \
 		NDR_SAMR
 # End BINARY setnttoken
@@ -87,9 +81,9 @@ OBJ_FILES = \
 		nmblookup.o
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
-		LIBCMDLINE \
 		LIBBASIC \
 		LIBCLI_NBT \
-		LIB_SECURITY_NDR
+		LIBPOPT \
+		POPT_SAMBA
 # End BINARY nmblookup
 #################################
diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c
index abc6d95fb4..33bffe77b5 100644
--- a/source4/utils/ndrdump.c
+++ b/source4/utils/ndrdump.c
@@ -127,7 +127,7 @@ static char *stdin_load(TALLOC_CTX *mem_ctx, size_t *size)
 		POPT_TABLEEND
 	};
 
-	ndrdump_init_subsystems;
+	dcerpc_table_init();
 
 	pc = poptGetContext("ndrdump", argc, argv, long_options, 0);
 	
diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index e9f7e6ef52..3d45bcec77 100644
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -14,9 +14,10 @@ OBJ_FILES = \
 		net_user.o
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
-		LIBCMDLINE \
 		LIBBASIC \
-		LIBSMB \
-		LIBNET
+		LIBNET \
+		LIBPOPT \
+		POPT_SAMBA \
+		POPT_CREDENTIALS
 # End BINARY net
 #################################