From 3123e2c66a29aaabad7408107bcf4a0e841a93ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jelmer=20Vernoo=C4=B3?= Date: Sat, 9 Jan 2016 20:25:17 +0000 Subject: [PATCH] Simplify handling of dependencies on external libraries in test_headers. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jelmer Vernooij --- testsuite/headers/wscript_build | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build index d0625a0fcb8..64b10ba6e41 100644 --- a/testsuite/headers/wscript_build +++ b/testsuite/headers/wscript_build @@ -24,22 +24,13 @@ bld.SAMBA_GENERATOR('test_headers.h', source=public_headers, target='test_headers.h') -cflags='' -for lib in ['talloc', 'tevent', 'tdb', 'ldb', 'popt' ]: - ename = 'CPPPATH_%s' % lib.upper() - for p in bld.env[ename]: - cflags += bld.env.CPPPATH_ST % p + ' ' - -if not bld.env.USING_SYSTEM_POPT: - cflags += bld.env.CPPPATH_ST % '../third_party/popt' - if bld.env.DEVELOPER_MODE: bld.SAMBA_BINARY('test_headers', source='test_headers.c', includes="#include/public", pyembed=True, - cflags=cflags, local_include=True, global_include=False, use_global_deps=False, - install=False) + install=False, + deps='talloc tdb ldb tevent popt') -- 2.34.1