heimdal: Move autoproto code to heimdal_build.

2 files changed, 25 insertions, 23 deletions

diff --git a/buildtools/wafsamba/samba_autoproto.py b/buildtools/wafsamba/samba_autoproto.py
index b9c6380570..bb6400cf05 100644
--- a/buildtools/wafsamba/samba_autoproto.py
+++ b/buildtools/wafsamba/samba_autoproto.py
@@ -3,29 +3,6 @@
 import Build
 from samba_utils import *
 
-def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'):
-    '''rule for heimdal prototype generation'''
-    bld.SET_BUILD_GROUP(group)
-    if options is None:
-        options='-q -P comment -o'
-    SET_TARGET_TYPE(bld, header, 'PROTOTYPE')
-    t = bld(rule='${PERL} ${HEIMDAL}/cf/make-proto.pl ${OPTIONS} ${TGT[0].abspath(env)} ${SRC}',
-            source=source,
-            target=header,
-            on_results=True,
-            ext_out='.c',
-            before='cc')
-    t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal')
-    t.env.OPTIONS = options
-Build.BuildContext.HEIMDAL_AUTOPROTO = HEIMDAL_AUTOPROTO
-
-
-def HEIMDAL_AUTOPROTO_PRIVATE(bld, header, source):
-    '''rule for private heimdal prototype generation'''
-    bld.HEIMDAL_AUTOPROTO(header, source, options='-q -P comment -p')
-Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE = HEIMDAL_AUTOPROTO_PRIVATE
-
-
 def SAMBA_AUTOPROTO(bld, header, source):
     '''rule for samba prototype generation'''
     bld.SET_BUILD_GROUP('prototypes')
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 2c7b01378d..39438875bc 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -1,6 +1,31 @@
 #!/usr/bin/env python
 
 import Build
+import os
+from samba_utils import SET_TARGET_TYPE
+
+def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'):
+    '''rule for heimdal prototype generation'''
+    bld.SET_BUILD_GROUP(group)
+    if options is None:
+        options='-q -P comment -o'
+    SET_TARGET_TYPE(bld, header, 'PROTOTYPE')
+    t = bld(rule='${PERL} ${HEIMDAL}/cf/make-proto.pl ${OPTIONS} ${TGT[0].abspath(env)} ${SRC}',
+            source=source,
+            target=header,
+            on_results=True,
+            ext_out='.c',
+            before='cc')
+    t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal')
+    t.env.OPTIONS = options
+Build.BuildContext.HEIMDAL_AUTOPROTO = HEIMDAL_AUTOPROTO
+
+
+def HEIMDAL_AUTOPROTO_PRIVATE(bld, header, source):
+    '''rule for private heimdal prototype generation'''
+    bld.HEIMDAL_AUTOPROTO(header, source, options='-q -P comment -p')
+Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE = HEIMDAL_AUTOPROTO_PRIVATE
+
 
 def HEIMDAL_LIBRARY(bld, libname, source, deps,
                   includes='',