s4-waf: removed the XATTR and SASL aliases

these were hangovers from the old build system names

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 91c85f083796663773cdfa903555d363ad41de64..4e03e2df22e8c27dd9c323f553267cecea54397c 100644 (file)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -27,7 +27,7 @@ bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
 
 bld.SAMBA_SUBSYSTEM('WRAP_XATTR',
        source='wrap_xattr.c',
-       public_deps='XATTR',
+       public_deps='attr',
        deps='talloc',
        local_include=False
        )

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 4c8ced613b36517cfc8557b1f42f2ed9a93df08d..a1c32579795ffada3e158cb826054db9fb4e94d3 100644 (file)
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -31,7 +31,7 @@ bld.SAMBA_MODULE('cyrus_sasl',
        source='cyrus_sasl.c',
        subsystem='gensec',
        init_function='gensec_sasl_init',
-       deps='CREDENTIALS SASL',
+       deps='CREDENTIALS sasl2',
        enabled=bld.CONFIG_SET('HAVE_SASL')
        )
 

diff --git a/source4/wscript_build b/source4/wscript_build
index 4c2bc9c5272725a2b666129b3ed6483aed6b9a13..7fd6ee89b6c8a8ff18836776cbf4808754df638a 100644 (file)
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -14,11 +14,6 @@ bld.SAMBA_MKVERSION('version.h')
 
 # bld.ENABLE_MAGIC_ORDERING()
 
-# we don't always use consistent names for our subsystems.
-# this sets up some aliases
-bld.TARGET_ALIAS('attr', 'XATTR')
-bld.TARGET_ALIAS('sasl2', 'SASL')
-
 bld.RECURSE('../lib/replace')
 bld.RECURSE('../lib/talloc')
 bld.RECURSE('../lib/tdb')