From 782b4fec717a9e9d99ad08b42c0e807c0e38c777 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 10 Jan 2017 10:11:05 +1100
Subject: waf: Improved XML Catalogue generator.

---
 wscript | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 2147c5b..eff1113 100644
--- a/wscript
+++ b/wscript
@@ -6,6 +6,7 @@ from sys import path
 from os.path import abspath
 path.append(abspath('common'))
 
+import waflib
 import waf as docs_waf
 
 build_all = ['bsp-howto',
@@ -30,15 +31,15 @@ def configure(conf):
         conf.recurse(b)
     conf.env['BUILD_FROM_TOP'] = 'yes'
 
-def xml_catalogue(ctx):
-    docs_waf.xml_catalogue(ctx)
+def catalogue(ctx):
+    docs_waf.xml_catalogue(ctx, building)
 
 def build(ctx):
-    ctx.catalogue = {}
-    ctx.add_post_fun(xml_catalogue)
     for b in building:
         ctx.recurse(b)
-    ctx.install_files('${PREFIX}', 'catalogue.xml')
+    ctx(rule = catalogue,
+        target = 'catalogue.xml',
+        source = ['wscript', 'common/waf.py'])
 
 def install(ctx):
     for b in building:
-- 
cgit v1.2.3