diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-22 04:16:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:01:02 -0500 |
| commit | 21931b1ca834f41c5ca931cdfb6f0347b5cb3c96 (patch) | |
| tree | 0e93b2474ef97d0f68e2da0d73bd1fc3ad924926 /source3/Makefile.in | |
| parent | 200d2383020c105447b214b40ecd50821d654388 (diff) | |
| download | samba-21931b1ca834f41c5ca931cdfb6f0347b5cb3c96.tar.gz samba-21931b1ca834f41c5ca931cdfb6f0347b5cb3c96.tar.xz samba-21931b1ca834f41c5ca931cdfb6f0347b5cb3c96.zip | |
r18810: use a copy of samba4's talloc under lib/talloc/
to make mergeing easier.
metze
(This used to be commit d49ffbc19b29f7620e427de133ffab74721f37e8)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ddb1c2a864b..252f122c087 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -217,7 +217,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_unixinfo.o librpc/gen_ndr/ndr_lsa.o \ RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o -TALLOC_OBJ = lib/talloc.o +TALLOC_OBJ = lib/talloc/talloc.o LIB_WITHOUT_PROTO_OBJ = @LIBREPLACE_OBJS@ @SOCKET_WRAPPER_OBJS@ @@ -688,7 +688,7 @@ SHARESEC_OBJ = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(REGOBJS_OBJ) $(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(DOSERR_OBJ) \ $(POPT_LIB_OBJ) $(SECRETS_OBJ) -TALLOCTORT_OBJ = lib/talloctort.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ +TALLOCTORT_OBJ = lib/talloc/testsuite.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LIBSAMBA_OBJ) $(SECRETS_OBJ) RPCTORTURE_OBJ = torture/rpctorture.o \ |