s4:s3compat Don't include generated files via dependencies and name

These generated files are part of NDR_STANDARD

Andrew Bartlett

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 10c5e75680a347b423ae910ba5f5d5912c03f76a..6e4e452c6f25a30e0656f14142cd98eeaf56180d 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -64,26 +64,10 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
 
 RPCCLIENT_NDR_SRC = '''rpc_client/ndr.c'''
 
-LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
-                  ../librpc/gen_ndr/ndr_lsa.c'''
-
-LIBNDR_GEN_SRC1 = '''../librpc/gen_ndr/ndr_netlogon.c
-                  ../librpc/ndr/ndr_netlogon.c'''
-
 LIBNDR_GEN_SRC2 = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.c'''
 
-LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
-                 ${LIBNDR_GEN_SRC0}
-                 ../librpc/gen_ndr/ndr_dfs.c
-                 ../librpc/gen_ndr/ndr_echo.c
-                 ../librpc/gen_ndr/ndr_winreg.c
-                 ../librpc/gen_ndr/ndr_initshutdown.c
-                 ../librpc/gen_ndr/ndr_srvsvc.c
-                 ../librpc/gen_ndr/ndr_eventlog.c
-                 ${LIBNDR_GEN_SRC1}
-                 ../librpc/gen_ndr/ndr_dssetup.c
-                 librpc/gen_ndr/ndr_notify.c
+LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_dssetup.c
                  ../librpc/gen_ndr/ndr_xattr.c
                  ../librpc/ndr/ndr_xattr.c
                  ../librpc/gen_ndr/ndr_epmapper.c
@@ -730,7 +714,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${AUTH_SRC}
                 ${PRIVILEGES_BASIC_SRC}
 
-                ${SECRETS_SRC}
                 ${LIBSMBCONF_SRC}
                 '''
 
@@ -852,7 +835,7 @@ S3_SUBSYSTEM('LIBSMB',
 
 S3_SUBSYSTEM('S3_SERVER_LIBS',
                     source=S3_SERVER_LIBS_SRC,
-                    deps = 'NDR_STANDARD',
+                    deps = 'NDR_S3_NOTIFY NDR_S3_SECRETS NDR_STANDARD',
              vars=locals())