From 0bda3bae4cd68285e106261ffe79a1da1f778861 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 15 Apr 2010 14:43:43 +1000 Subject: build: throw a fatal error for duplicate target declarations We don't want someone to declare two subsystems of the same name but with different source files Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/samba_autoproto.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'buildtools/wafsamba/samba_autoproto.py') diff --git a/buildtools/wafsamba/samba_autoproto.py b/buildtools/wafsamba/samba_autoproto.py index 2a903d9f1f..edabc7e44c 100644 --- a/buildtools/wafsamba/samba_autoproto.py +++ b/buildtools/wafsamba/samba_autoproto.py @@ -29,8 +29,11 @@ Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE = HEIMDAL_AUTOPROTO_PRIVATE def SAMBA_AUTOPROTO(bld, header, source): '''rule for samba prototype generation''' bld.SET_BUILD_GROUP('prototypes') - SET_TARGET_TYPE(bld, header, 'PROTOTYPE') + relpath = os_path_relpath(bld.curdir, bld.srcnode.abspath()) + name = os.path.join(relpath, header) + SET_TARGET_TYPE(bld, name, 'PROTOTYPE') t = bld( + name = name, source = source, target = header, on_results=True, -- cgit