git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bdfb9a4
)
s4-smbtorture: link in ../../librpc/gen_ndr/ndr_rap.o.
author
Günther Deschner
<gd@samba.org>
Wed, 28 Apr 2010 21:08:14 +0000
(23:08 +0200)
committer
Günther Deschner
<gd@samba.org>
Wed, 28 Apr 2010 21:23:38 +0000
(23:23 +0200)
Guenther
source4/librpc/config.mk
patch
|
blob
|
history
source4/librpc/wscript_build
patch
|
blob
|
history
source4/torture/config.mk
patch
|
blob
|
history
source4/torture/wscript_build
patch
|
blob
|
history
diff --git
a/source4/librpc/config.mk
b/source4/librpc/config.mk
index de9fa6ddbc75206884ddf4e70187018ef1083131..78e7d18553975f828067c3cf01704b25fd1f6e9d 100644
(file)
--- 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
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
[SUBSYSTEM::NDR_DCERPC]
PUBLIC_DEPENDENCIES = LIBNDR
diff --git
a/source4/librpc/wscript_build
b/source4/librpc/wscript_build
index f9a5eab185580df125456c752043560b11f8d11e..01449bb3c7cdc174e2346d7e5c8641e6a7d21979 100644
(file)
--- a/
source4/librpc/wscript_build
+++ b/
source4/librpc/wscript_build
@@
-263,6
+263,11
@@
bld.SAMBA_SUBSYSTEM('NDR_KEYSVC',
public_deps='LIBNDR'
)
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',
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 53ba269c9ad5813fe432abcc78d5f8179c35ea98..3d566c09958a1af4b92318000dc3bc09b4bcfe55 100644
(file)
--- 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
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
#################################
# End SUBSYSTEM TORTURE_RAP
#################################
diff --git
a/source4/torture/wscript_build
b/source4/torture/wscript_build
index fa69b1da04b281f6c00330206cfb6be5630d28ae..220673af2b70d155b8cd8535c0d5e93e0c9c8c4a 100644
(file)
--- 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',
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
)
internal_module=True
)