diff options
| -rw-r--r-- | lib/tdr/TODO (renamed from source4/lib/tdr/TODO) | 0 | ||||
| -rw-r--r-- | lib/tdr/config.mk (renamed from source4/lib/tdr/config.mk) | 0 | ||||
| -rw-r--r-- | lib/tdr/tdr.c (renamed from source4/lib/tdr/tdr.c) | 2 | ||||
| -rw-r--r-- | lib/tdr/tdr.h (renamed from source4/lib/tdr/tdr.h) | 0 | ||||
| -rw-r--r-- | lib/tdr/testsuite.c (renamed from source4/lib/tdr/testsuite.c) | 0 | ||||
| -rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/TDR.pm | 2 | ||||
| -rw-r--r-- | source4/Makefile | 2 | ||||
| -rw-r--r-- | source4/main.mk | 2 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 2 |
9 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/tdr/TODO b/lib/tdr/TODO index 5093afd438..5093afd438 100644 --- a/source4/lib/tdr/TODO +++ b/lib/tdr/TODO diff --git a/source4/lib/tdr/config.mk b/lib/tdr/config.mk index 07506ec647..07506ec647 100644 --- a/source4/lib/tdr/config.mk +++ b/lib/tdr/config.mk diff --git a/source4/lib/tdr/tdr.c b/lib/tdr/tdr.c index 8b62ea0c2b..293436ed5e 100644 --- a/source4/lib/tdr/tdr.c +++ b/lib/tdr/tdr.c @@ -23,7 +23,7 @@ #include "includes.h" #include "system/filesys.h" #include "system/network.h" -#include "tdr/tdr.h" +#include "lib/tdr/tdr.h" #define TDR_BASE_MARSHALL_SIZE 1024 diff --git a/source4/lib/tdr/tdr.h b/lib/tdr/tdr.h index c983cd35c1..c983cd35c1 100644 --- a/source4/lib/tdr/tdr.h +++ b/lib/tdr/tdr.h diff --git a/source4/lib/tdr/testsuite.c b/lib/tdr/testsuite.c index 44c5810f90..44c5810f90 100644 --- a/source4/lib/tdr/testsuite.c +++ b/lib/tdr/testsuite.c diff --git a/pidl/lib/Parse/Pidl/Samba4/TDR.pm b/pidl/lib/Parse/Pidl/Samba4/TDR.pm index 568dff5adf..a6b74a0ba4 100644 --- a/pidl/lib/Parse/Pidl/Samba4/TDR.pm +++ b/pidl/lib/Parse/Pidl/Samba4/TDR.pm @@ -271,7 +271,7 @@ sub Parser($$$$) $self->pidl(""); $self->pidl_hdr("/* autogenerated by pidl */"); $self->pidl_hdr("#include \"$baseheader\""); - $self->pidl_hdr(choose_header("tdr/tdr.h", "tdr.h")); + $self->pidl_hdr(choose_header("lib/tdr/tdr.h", "tdr.h")); $self->pidl_hdr(""); foreach (@$idl) { $self->ParserInterface($_) if ($_->{TYPE} eq "INTERFACE"); } diff --git a/source4/Makefile b/source4/Makefile index 15b1b8ba40..c42f0ba9ff 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -77,7 +77,7 @@ nsswrappersrcdir := ../lib/nss_wrapper appwebsrcdir := lib/appweb libstreamsrcdir := lib/stream libutilsrcdir := ../lib/util -libtdrsrcdir := lib/tdr +libtdrsrcdir := ../lib/tdr libcryptosrcdir := ../lib/crypto libtorturesrcdir := ../lib/torture smb_serversrcdir := smb_server diff --git a/source4/main.mk b/source4/main.mk index ee2018fb69..8ea9727ed3 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -20,7 +20,7 @@ mkinclude ../lib/socket_wrapper/config.mk mkinclude ../lib/nss_wrapper/config.mk mkinclude lib/stream/config.mk mkinclude ../lib/util/config.mk -mkinclude lib/tdr/config.mk +mkinclude ../lib/tdr/config.mk mkinclude ../lib/crypto/config.mk mkinclude ../lib/torture/config.mk mkinclude lib/basic.mk diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 36f4f08072..e13056190a 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -44,7 +44,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../../lib/compression/testsuite.o \ $(torturesrcdir)/../../lib/util/charset/tests/charset.o \ $(torturesrcdir)/../libcli/security/tests/sddl.o \ - $(torturesrcdir)/../lib/tdr/testsuite.o \ + ../lib/tdr/testsuite.o \ $(torturesrcdir)/../../lib/tevent/testsuite.o \ $(torturesrcdir)/../param/tests/share.o \ $(torturesrcdir)/../param/tests/loadparm.o \ |