From: Michael Adam <obnox@samba.org>
Date: Wed, 12 Sep 2012 15:02:39 +0000 (+0200)
Subject: build:dist: extend samba_dist.DIST_FILES() to take optional parameter extend(=False)
X-Git-Tag: samba-4.0.0rc1~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ea2a468c38d07c62d094e2bd4c1dc42f9c47949;p=thirdparty%2Fsamba.git

build:dist: extend samba_dist.DIST_FILES() to take optional parameter extend(=False)

This allows to do multpile DIST_FILES() calls that will extend the list
rather than only setting it initially.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 871c1110196..a2c75593f27 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -219,11 +219,13 @@ def DIST_DIRS(dirs):
         dist_dirs = dirs
 
 @conf
-def DIST_FILES(files):
+def DIST_FILES(files, extend=False):
     '''set additional files for packaging, relative to top srcdir'''
     global dist_files
     if not dist_files:
         dist_files = files
+    elif extend:
+        dist_files = dist_files + " " + files
 
 @conf
 def DIST_BLACKLIST(blacklist):