summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-08-24 16:56:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:48 -0500
commit66ef2f38108109274c263ea8ceaa6ee4ca2c3fb8 (patch)
tree88a0299272d2597c82f9337dfc0289860378ef08 /source3
parenta64925ddff467a47f7adfac4b1b977ddc0c7f4ef (diff)
downloadsamba-66ef2f38108109274c263ea8ceaa6ee4ca2c3fb8.tar.gz
samba-66ef2f38108109274c263ea8ceaa6ee4ca2c3fb8.tar.bz2
samba-66ef2f38108109274c263ea8ceaa6ee4ca2c3fb8.zip
r17801: bad merge ? No sure how the second half of the LIBNDR_OBJ value got cut...
(This used to be commit 3662f86f41b83a5c944294ca02b6e216ee87f88c)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index a82caa5d4a..a9aa602066 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -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 \