svn commit: samba r17801 - in branches/SAMBA_3_0/source: .

[jerry at samba.org]

Author: jerry
Date: 2006-08-24 16:56:36 +0000 (Thu, 24 Aug 2006)
New Revision: 17801

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17801

Log:
bad merge ?  No sure how the second half of the LIBNDR_OBJ value got cut...
Modified:
   branches/SAMBA_3_0/source/Makefile.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2006-08-24 16:44:00 UTC (rev 17800)
+++ branches/SAMBA_3_0/source/Makefile.in	2006-08-24 16:56:36 UTC (rev 17801)
@@ -209,10 +209,12 @@
 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 \