r17801: bad merge ? No sure how the second half of the LIBNDR_OBJ value got cut...
authorGerald Carter <jerry@samba.org>
Thu, 24 Aug 2006 16:56:36 +0000 (16:56 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 16:38:48 +0000 (11:38 -0500)
(This used to be commit 3662f86f41b83a5c944294ca02b6e216ee87f88c)

source3/Makefile.in

index a82caa5d4abb447ef4e82178c4ff178cb8f72104..a9aa6020667712dce8ecf20e6d360e27bcff9454 100644 (file)
@@ -209,10 +209,12 @@ PASSCHANGE_OBJ = libsmb/passchange.o
 SOCKET_WRAPPER_OBJ = lib/socket_wrapper.o
 
 LIBNDR_OBJ = libndr/ndr_basic.o libndr/ndr.o libndr/ndr_misc.o \
+            libndr/ndr_sec_helper.o libndr/ndr_string.o libndr/sid.o
 
-TALLOC_OBJ = lib/talloc.o
 RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
 
+TALLOC_OBJ = lib/talloc.o
+
 LIB_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
           lib/getsmbpass.o lib/interface.o lib/md4.o \
           lib/interfaces.o lib/pidfile.o lib/replace.o lib/replace1.o lib/repdir.o lib/timegm.o \