diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-01 05:26:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:08 -0500 |
| commit | 37fffa54cf7edb208dcb060c642f5b0acf11d4e6 (patch) | |
| tree | bc609dc256eee71fe9b227091cbd2ed4ba9fcbae /source4/librpc | |
| parent | 2c52f52e02ca1e7286d0faa15d5031f2a4ac11ed (diff) | |
| download | samba-37fffa54cf7edb208dcb060c642f5b0acf11d4e6.tar.gz samba-37fffa54cf7edb208dcb060c642f5b0acf11d4e6.tar.bz2 samba-37fffa54cf7edb208dcb060c642f5b0acf11d4e6.zip | |
r3424: don't run mkproto.pl on pidl generated code, instead rely on pidl generating the
prototypes itself
(This used to be commit e694aeefe7c725d417abdd3c48d16ff1d932c223)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/config.m4 | 9 | ||||
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source4/librpc/config.m4 b/source4/librpc/config.m4 index 22abcc6f20..5c5ba9321c 100644 --- a/source4/librpc/config.m4 +++ b/source4/librpc/config.m4 @@ -4,8 +4,11 @@ SMB_SUBSYSTEM(LIBNDR_RAW,[], [librpc/ndr/ndr.o librpc/ndr/ndr_basic.o librpc/ndr/ndr_sec.o - librpc/ndr/ndr_spoolss_buf.o - librpc/gen_ndr/tables.o + librpc/ndr/ndr_spoolss_buf.o]) + +SMB_SUBSYSTEM_NOPROTO(LIBNDR_GEN) +SMB_SUBSYSTEM(LIBNDR_GEN,[], + [librpc/gen_ndr/tables.o librpc/gen_ndr/ndr_audiosrv.o librpc/gen_ndr/ndr_dcerpc.o librpc/gen_ndr/ndr_echo.o @@ -59,4 +62,4 @@ SMB_SUBSYSTEM(LIBRPC_RAW,[], librpc/rpc/dcerpc_sock.o]) SMB_SUBSYSTEM(LIBRPC,[],[],[], - [LIBNDR_RAW LIBRPC_RAW]) + [LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW]) diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index 0efa4af19c..09d06a7c7f 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -252,7 +252,3 @@ typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, void *); typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, void *); typedef void (*ndr_print_union_fn_t)(struct ndr_print *, const char *, uint32_t, void *); -#include "librpc/ndr/ndr_sec.h" - -/* now pull in the individual parsers */ -#include "librpc/gen_ndr/tables.h" |