s4-waf: removed dependencies on missing subsystems

these were left over from the old config.mk system

9 files changed, 11 insertions, 31 deletions

diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index c8274ab945..d3b8446e27 100644
--- a/libcli/ldap/wscript_build
+++ b/libcli/ldap/wscript_build
@@ -12,6 +12,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
 	source='ldap_ndr.c',
 	public_deps='LIBSAMBA-ERRORS talloc',
 	public_headers='ldap_ndr.h',
-	deps='LIBSAMBA-UTIL ldb NDR_MISC NDR_SECURITY tevent'
+	deps='LIBSAMBA-UTIL ldb NDR_SECURITY tevent'
 	)
 
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index ae5e092484..ddcc76ec3c 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -484,7 +484,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
         )
 
     HEIMDAL_BINARY('rkpty', 'lib/roken/rkpty.c',
-            deps='roken OPENPTY',
+            deps='roken',
             cflags='-DPACKAGE="Samba"',
             install=False
         )
@@ -524,7 +524,7 @@ HDB_SOURCE = '''lib/hdb/db.c lib/hdb/dbinfo.c lib/hdb/hdb.c
 HEIMDAL_LIBRARY('hdb',
                     source=HDB_SOURCE,
                     includes='../heimdal/lib/hdb',
-                    deps='HDB_LDB krb5 HEIMDAL_HDB_KEYS roken HEIMDAL_HCRYPTO com_err HEIMDAL_HDB_ASN1 wind',
+                    deps='krb5 HEIMDAL_HDB_KEYS roken HEIMDAL_HCRYPTO com_err HEIMDAL_HDB_ASN1 wind',
                     vnum='11.0.2',
     )
 HEIMDAL_AUTOPROTO('lib/hdb/hdb-protos.h', HDB_SOURCE)
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 03841ef36a..f2f6751446 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -202,7 +202,7 @@ bld.SAMBA_PYTHON('python_winreg',
 
 bld.SAMBA_PYTHON('python_dcerpc_misc',
 	source='../../librpc/gen_ndr/py_misc.c',
-	deps='PYTALLOC pyrpc_util NDR_MISC NDR_KRB5PAC',
+	deps='PYTALLOC pyrpc_util NDR_KRB5PAC',
 	realname='samba/dcerpc/misc.so'
 	)
 
diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build
index b77c2120f8..7f8e9cff9d 100644
--- a/source4/ntvfs/posix/wscript_build
+++ b/source4/ntvfs/posix/wscript_build
@@ -34,7 +34,7 @@ bld.SAMBA_MODULE('ntvfs_posix',
 	autoproto='vfs_posix_proto.h',
 	subsystem='ntvfs',
 	init_function='ntvfs_posix_init',
-	deps='NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio',
+	deps='NDR_XATTR WRAP_XATTR ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio',
 	internal_module=True
 	)
 
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index e56a5107cb..1323cc937c 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -39,7 +39,7 @@ bld.SAMBA_MODULE('process_model_standard',
 	source='process_standard.c',
 	subsystem='process_model',
 	init_function='process_model_standard_init',
-	deps='LIBEVENTS SETPROCTITLE LDBSAMBA'
+	deps='LIBEVENTS LDBSAMBA'
 	)
 
 
@@ -56,14 +56,14 @@ bld.SAMBA_MODULE('process_model_prefork',
 	source='process_prefork.c',
 	subsystem='process_model',
 	init_function='process_model_prefork_init',
-	deps='LIBEVENTS SETPROCTITLE'
+	deps='LIBEVENTS'
 	)
 
 bld.SAMBA_MODULE('process_model_onefork',
 	source='process_onefork.c',
 	subsystem='process_model',
 	init_function='process_model_onefork_init',
-	deps='LIBEVENTS SETPROCTITLE'
+	deps='LIBEVENTS'
 	)
 
 
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index ee723188ba..a63edf474c 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
 	autoproto='proto.h',
 	subsystem='smbtorture',
 	init_function='torture_drs_init',
-	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE',
+	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI',
 	internal_module=True
 	)
 
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 8c09c49fd7..bb0964abe3 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_MODULE('torture_rpc',
 	autoproto='rpc/proto.h',
 	subsystem='smbtorture',
 	init_function='torture_rpc_init',
-	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE TORTURE_DFS',
+	deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',
 	internal_module=True
 	)
 
diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
index eb0f44f4da..e586355366 100644
--- a/source4/web_server/wscript_build
+++ b/source4/web_server/wscript_build
@@ -14,6 +14,6 @@ bld.SAMBA_MODULE('WEB',
 		autoproto_extra_source='wsgi.c',
 		subsystem='service',
 		init_function='server_service_web_init',
-		deps='LIBTLS smbcalls process_model LIBPYTHON WEB_WSGI',
+		deps='LIBTLS process_model LIBPYTHON WEB_WSGI',
 		pyembed=True,
 		)
diff --git a/source4/wscript_build b/source4/wscript_build
index d2b6e541c6..4c2bc9c527 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -19,26 +19,6 @@ bld.SAMBA_MKVERSION('version.h')
 bld.TARGET_ALIAS('attr', 'XATTR')
 bld.TARGET_ALIAS('sasl2', 'SASL')
 
-# missing subsystems - need looking at
-bld.SAMBA_SUBSYSTEM('NETAPI', '')       # for external libnet
-bld.SAMBA_SUBSYSTEM('OPENPTY', '')      # external openpty library
-bld.SAMBA_SUBSYSTEM('SMBCLIENT', '')    # for external libsmbclient
-bld.SAMBA_SUBSYSTEM('BLKID', '')        # blkid library from e2fsprogs
-bld.SAMBA_SUBSYSTEM('SETPROCTITLE', '') # external setproctitle library
-
-# subsystems that are confirmed to be missing. These should
-# be removed from the build completely when we only have
-# one build system
-bld.SAMBA_SUBSYSTEM('DCOM_PROXY_DCOM', '')
-bld.SAMBA_SUBSYSTEM('smbcalls', '')
-bld.SAMBA_SUBSYSTEM('HDB_LDB', '')
-bld.SAMBA_SUBSYSTEM('NDR_MISC', '')
-bld.SAMBA_SUBSYSTEM('NDR_SAMR', '')
-bld.SAMBA_SUBSYSTEM('SCHANNELDB', '')
-bld.SAMBA_SUBSYSTEM('pyldb_util', '')
-bld.SAMBA_SUBSYSTEM('TORTURE_LDB_MODULE', '')
-
-
 bld.RECURSE('../lib/replace')
 bld.RECURSE('../lib/talloc')
 bld.RECURSE('../lib/tdb')