diff options
| author | Günther Deschner <gd@samba.org> | 2010-04-28 23:08:14 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-04-28 23:23:38 +0200 |
| commit | 2c5b3fc40b4b8e288463a98c9edbcf07f2cfbd73 (patch) | |
| tree | 2a2ffcf10c63161825af3899b00bf0b96461cc46 | |
| parent | bdfb9a43d33ab0bff84591914566a8dff3f4cb46 (diff) | |
| download | samba-2c5b3fc40b4b8e288463a98c9edbcf07f2cfbd73.tar.gz samba-2c5b3fc40b4b8e288463a98c9edbcf07f2cfbd73.tar.bz2 samba-2c5b3fc40b4b8e288463a98c9edbcf07f2cfbd73.zip | |
s4-smbtorture: link in ../../librpc/gen_ndr/ndr_rap.o.
Guenther
| -rw-r--r-- | source4/librpc/config.mk | 5 | ||||
| -rw-r--r-- | source4/librpc/wscript_build | 5 | ||||
| -rw-r--r-- | source4/torture/config.mk | 2 | ||||
| -rw-r--r-- | source4/torture/wscript_build | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index de9fa6ddbc..78e7d18553 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -575,6 +575,11 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_KEYSVC RPC_NDR_KEYSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_keysvc_c.o +[SUBSYSTEM::NDR_RAP] +PUBLIC_DEPENDENCIES = LIBNDR + +NDR_RAP_OBJ_FILES = ../librpc/gen_ndr/ndr_rap.o + [SUBSYSTEM::NDR_DCERPC] PUBLIC_DEPENDENCIES = LIBNDR diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index f9a5eab185..01449bb3c7 100644 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -263,6 +263,11 @@ bld.SAMBA_SUBSYSTEM('NDR_KEYSVC', public_deps='LIBNDR' ) +bld.SAMBA_SUBSYSTEM('NDR_RAP', + source='../../librpc/gen_ndr/ndr_rap.c', + public_deps='LIBNDR' + ) + bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC', source='../../librpc/ndr/ndr_krb5pac.c ../../librpc/gen_ndr/ndr_krb5pac.c', diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 53ba269c9a..3d566c0995 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -136,7 +136,7 @@ mkinclude drs/config.mk OUTPUT_TYPE = MERGED_OBJ SUBSYSTEM = smbtorture INIT_FUNCTION = torture_rap_init -PRIVATE_DEPENDENCIES = TORTURE_UTIL LIBCLI_SMB +PRIVATE_DEPENDENCIES = TORTURE_UTIL LIBCLI_SMB NDR_RAP # End SUBSYSTEM TORTURE_RAP ################################# diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index fa69b1da04..220673af2b 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -55,7 +55,7 @@ bld.SAMBA_MODULE('TORTURE_RAP', autoproto='rap/proto.h', subsystem='smbtorture', init_function='torture_rap_init', - deps='TORTURE_UTIL LIBCLI_SMB', + deps='TORTURE_UTIL LIBCLI_SMB NDR_RAP', internal_module=True ) |