summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 13:33:35 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 13:33:35 +0100
commit1131d4c2545355ef793e468810655c0f72828368 (patch)
tree6812d6bfd27835a9992e4addb98329da6c087d22 /source4/libcli
parent94c937ffb0109effa55117c525db941194893091 (diff)
parent5e336bea1c68fafa97f67abf89c678d3cd7250b8 (diff)
downloadsamba-1131d4c2545355ef793e468810655c0f72828368.tar.gz
samba-1131d4c2545355ef793e468810655c0f72828368.tar.bz2
samba-1131d4c2545355ef793e468810655c0f72828368.zip
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts: source/build/smb_build/makefile.pm (This used to be commit 4d190270463f8db475c152f5502c9de01765d904)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index bd96d5e8f5..67620fac89 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -118,7 +118,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
[SUBSYSTEM::LIBCLI_RAW]
PRIVATE_PROTO_HEADER = raw/raw_proto.h
PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
-LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
+#LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS
OBJ_FILES = raw/rawfile.o \
raw/smb_signing.o \