heimdal_build: Make HEIMDAL_BINARY be based on HEIMDAL_SUBSYSTEM

This is imporatant as it ensures that the warning -> error
logic and overrides are done for source files directly
listed in a HEIMDAL_BINARY and a HEIMDAL_SUBSYSTEM.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 514cc72659fab80e599787673d53ad4448e1c2b4..10bf2687d23202852a90fa9b616ace6468a8317f 100644 (file)
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -317,17 +317,27 @@ def HEIMDAL_BINARY(binname, source,
 
     source = heimdal_paths(source)
 
+    obj_target = binname + '.heimdal.objlist'
+
+    HEIMDAL_SUBSYSTEM(obj_target,
+                      source         = source,
+                      deps           = deps,
+                      includes       = includes,
+                      cflags         = cflags,
+                      group          = group,
+                      use_hostcc     = use_hostcc,
+                      use_global_deps= use_global_deps)
+
     bld.SAMBA_BINARY(binname,
-                     source         = source,
-                     deps           = deps,
+                     source         = '',
+                     deps           = obj_target,
                      includes       = includes,
                      cflags         = cflags,
                      group          = group,
                      use_hostcc     = use_hostcc,
                      use_global_deps= use_global_deps,
                      install_path   = None,
-                     install        = install,
-                     allow_warnings = True)
+                     install        = install)
 
 
 if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):