diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-13 16:30:40 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-13 16:30:40 +0200 |
| commit | 2ce72b5a69e3cf306277460a6d87754bf71c024b (patch) | |
| tree | 667137b43d168d61831b4903d5bf74ef9f79d19f /source3/Makefile.in | |
| parent | eaba7784160be9dcf40f57c30c6f01a691082ba6 (diff) | |
| parent | 345e731fc10b779204b699076876e89237da6cdb (diff) | |
| download | samba-2ce72b5a69e3cf306277460a6d87754bf71c024b.tar.gz samba-2ce72b5a69e3cf306277460a6d87754bf71c024b.tar.bz2 samba-2ce72b5a69e3cf306277460a6d87754bf71c024b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 97e8ccb0d5..cc9efb3918 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -256,15 +256,16 @@ COMPRESSION_OBJ = ../lib/compression/mszip.o DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \ $(COMPRESSION_OBJ) -LIBNDR_OBJ = librpc/ndr/ndr_basic.o \ - librpc/ndr/ndr.o \ - librpc/ndr/ndr_misc.o \ +LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \ + ../librpc/ndr/ndr.o \ + ../librpc/ndr/ndr_misc.o \ librpc/gen_ndr/ndr_misc.o \ librpc/gen_ndr/ndr_security.o \ librpc/ndr/ndr_sec_helper.o \ librpc/ndr/ndr_string.o \ librpc/ndr/sid.o \ - librpc/ndr/uuid.o + ../librpc/ndr/uuid.o \ + librpc/ndr/util.o RPCCLIENT_NDR_OBJ = rpc_client/ndr.o @@ -967,7 +968,7 @@ REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \ @libreplacedir@/test/main.o \ $(LIBREPLACE_OBJ) -NDRDUMP_OBJ = librpc/tools/ndrdump.o \ +NDRDUMP_OBJ = ../librpc/tools/ndrdump.o \ $(PARAM_OBJ) $(LIBNDR_GEN_OBJ) \ $(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \ librpc/gen_ndr/ndr_svcctl.o |