summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/samba_autoproto.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-15 14:43:43 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-15 14:43:50 +1000
commit0bda3bae4cd68285e106261ffe79a1da1f778861 (patch)
treeed9498f246e21f9d8ac62e2f8efe58fa44572265 /buildtools/wafsamba/samba_autoproto.py
parentdaf4ad59057d9a7970393d94a4f1c3dfd1e77d21 (diff)
downloadsamba-0bda3bae4cd68285e106261ffe79a1da1f778861.tar.gz
samba-0bda3bae4cd68285e106261ffe79a1da1f778861.tar.bz2
samba-0bda3bae4cd68285e106261ffe79a1da1f778861.zip
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 <abartlet@samba.org>
Diffstat (limited to 'buildtools/wafsamba/samba_autoproto.py')
-rw-r--r--buildtools/wafsamba/samba_autoproto.py5
1 files changed, 4 insertions, 1 deletions
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,