s3compat: don't propogate the _PUBLIC_ override to dependencies

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

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 83838ae1098420a508cf9631b5a338bcb7c36f6e..b377474810768841f5b361f976fd40524e2a38db 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -826,7 +826,7 @@ SMBD_SRC = bld.EXPAND_VARIABLES('${SMBD_SRC_BASE}', vars=locals())
 
 LIB_SRC = bld.EXPAND_VARIABLES(LIB_SRC, vars=locals())
 
-SAMBA3_INCLUDES = '#source4/s3compat/compat #source4/dynconfig #source3 #source3/lib #source3/include #source3/libaddns #source3/librpc #source3/build #source4/heimdal_build #source4/heimdal/lib/com_err #source4/heimdal/lib/gssapi #source4/heimdal/lib/krb5 #source4/heimdal/lib/asn1'
+SAMBA3_INCLUDES = '#source4/s3compat/compat #source4/dynconfig #lib/talloc #lib/tevent #lib/tdb/include #source3 #source3/lib #source3/include #source3/libaddns #source3/librpc #source3/build #source4/heimdal_build #source4/heimdal/lib/com_err #source4/heimdal/lib/gssapi #source4/heimdal/lib/krb5 #source4/heimdal/lib/asn1'
 
 s3_vars = locals()
 
@@ -848,12 +848,10 @@ def S3_SUBSYSTEM(name, source,
 
 
 S3_SUBSYSTEM('GROUPDB',
-             source=GROUPDB_SRC,
-             deps='tdb tevent')
+             source=GROUPDB_SRC)
 
 S3_SUBSYSTEM('TLDAP',
-             source=TLDAP_SRC,
-             deps='tdb tevent')
+             source=TLDAP_SRC)
 
 S3_SUBSYSTEM('PASSDB',
              source=PASSDB_SRC,
@@ -861,8 +859,8 @@ S3_SUBSYSTEM('PASSDB',
              vars=locals())
 
 S3_SUBSYSTEM('PARAM_WITHOUT_REG',
-             source=PARAM_WITHOUT_REG_SRC,
-             deps='tdb tevent')
+             source=PARAM_WITHOUT_REG_SRC)
+
 
 S3_SUBSYSTEM('PARAM',
                     source=PARAM_SRC,
@@ -871,7 +869,6 @@ S3_SUBSYSTEM('PARAM',
 
 S3_SUBSYSTEM('LIBS',
              source=LIB_SRC,
-             deps='tdb tevent talloc',
              vars=locals())
 
 S3_SUBSYSTEM('LIB_NONSMBD',
@@ -881,7 +878,6 @@ S3_SUBSYSTEM('LIB_NONSMBD',
 
 S3_SUBSYSTEM('LIBSMB_ERR',
              source=LIBSMB_ERR_SRC,
-             deps='tdb tevent',
              vars=locals())
 
 S3_SUBSYSTEM('LIBSAMBA',
@@ -922,7 +918,7 @@ bld.SAMBA_SUBSYSTEM('s3dynconfig',
 
 bld.SAMBA_LIBRARY('s3compatcore',
                   source=[],
-                  deps='s3replace s3compat_wrapper s3dynconfig LIBSECURITY_COMMON LIBCRYPTO LIBSAMBA-UTIL s3_smbd HEIMDAL_GSSAPI HEIMDAL_COM_ERR lber ldap',
+                  deps='s3replace s3compat_wrapper s3dynconfig LIBSECURITY_COMMON LIBCRYPTO LIBSAMBA-UTIL s3_smbd HEIMDAL_GSSAPI HEIMDAL_COM_ERR lber ldap tdb tevent talloc',
                   hide_symbols=True)
 
 bld.SAMBA_SUBSYSTEM('s3compat',