s4:s3compat Fix build issues by further avoiding double-compilation of IDL

It causes a lot of trouble if code is compiled for s3compat and for
the rest of Samba4.  This removes one more trouble spot.

Andrew Bartlett

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index f5253a1955ba39e8e03e64977f73165bd5bfb63c..ebae6d258dd0bf005eef0252b2f40e94076b8d24 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -41,13 +41,6 @@ LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
 
 ZLIB_SRC = '''${ZLIB_SRCS}'''
 
-COMPRESSION_SRC = '''../lib/compression/mszip.c
-                                  ../lib/compression/lzxpress.c
-                                  ${ZLIB_SRC}'''
-
-DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
-              ${COMPRESSION_SRC}'''
-
 LIBNDR_NTLMSSP_SRC = '''../librpc/gen_ndr/ndr_ntlmssp.c
                      ../librpc/ndr/ndr_ntlmssp.c'''
 
@@ -246,8 +239,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/smb_seal.c libsmb/async_smb.c
              ${LIBNMB_SRC}
              ${LIBNBT_SRC}
-             ${CLDAP_SRC}
-             ${DRSUAPI_SRC}'''
+             ${CLDAP_SRC}'''
 
 RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c'''
 
@@ -830,7 +822,7 @@ S3_SUBSYSTEM('LIBSAMBA',
 
 S3_SUBSYSTEM('LIBSMB',
                     source=LIBSMB_SRC,
-                    deps='LIBSAMBA',
+                    deps='LIBSAMBA NDR_DRSUAPI',
                     vars=locals())
 
 S3_SUBSYSTEM('S3_SERVER_LIBS',